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 1e0aaae..6e57ccc 100644 Binary files a/SOURCES/rocky.1.gz and b/SOURCES/rocky.1.gz differ 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/