From dd605c8eace41ac44615df980f6d333dd0c6612f Mon Sep 17 00:00:00 2001 From: nazunalika Date: Tue, 19 Oct 2021 01:39:56 -0700 Subject: [PATCH] reorganizing and adding context --- SOURCES/50-redhat.conf | 1 + SOURCES/rocky.1.gz | Bin 2650 -> 2660 bytes SPECS/rocky-release.spec | 14 +++++++++----- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/SOURCES/50-redhat.conf b/SOURCES/50-redhat.conf index a975a13..689ef5e 100644 --- a/SOURCES/50-redhat.conf +++ b/SOURCES/50-redhat.conf @@ -1,3 +1,4 @@ +# These defaults are from upstream and are not patched into systemd like in el8 # https://bugzilla.redhat.com/show_bug.cgi?id=1689346 kernel.kptr_restrict = 1 diff --git a/SOURCES/rocky.1.gz b/SOURCES/rocky.1.gz index 1e0aaae1b6d469fbf3f401b70cf4ccfc13412873..6e57ccc75f414c8820835592c64fb40427357afc 100644 GIT binary patch literal 2660 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 S%Xf$02mb{H$oZoP761UIq7bV9 literal 2650 zcmV-g3Z?ZQiwFo(n_po719ER;Yk4j)0F_u_ZyUK0{jOg@xF~D`vXop~pbd)N$v!7C zYR7@>LlEGAg4(6DjJc$a+_j?o`o1@$TNUJ9(U|R(thYoxJ*+ zy01F*-K+0jpQw}9lUMkE5vr%1y0yOlqRuW|Z`8fteK|iFO&;dz{p{{~G+c3^X6h=m zZSQTjQ`f#TaT9IArj3cZvwp1}cBwP1Z2$54;c9X7;qm7F{b+Kj28Kp9DXpr5CG%n_ z94sZVq-vAw+M8NwU#n$rU8lOBmPWmP_3F=RX}yj+n%ZF3(iye2U882LiMGYf2tY)K(`|H6aEP(ZCtWwB_&Zmz& zu(9n}ZJVIHdB(DJ5a5$BazN^<$|T_10J#!z#ZV+UV|Amf?_#L?N*?V(KSXnKl2Lhg zKf8Sx4LLT>J{)JLk!MIv%Ve*Eb_{K4NR!{-(a=D4vcTeM`03$Y>a=shsy>O2SYV@a z_6cUQ8_0r#MGtB{=OoOpZ&ir+C17>@hB9Dlw9m49qGm@VAJcv`O51IWfddWeYx`{Lo;Dd&h->ZbS4{v| z25{}!I8+0FT!lpYFL+(7qpp!Ql%EF?`iQip-~_%j86N&I#3z_r8;JpS!E>BzU^5EF z-k3~1ei>xs;O&t)mOwI99|a=hWNDpzq?@3SS;rC}Au2VM1jUVxx7`IVNx>Z=Wky7d4R%fcl2N%}Xq`W=#n@xxv z(Fj98jeoW=_!f_jQ#5m1y-Se&C)9zdtZ)e1#o?t%VhUWuhu=vPYTr6js%&YR;A)@) z7a$#J1G6i{G-TOXItNWZjP3%GV?FrL%5%yM4rl&ej8}!?B4J8*>=4sF#VONergf;M zk*aVJjWar#>DB$+-B0gt9zR`N&1Z|p>%|Dza97iHoAhRympf4xcr`s7by1F*X2~gb zu4dAg$iGsQ=#q$;z)`HI5id;mRl*C6hnU|iuHGmctBJEqbg&5y?WTWv@oBjBPIvI9 zMGd|=c+d5d;}C{h-iFw>>1Fv!zW>e!G_~3e>__=Nf%nrm6}`=!STOlG|MdN6^eObG zEUOrnC?Q}G*j$+XZPribF|p1k>SL4ZpHSr#T965PSyj*i-%%v_+m`4ys8O1sLLir- zJnMCuC>Fo=35#f0R5|mKtAjV{4CgZa(t28R4$N;l>5@CrNux1olz0nI^)BZK65{KA zlfNu7d7#s43teI`@ZDs$&?2fH0-K8va>5J;_4mnNrR*3q1_*DybnJsg?}!A?$Lgvv z36@0gFd0x{gNk*kcLpJUwSf-Jz;4o&EX&*tI&PNqR8a&r_5PK9ODV5 z1GeM3m?zPRQPHj>oC5=#{R$NM0hWI0ZS{n|`%I)p@Yi)M)aR@POw($o(6MSZjx*^| zqpD zlNve9&_G>0&ecQWcjC41QXvQ~+v_3RVi;>TtO4<%d@SE^HzAxKCWQQCR!6J- z3BoXlx`Q!G%AQNAoLNa4mw@R~1XZd;GQCe@4o$8F&7Ole8hOEZt=M$av_(USkPU>L z)niZWeLZ7>K&~avIcn|`WBFp4vTk4uWo=V2q*ipz2^Ujp(P-R%E3i8ABy;I-Pah5L zi+j!a$6j?NvP2rIh_%U;k~&crnx+aCnt^t%GN?07-YQ`Rm#L=&2_DtL2c)L5cz%{_ zYn_()A9pei+&CV02uKmSbUwLHy<~C);sF`93S0?w?(RaE;z*ot^H<}IU4@Nzmo5gZ%M$@qmk^tfNU5kC}VQP*%)1!RqygQT$X@=jJcr< zGkGL_eXAkaUvhvjM)GjHJJ8qf}|Boo|JLy!qd!qO>MVPW8DDlx4LdN?lDxt{Wf z1lroFY#H`3Qa}RPzw$B8BER+i3b8?h?`?hw6iWlny8dG1BFpKwxAS3#7>zE?it2yE zdY6o?13Sf5dohpUCk0=`Nc*QU?8g1O10Ftnr@_%G9lvkH)%}N0 zi<@`z#}VJPjtfZ!X?X~%Zp%C8TTa>~<+msYPuk{pdPMdw7gtUO(94G(_rH(+3wKdN I7}6C00Ez-AG5`Po diff --git a/SPECS/rocky-release.spec b/SPECS/rocky-release.spec index b9cb6e1..09ce27a 100644 --- a/SPECS/rocky-release.spec +++ b/SPECS/rocky-release.spec @@ -7,7 +7,7 @@ # Distribution Name and Version %define distro_name Rocky Linux -%define distro_code Green Obsidian +%define distro_code Blue Onyx %define major 9 %define minor 0 %define rocky_rel 1 @@ -130,7 +130,8 @@ echo Good. mkdir ./docs cp %{SOURCE201} %{SOURCE202} %{SOURCE203} ./docs -# system-release +################################################################################ +# system-release data install -d -m 0755 %{buildroot}%{_sysconfdir} echo "%{distro_name} release %{version} (%{distro_code})" > %{buildroot}%{_sysconfdir}/rocky-release echo "Derived from Red Hat Enterprise Linux %{version}" > %{buildroot}%{_sysconfdir}/rocky-release-upstream @@ -189,6 +190,9 @@ install -d -m 0755 %{buildroot}%{_datadir}/rocky-release ln -s rocky-release %{buildroot}%{_datadir}/redhat-release install -p -m 0644 %{SOURCE200} %{buildroot}%{_datadir}/rocky-release/ +# end system-release data +################################################################################ + ################################################################################ # systemd section install -d -m 0755 %{buildroot}%{_prefix}/lib/systemd/system-preset/ @@ -201,13 +205,13 @@ install -m 0644 %{SOURCE302} %{buildroot}/%{_prefix}/lib/systemd/system-preset/ install -m 0644 %{SOURCE303} %{buildroot}/%{_prefix}/lib/systemd/system-preset/ install -m 0644 %{SOURCE303} %{buildroot}/%{_prefix}/lib/systemd/user-preset/ -# systemd section -################################################################################ - # sysctl presets install -d -m 0755 %{buildroot}%{_prefix}/lib/sysctl.d/ install -m 0644 %{SOURCE304} %{buildroot}/%{_prefix}/lib/sysctl.d/ +# systemd section +################################################################################ + ################################################################################ # start secureboot section install -d -m 0755 %{buildroot}%{_sysconfdir}/pki/sb-certs/