[OS-BUILD PATCHv2] redhat: spec: trigger dracut when modules are installed separately

[Jan Stancek (via Email Bridge)]

From: Jan Stancek <jstancek(a)redhat.com&gt;

redhat: spec: trigger dracut when modules are installed separately

In most scenarios, users install -core and -modules subpackages
at the same time (as part of same transaction). But it is also
possible to install -core RPM and then -modules RPM separately.
We allow this because some environments don't need modules.

Installing RPMs separately can cause issues. Since we trigger
initramdisk rebuild (in %posttrans script) only for -core package,
some modules may end up missing.

Introduce state file to determine whether or not -modules subpackage
should trigger dracut to rebuild ramdisk. If both -core and -modules
RPMs are installed in same transaction, there's no extra action.
If -modules RPM is installed separately, trigger dracut
to re-generate init ramdisk.

Signed-off-by: Jan Stancek <jstancek(a)redhat.com&gt;

diff --git a/redhat/kernel.spec.template b/redhat/kernel.spec.template
index blahblah..blahblah 100755
--- a/redhat/kernel.spec.template
+++ b/redhat/kernel.spec.template
@@ -2684,9 +2684,20 @@ fi\
 %define kernel_modules_post() \
 %{expand:%%post %{?1:%{1}-}modules}\
 /sbin/depmod -a %{KVERREL}%{?1:+%{1}}\
+if [ ! -f %{_localstatedir}/lib/rpm-state/%{name}/installing_core_%{KVERREL}%{?1:+%{1}}
]; then\
+	mkdir -p %{_localstatedir}/lib/rpm-state/%{name}\
+	touch %{_localstatedir}/lib/rpm-state/%{name}/need_to_run_dracut_%{KVERREL}%{?1:+%{1}}\
+fi\
 %{nil}\
 %{expand:%%postun %{?1:%{1}-}modules}\
 /sbin/depmod -a %{KVERREL}%{?1:+%{1}}\
+%{nil}\
+%{expand:%%posttrans %{?1:%{1}-}modules}\
+if [ -f %{_localstatedir}/lib/rpm-state/%{name}/need_to_run_dracut_%{KVERREL}%{?1:+%{1}}
]; then\
+	rm -f %{_localstatedir}/lib/rpm-state/%{name}/need_to_run_dracut_%{KVERREL}%{?1:+%{1}}\
+	echo "Running: dracut -f --kver %{KVERREL}%{?1:+%{1}}"\
+	dracut -f --kver "%{KVERREL}%{?1:+%{1}}" || exit $?\
+fi\
 %{nil}
 
 # This macro defines a %%posttrans script for a kernel package.
@@ -2701,6 +2712,7 @@ then\
     %{_sbindir}/weak-modules --add-kernel %{KVERREL}%{?1:+%{1}} || exit $?\
 fi\
 %endif\
+rm -f %{_localstatedir}/lib/rpm-state/%{name}/installing_core_%{KVERREL}%{?1:+%{1}}\
 /bin/kernel-install add %{KVERREL}%{?1:+%{1}} /lib/modules/%{KVERREL}%{?1:+%{1}}/vmlinuz
|| exit $?\
 %{nil}
 
@@ -2721,6 +2733,8 @@ if [ `uname -i` == "x86_64" -o `uname -i` ==
"i386" ] &&\
    [ -f /etc/sysconfig/kernel ]; then\
   /bin/sed -r -i -e
's/^DEFAULTKERNEL=%{-r*}$/DEFAULTKERNEL=kernel%{?-v:-%{-v*}}/'
/etc/sysconfig/kernel || exit $?\
 fi}\
+mkdir -p %{_localstatedir}/lib/rpm-state/%{name}\
+touch %{_localstatedir}/lib/rpm-state/%{name}/installing_core_%{KVERREL}%{?1:+%{1}}\
 %{nil}
 
 #

--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1644

[Jan Stancek (via Email Bridge)]

From: Jan Stancek on gitlab.com
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1644#note_8734...

good catch, copy paste error

[Jan Stancek (via Email Bridge)]

From: Jan Stancek on gitlab.com
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1644#note_8734...

I added also %{name} - on rhel8 I guess you could install kernel and kernel-rt
at the same time.