commit suse-module-tools for openSUSE:Factory

12 Sep 2024

Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package suse-module-tools for openSUSE:Factory checked in at 2024-09-12 16:54:02
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/suse-module-tools (Old)
 and      /work/SRC/openSUSE:Factory/.suse-module-tools.new.17570 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "suse-module-tools"

Thu Sep 12 16:54:02 2024 rev:82 rq:1200081 version:16.0.51

Changes:
--------

--- /work/SRC/openSUSE:Factory/suse-module-tools/suse-module-tools.changes	2024-09-01 19:21:06.887248571 +0200
+++ /work/SRC/openSUSE:Factory/.suse-module-tools.new.17570/suse-module-tools.changes	2024-09-12 16:54:12.643495429 +0200
@@ -1,0 +2,9 @@
+Thu Sep  5 10:01:04 UTC 2024 - Martin Wilck <mwilck@suse.com>
+
+- Update to version 16.0.51:
+  * Improve handling of /boot/vmlinuz and /boot/initrd symlinks
+    (boo#1207703)
+  * Add preliminary support for mkosi-initrd
+  * spec file: remove redundant dependency on sdbootutil
+
+-------------------------------------------------------------------
@@ -3,0 +13 @@
+- Update to version 16.0.50:

Old:
----
  suse-module-tools-16.0.50.obscpio

New:
----
  suse-module-tools-16.0.51.obscpio

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ suse-module-tools.spec ++++++
--- /var/tmp/diff_new_pack.r4zWe2/_old	2024-09-12 16:54:13.375525883 +0200
+++ /var/tmp/diff_new_pack.r4zWe2/_new	2024-09-12 16:54:13.379526050 +0200
@@ -37,7 +37,7 @@
 %global modprobe_conf_rpmsave %(echo "%{modprobe_conf_files}" | sed 's,\\([^ ]*\\),%{_sysconfdir}/modprobe.d/\\1.conf.rpmsave,g')
 
 Name:           suse-module-tools
-Version:        16.0.50
+Version:        16.0.51
 Release:        0
 Summary:        Configuration for module loading and SUSE-specific utilities for KMPs
 License:        GPL-2.0-or-later
@@ -52,7 +52,6 @@
 Requires:       coreutils
 Requires:       findutils
 Requires:       systemd-rpm-macros
-Requires:       (sdbootutil if sdbootutil)
 Requires:       rpm
 Requires(post): /usr/bin/grep
 Requires(post): /usr/bin/sed
@@ -120,6 +119,8 @@
 install -d -m 755 "%{buildroot}/usr/lib/module-init-tools"
 install -pm 755 -t "%{buildroot}/usr/lib/module-init-tools/" \
 	weak-modules2 driver-check.sh unblacklist lsinitrd-quick get_dracut_drivers
+install -pm 755 "dracut-posttrans" "%{buildroot}/usr/lib/module-init-tools/"
+install -pm 755 "mkosi-initrd-posttrans" "%{buildroot}/usr/lib/module-init-tools/"
 install -pm 755 "regenerate-initrd-posttrans" "%{buildroot}/usr/lib/module-init-tools/"
 install -d -m 755 "%{buildroot}/usr/lib/module-init-tools/kernel-scriptlets"
 install -pm 755 "kernel-scriptlets/cert-script" "%{buildroot}/usr/lib/module-init-tools/kernel-scriptlets"
@@ -249,5 +250,7 @@
 #
 %files scriptlets
 /usr/lib/module-init-tools/kernel-scriptlets
+/usr/lib/module-init-tools/dracut-posttrans
+/usr/lib/module-init-tools/mkosi-initrd-posttrans
 /usr/lib/module-init-tools/regenerate-initrd-posttrans
 

++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.r4zWe2/_old	2024-09-12 16:54:13.423527880 +0200
+++ /var/tmp/diff_new_pack.r4zWe2/_new	2024-09-12 16:54:13.427528047 +0200
@@ -1,6 +1,6 @@
 <servicedata>
 <service name="tar_scm">
                 <param name="url">https://github.com/openSUSE/suse-module-tools.git</param>
-              <param name="changesrevision">503d772e6951ef8c268bc14f39b4c8d5f5a90986</param></service></servicedata>
+              <param name="changesrevision">747e2bfce7f245987ff87cea6b80c31ce39dc2fa</param></service></servicedata>
 (No newline at EOF)
 

++++++ suse-module-tools-16.0.50.obscpio -> suse-module-tools-16.0.51.obscpio ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/suse-module-tools-16.0.50/README.md new/suse-module-tools-16.0.51/README.md
--- old/suse-module-tools-16.0.50/README.md	2024-08-30 15:03:25.000000000 +0200
+++ new/suse-module-tools-16.0.51/README.md	2024-09-05 11:58:31.000000000 +0200
@@ -120,8 +120,8 @@
 # Boot Loader Specification (BLS) and EFI System Partition (ESP)
 
 There are scripts generating boot entries (via perl-Bootloader), new
-initrds (via dracut) and updating the kernel module dependency lists
-(via depmod).  If we are in a system using the boot entries defined in
+initrds (via dracut or mkosi-initrd) and updating the kernel module dependency
+lists (via depmod).  If we are in a system using the boot entries defined in
 the bootloader specification (BLS), then we need to take special
 considerations.
 
@@ -141,76 +141,80 @@
 system.  The following table summarizes those interactions:
 
 
-| Model            | Operation | Element    | Done                           |
-|------------------|-----------|------------|--------------------------------|
-| Traditional      | Kernel    | depmod     | wm2 (rpm-script/post[un])      |
-|                  |           | initrd     | wm2 (rpm-script/post[un])      |
-|                  |           | boot entry | rpm-script/post[un]            |
-|                  |           |            |                                |
-|                  | KMP       | depmod     | wm2 (inkmp-script/post[un])    |
-|                  |           | initrd     | wm2 (inkmp-script/post[un])    |
-|                  |           |            |                                |
-|                  | Dracut    | initrd     | regenerate-initrd-posttrans[1] |
-|------------------|-----------|------------|--------------------------------|
-| MicroOS[2]       | Kernel    | depmod     | wm2 (rpm-script/post[un])      |
-|                  |           | initrd     | wm2 (rpm-script/post[un])      |
-|                  |           | boot entry | rpm-script/post[un]            |
-|                  |           |            |                                |
-|                  | KMP       | depmod     | wm2 (inkmp-script/post[un])    |
-|                  |           | initrd     | wm2 (inkmp-script/post[un])    |
-|                  |           |            |                                |
-|                  | Dracut    | initrd     | regenerate-initrd-posttrans    |
-|------------------|-----------|------------|--------------------------------|
-| Tumbleweed + BLS | Kernel    | depmod     | wm2 (rpm-script/post[un])[3]   |
-|                  |           | initrd     | wm2 (rpm-script/post[un])      |
-|                  |           | boot entry | rpm-script/post[un]            |
-|                  |           |            |                                |
-|                  | KMP       | depmod     | wm2 (inkmp-script/post[un])    |
-|                  |           | initrd     | wm2 (inkmp-script/post[un])    |
-|                  |           |            |                                |
-|                  | Dracut    | initrd     | regenerate-initrd-posttrans    |
-|------------------|-----------|------------|--------------------------------|
-| MicroOS + BLS    | Kernel    | depmod     | wm2 (rpm-script/post[un])      |
-|                  |           | initrd     | snapper plugin[4]              |
-|                  |           | boot entry | snapper plugin                 |
-|                  |           |            |                                |
-|                  | KMP       | depmod     | snapper plugin[5]              |
-|                  |           | initrd     | wm2 (rpm-script/post[un])      |
-|                  |           |            |                                |
-|                  | Dracut    | initrd     | snapper plugin                 |
-|------------------|-----------|------------|--------------------------------|
-| Tumbleweed + BLS | Kernel    | depmod     | wm2 (rpm-script/post[un])[6]   |
-| (no btrfs)       |           | initrd     | wm2 (rpm-script/post[un])      |
-|                  |           | boot entry | rpm-script/post[un]            |
-|                  |           |            |                                |
-|                  | KMP       | depmod     | wm2 (inkmp-script/post[un])    |
-|                  |           | initrd     | wm2 (inkmp-script/post[un])    |
-|                  |           |            |                                |
-|                  | Dracut    | initrd     | regenerate-initrd-posttrans    |
-|------------------|-----------|------------|--------------------------------|
+| Model            | Operation       | Element    | Done                           |
+|------------------|-----------------|------------|--------------------------------|
+| Traditional      | Kernel          | depmod     | wm2 (rpm-script/post[un])      |
+|                  |                 | initrd     | wm2 (rpm-script/post[un])      |
+|                  |                 | boot entry | rpm-script/post[un]            |
+|                  |                 |            |                                |
+|                  | KMP             | depmod     | wm2 (inkmp-script/post[un])    |
+|                  |                 | initrd     | wm2 (inkmp-script/post[un])    |
+|                  |                 |            |                                |
+|                  | dracut /        | initrd     | regenerate-initrd-posttrans[2] |
+|                  | mkosi-initrd[1] |            |                                |
+|------------------|-----------------|------------|--------------------------------|
+| MicroOS[3]       | Kernel          | depmod     | wm2 (rpm-script/post[un])      |
+|                  |                 | initrd     | wm2 (rpm-script/post[un])      |
+|                  |                 | boot entry | rpm-script/post[un]            |
+|                  |                 |            |                                |
+|                  | KMP             | depmod     | wm2 (inkmp-script/post[un])    |
+|                  |                 | initrd     | wm2 (inkmp-script/post[un])    |
+|                  |                 |            |                                |
+|                  | dracut          | initrd     | regenerate-initrd-posttrans    |
+|------------------|-----------------|------------|--------------------------------|
+| Tumbleweed + BLS | Kernel          | depmod     | wm2 (rpm-script/post[un])[4]   |
+|                  |                 | initrd     | wm2 (rpm-script/post[un])      |
+|                  |                 | boot entry | rpm-script/post[un]            |
+|                  |                 |            |                                |
+|                  | KMP             | depmod     | wm2 (inkmp-script/post[un])    |
+|                  |                 | initrd     | wm2 (inkmp-script/post[un])    |
+|                  |                 |            |                                |
+|                  | dracut          | initrd     | regenerate-initrd-posttrans    |
+|------------------|-----------------|------------|--------------------------------|
+| MicroOS + BLS    | Kernel          | depmod     | wm2 (rpm-script/post[un])      |
+|                  |                 | initrd     | snapper plugin[5]              |
+|                  |                 | boot entry | snapper plugin                 |
+|                  |                 |            |                                |
+|                  | KMP             | depmod     | snapper plugin[6]              |
+|                  |                 | initrd     | wm2 (rpm-script/post[un])      |
+|                  |                 |            |                                |
+|                  | dracut          | initrd     | snapper plugin                 |
+|------------------|-----------------|------------|--------------------------------|
+| Tumbleweed + BLS | Kernel          | depmod     | wm2 (rpm-script/post[un])[7]   |
+| (no btrfs)       |                 | initrd     | wm2 (rpm-script/post[un])      |
+|                  |                 | boot entry | rpm-script/post[un]            |
+|                  |                 |            |                                |
+|                  | KMP             | depmod     | wm2 (inkmp-script/post[un])    |
+|                  |                 | initrd     | wm2 (inkmp-script/post[un])    |
+|                  |                 |            |                                |
+|                  | dracut          | initrd     | regenerate-initrd-posttrans    |
+|------------------|-----------------|------------|--------------------------------|
 
 Notes:
 
-[1] Triggered by the `%regenerate_initrd_post[trans]` macros
+[1] The `mkosi-initrd` integration is in its initial phase and is intended for
+    traditional systems only.
 
-[2] In MicroOS (or any system that use transactional-update) the
+[2] Triggered by the `%regenerate_initrd_post[trans]` macros
+
+[3] In MicroOS (or any system that use transactional-update) the
     kernel in /boot is inside the transaction, so gets discarded if
     the snapshot is dropped.
 
-[3] Could be done in the snapper plugin, but it is done in
+[4] Could be done in the snapper plugin, but it is done in
     weak-modules2 as in the traditional case, by calling `sdbootutil
     --no-reuse-initrd`, which also creates the boot entry.  The initrd
     name is selected from the current default boot entry
 
-[4] When adding or removing a kernel, the `sdbootutil
+[5] When adding or removing a kernel, the `sdbootutil
     set_default_snapshot` will regenerate boot entries for all the
     remaining kernels in the snapshot.  This will synchronize also the
     initrds (but can leave old initrds in the ESP).  Also, wm2 will
     create a mark in `/run/regenerate-initrd`.
 
-[5] A direct call to `regenerate-initrd-posttrans` inside the
+[6] A direct call to `regenerate-initrd-posttrans` inside the
     transaction will drop the call and keep the
     `/run/regenerate-initrd` directory.  A second call (from the
     snapper plugin) will complete it.
 
-[6] `sdbootutil` partially understand BLS systems without snapshots.
+[7] `sdbootutil` partially understand BLS systems without snapshots.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/suse-module-tools-16.0.50/dracut-posttrans new/suse-module-tools-16.0.51/dracut-posttrans
--- old/suse-module-tools-16.0.50/dracut-posttrans	1970-01-01 01:00:00.000000000 +0100
+++ new/suse-module-tools-16.0.51/dracut-posttrans	2024-09-05 11:58:31.000000000 +0200
@@ -0,0 +1,26 @@
+#!/bin/sh
+
+: "${DRACUT:=/usr/bin/dracut}"
+
+if [ ! -x "$DRACUT" ]; then
+	echo "${0##*/}: dracut is not installed, not rebuilding the initrd." >&2
+	exit 0
+fi
+
+initrd_warn_chroot_build() {
+	echo "Please run \"$DRACUT -f --regenerate-all\" as soon as your system is complete." >&2
+}
+
+initrd_regenerate() {
+	local kver="$1"
+	"$DRACUT" -f --kver "$kver"
+	return $?
+}
+
+initrd_regenerate_all() {
+	"$DRACUT" -f --regenerate-all
+}
+
+initrd_cleanup() {
+	:
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/suse-module-tools-16.0.50/kernel-scriptlets/rpm-script new/suse-module-tools-16.0.51/kernel-scriptlets/rpm-script
--- old/suse-module-tools-16.0.50/kernel-scriptlets/rpm-script	2024-08-30 15:03:25.000000000 +0200
+++ new/suse-module-tools-16.0.51/kernel-scriptlets/rpm-script	2024-09-05 11:58:31.000000000 +0200
@@ -133,8 +133,10 @@
 		    message_install_bl
 		fi
 	    fi
+	    create_boot_symlinks "$kernelrelease-$flavor"
 	else
 	    message_install_bl
+	    create_boot_symlinks "$kernelrelease-$flavor"
 	fi
     fi
 }
@@ -188,14 +190,37 @@
 	    fi
 	fi
     done
+}
 
+create_boot_symlinks() {
+    rel_flav=$1
+    broken=
     for x in /boot/"$image" /boot/initrd; do
-	rm -f "$x"
-	ln -s "${x##*/}-$kernelrelease-$flavor" "$x"
+	[ -f "$x-$rel_flav" ] || broken=yes
     done
+    if [ "$broken" ]; then
+	echo "ERROR: cannot create symlinks /boot/$image and /boot/initrd" >&2
+    else
+	for x in /boot/"$image" /boot/initrd; do
+	    rm -f "$x"
+	    ln -s "${x##*/}-$rel_flav" "$x"
+	done
+    fi
     rm -f /boot/.vmlinuz.hmac
-    [ ! -e "/boot/.vmlinuz-$kernelrelease-$flavor.hmac" ] ||
-	ln -s ".vmlinuz-$kernelrelease-$flavor.hmac" /boot/.vmlinuz.hmac
+    [ ! -e "/boot/.vmlinuz-$rel_flav.hmac" ] ||
+	ln -s ".vmlinuz-$rel_flav.hmac" /boot/.vmlinuz.hmac
+}
+
+find_latest_kernel() {
+    # shellcheck disable=SC2012
+    ls -rv /boot/initrd-* 2>/dev/null | \
+	while read -r _x; do
+	    [ -f "$_x" ] || continue
+	    _rel=${_x#/boot/initrd-}
+	    [ -f "/boot/$image-$_rel" ] || continue
+	    echo "$_rel"
+	    return
+	done
 }
 
 check_arm_pagesize() {
@@ -265,7 +290,7 @@
 	if [ -x $wm2 ]; then
 	    run_wm2 --add-kernel "$kernelrelease"-"$flavor" || script_rc=$?
 	else
-	    echo "$wm2 does not exist, please run depmod and dracut manually" >&2
+	    echo "$wm2 does not exist, please run depmod and dracut/mkosi-initrd manually" >&2
 	    script_rc=1
 	fi
 
@@ -313,6 +338,19 @@
 		    "$image"-"$kernelrelease"-"$flavor" \
 		    initrd-"$kernelrelease"-"$flavor"
 	    fi
+	    if [ -L /boot/initrd ] && \
+		   { [ ! -f /boot/initrd ] || \
+			 [ "$(readlink /boot/initrd)" = "initrd-$kernelrelease-$flavor" ]; }; then
+		rm -f /boot/initrd "/boot/$image"
+	    fi
+	    if [ ! -f /boot/initrd ] || [ ! -f "/boot/$image" ]; then
+		latest=$(find_latest_kernel)
+		if [ "$latest" ]; then
+		    create_boot_symlinks "$latest"
+		else
+		    echo "WARNING: no installed kernel found after deinstallation of $kernelrelease-$flavor" >&2
+		fi
+	    fi
 	fi
 
 	run_cert_script "$@"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/suse-module-tools-16.0.50/mkosi-initrd-posttrans new/suse-module-tools-16.0.51/mkosi-initrd-posttrans
--- old/suse-module-tools-16.0.50/mkosi-initrd-posttrans	1970-01-01 01:00:00.000000000 +0100
+++ new/suse-module-tools-16.0.51/mkosi-initrd-posttrans	2024-09-05 11:58:31.000000000 +0200
@@ -0,0 +1,55 @@
+#!/bin/sh
+
+: "${MKOSI_INITRD:=/usr/bin/mkosi-initrd}"
+
+if [ ! -x "$MKOSI_INITRD" ]; then
+	echo "${0##*/}: mkosi-initrd is not installed, not rebuilding the initrd." >&2
+	exit 0
+fi
+
+# FIXME: mkosi-initrd fails to cp files directly to /boot
+MKOSI_INITRD_STAGING_DIR="$(mktemp -p /var/tmp/ -d -t mkosi-initrd-stagingXXXXXXXX)"
+if [ ! -d "$MKOSI_INITRD_STAGING_DIR" ]; then
+	echo "${0##*/}: failed to create mkosi-initrd staging directory." >&2
+	exit 1
+fi
+
+initrd_warn_chroot_build() {
+	# FIXME: mkosi-initrd does not provide anything like --regenerate-all yet
+	echo "Please regenerate all the initrds with \"$MKOSI_INITRD\" as soon as your system is complete." >&2
+}
+
+initrd_regenerate() {
+	local kver="$1"
+	local res
+
+	"$MKOSI_INITRD" --kernel-version "$kver" -O "$MKOSI_INITRD_STAGING_DIR" -o "initrd-$kver"
+	res=$?
+	[ $res -ne 0 ] && return $res
+
+	chmod 600 "$MKOSI_INITRD_STAGING_DIR/initrd-$kver"
+	res=$?
+	[ $res -ne 0 ] && return $res
+
+	cp --reflink=auto "$MKOSI_INITRD_STAGING_DIR/initrd-$kver" "/boot/initrd-$kver"
+	return $?
+}
+
+initrd_regenerate_all() {
+	# FIXME: mkosi-initrd does not provide anything like --regenerate-all yet
+	for d in /lib/modules/*; do
+		[ -d "$d" ] || continue
+		kver=${d##*/}
+		if "$MKOSI_INITRD" --kernel-version "$kver" -O "$MKOSI_INITRD_STAGING_DIR" -o "initrd-$kver" \
+			&& chmod 600 "$MKOSI_INITRD_STAGING_DIR/initrd-$kver"; then
+			# The staging dir will contain: initrd-<kver> -> initrd-<kver>.cpio.zst
+			cp --reflink=auto "$MKOSI_INITRD_STAGING_DIR/initrd-$kver" "/boot/initrd-$kver"
+			rm -f "$MKOSI_INITRD_STAGING_DIR/initrd-$kver"*
+		fi
+	done
+}
+
+initrd_cleanup() {
+	rm -rf "$MKOSI_INITRD_STAGING_DIR"
+}
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/suse-module-tools-16.0.50/regenerate-initrd-posttrans new/suse-module-tools-16.0.51/regenerate-initrd-posttrans
--- old/suse-module-tools-16.0.50/regenerate-initrd-posttrans	2024-08-30 15:03:25.000000000 +0200
+++ new/suse-module-tools-16.0.51/regenerate-initrd-posttrans	2024-09-05 11:58:31.000000000 +0200
@@ -15,14 +15,29 @@
 # to have all initrds generated. This script is called from posttrans
 # and takes care of generating the initrds
 
-: ${DRACUT:=/usr/bin/dracut}
-if [ ! -x "$DRACUT" ]; then
-    echo "${0##*/}: dracut is not installed, not rebuilding the initrd" >&2
-    exit 0
-fi
+# get the configured INITRD_GENERATOR from /etc/sysconfig/bootloader
+INITRD_GENERATOR="$(. /etc/sysconfig/bootloader 2>/dev/null && echo "$INITRD_GENERATOR")"
+[ "$INITRD_GENERATOR" = "mkosi" ] && INITRD_GENERATOR="mkosi-initrd"
+
+# dracut is the default initrd generator
+: "${INITRD_GENERATOR:=dracut}"
+
+# check if the configured initrd generator is supported
+[ "$INITRD_GENERATOR" = "dracut" ] || [ "$INITRD_GENERATOR" = "mkosi-initrd" ] || {
+	echo "${0##*/}: the initrd generator \"$INITRD_GENERATOR\" configured in /etc/sysconfig/bootloader is not supported." >&2
+	echo "${0##*/}: valid options are \"dracut\" or \"mkosi-initrd\"." >&2
+	exit 1
+}
+
+# check if the specific posttrans script is available
+[ -x "/usr/lib/module-init-tools/${INITRD_GENERATOR}-posttrans" ] || {
+	echo "${0##*/}: missing required /usr/lib/module-init-tools/${INITRD_GENERATOR}-posttrans." >&2
+	exit 1
+}
+. /usr/lib/module-init-tools/"${INITRD_GENERATOR}"-posttrans
 
 if [ -e "/usr/bin/sdbootutil" ] && /usr/bin/sdbootutil is-installed; then
-    is_sdbootutil=1
+	is_sdbootutil=1
 fi
 
 dir=/run/regenerate-initrd
@@ -45,12 +60,12 @@
 
 for f in "$dir"/*; do
 	case $f in
-	    "$dir/*")
+		"$dir/*")
 		[ -e "$f" ] || break;;
 	esac
 	# check if we are in a build chroot
-	if ! [  -f /etc/fstab -a ! -e /.buildenv -a -x "$DRACUT" ] ; then
-		echo "Please run \"$DRACUT -f --regenerate-all\" as soon as your system is complete." >&2
+	if [ ! -f /etc/fstab ] || [ -e /.buildenv ]; then
+		initrd_warn_chroot_build
 		rm "$dir"/*
 		exit 0
 	fi
@@ -66,7 +81,7 @@
 		if [ -n "$is_sdbootutil" ]; then
 			/usr/bin/sdbootutil --no-reuse-initrd --default-snapshot add-all-kernels
 		else
-			"$DRACUT" -f --regenerate-all
+			initrd_regenerate_all
 		fi
 		work_done=yes
 	}
@@ -88,19 +103,20 @@
 			continue
 		}
 		if [ -n "$is_sdbootutil" ]; then
-			if ! /usr/bin/sdbootutil --no-reuse-initrd --default-snapshot add-kernel "$kver"; then
-				err=$?
-			else
-				work_done=yes
-			fi
-		elif ! "$DRACUT" -f --kver "$kver"; then
+			/usr/bin/sdbootutil --no-reuse-initrd --default-snapshot add-kernel "$kver"
 			err=$?
+			[ $err -eq 0 ] && work_done=yes
 		else
-			work_done=yes
+			initrd_regenerate "$kver"
+			err=$?
+			[ $err -eq 0 ] && work_done=yes
 		fi
 	done
 fi
 
+# Clean-up before exit
+trap 'initrd_cleanup' EXIT
+
 # For XEN/grub2 configurations, make sure the updated initrds are copied
 # to the EFI system partition. See /etc/grub.d/20_linux_xen.
 # The test for xen*.gz is simplistic but should be correct here.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/suse-module-tools-16.0.50/suse-module-tools.spec new/suse-module-tools-16.0.51/suse-module-tools.spec
--- old/suse-module-tools-16.0.50/suse-module-tools.spec	2024-08-30 15:03:25.000000000 +0200
+++ new/suse-module-tools-16.0.51/suse-module-tools.spec	2024-09-05 11:58:31.000000000 +0200
@@ -37,7 +37,7 @@
 %global modprobe_conf_rpmsave %(echo "%{modprobe_conf_files}" | sed 's,\\([^ ]*\\),%{_sysconfdir}/modprobe.d/\\1.conf.rpmsave,g')
 
 Name:           suse-module-tools
-Version:        16.0.50
+Version:        16.0.51
 Release:        0
 Summary:        Configuration for module loading and SUSE-specific utilities for KMPs
 License:        GPL-2.0-or-later
@@ -52,7 +52,6 @@
 Requires:       coreutils
 Requires:       findutils
 Requires:       systemd-rpm-macros
-Requires:       (sdbootutil if sdbootutil)
 Requires:       rpm
 Requires(post): /usr/bin/grep
 Requires(post): /usr/bin/sed
@@ -120,6 +119,8 @@
 install -d -m 755 "%{buildroot}/usr/lib/module-init-tools"
 install -pm 755 -t "%{buildroot}/usr/lib/module-init-tools/" \
 	weak-modules2 driver-check.sh unblacklist lsinitrd-quick get_dracut_drivers
+install -pm 755 "dracut-posttrans" "%{buildroot}/usr/lib/module-init-tools/"
+install -pm 755 "mkosi-initrd-posttrans" "%{buildroot}/usr/lib/module-init-tools/"
 install -pm 755 "regenerate-initrd-posttrans" "%{buildroot}/usr/lib/module-init-tools/"
 install -d -m 755 "%{buildroot}/usr/lib/module-init-tools/kernel-scriptlets"
 install -pm 755 "kernel-scriptlets/cert-script" "%{buildroot}/usr/lib/module-init-tools/kernel-scriptlets"
@@ -249,6 +250,8 @@
 #
 %files scriptlets
 /usr/lib/module-init-tools/kernel-scriptlets
+/usr/lib/module-init-tools/dracut-posttrans
+/usr/lib/module-init-tools/mkosi-initrd-posttrans
 /usr/lib/module-init-tools/regenerate-initrd-posttrans
 
 %changelog
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/suse-module-tools-16.0.50/weak-modules2 new/suse-module-tools-16.0.51/weak-modules2
--- old/suse-module-tools-16.0.50/weak-modules2	2024-08-30 15:03:25.000000000 +0200
+++ new/suse-module-tools-16.0.51/weak-modules2	2024-09-05 11:58:31.000000000 +0200
@@ -56,7 +56,9 @@
 # kmps: list of kmps, newest first
 #
 
-: ${DRACUT:=/usr/bin/dracut}
+: "${DRACUT:=/usr/bin/dracut}"
+: "${MKOSI_INITRD:=/usr/bin/mkosi-initrd}"
+
 find_lsinitrd() {
     local lsi
     LSINITRD=
@@ -100,6 +102,24 @@
     dlog "SDBOOTUTIL=$SDBOOTUTIL"
 }
 
+find_initrd_generator() {
+    INITRD_GENERATOR="$(. /etc/sysconfig/bootloader 2>/dev/null && echo "$INITRD_GENERATOR")"
+
+    # dracut is the default initrd generator
+    if [ -z "$INITRD_GENERATOR" ]; then
+	INITRD_GENERATOR="dracut"
+    elif [ "$INITRD_GENERATOR" = "mkosi" ]; then
+	INITRD_GENERATOR="mkosi-initrd"
+    fi
+
+    [ "$INITRD_GENERATOR" = "dracut" ] || [ "$INITRD_GENERATOR" = "mkosi-initrd" ] || {
+	echo "ERROR: the initrd generator \"$INITRD_GENERATOR\" configured in /etc/sysconfig/bootloader is not supported." >&2
+	exit 1
+    }
+
+    dlog "INITRD_GENERATOR=$INITRD_GENERATOR"
+}
+
 find_usrmerge_boot() {
     local filename=$1
     local kver=$2
@@ -453,7 +473,7 @@
 DRACUT_BUILTIN_CONFDIR=/usr/lib/dracut/dracut.conf.d
 GET_DRACUT_DRIVERS=/usr/lib/module-init-tools/get_dracut_drivers
 
-get_initrd_basenames() {
+get_dracut_basenames() {
     local setpriv=$(command -v setpriv)
     local conf= cf
 
@@ -479,6 +499,24 @@
 		   "$GET_DRACUT_DRIVERS" "$conf"
 }
 
+get_mkosi_initrd_basenames() {
+    # TODO: get drivers from mkosi-initrd conf (KernelModulesInclude=, KernelModulesExclude=)
+    get_current_basenames "$1"
+}
+
+get_initrd_basenames() {
+    local krel=$1
+
+    case "$INITRD_GENERATOR" in
+	"dracut")
+	    get_dracut_basenames "$krel"
+	    ;;
+	"mkosi-initrd")
+	    get_mkosi_initrd_basenames "$krel"
+	    ;;
+    esac
+}
+
 # test if rebuilding initrd is needed for $krel.
 # stdin - list of changed modules ("_kernel_" for the whole kernel)
 needs_initrd() {
@@ -487,12 +525,21 @@
     # Don't generate an initrd for kdump here. It's done automatically with mkdumprd when
     # /etc/init.d/boot.kdump is called to load the kdump kernel. See mkdumprd(8) why
     # it is done this way.
-    if [[ "$krel" == *kdump* ]] ; then
+    if [[ "$krel" == *kdump* ]]; then
         return 1
     fi
 
-    if ! [ -f /etc/fstab -a ! -e /.buildenv -a -x "$DRACUT" ] ; then
-	echo "Please run \"$DRACUT -f /boot/initrd-$krel $krel\" as soon as your system is complete." >&2
+    if ! [ -f /etc/fstab -a ! -e /.buildenv ]; then
+	case "$INITRD_GENERATOR" in
+	"dracut")
+	    echo "Please run \"$DRACUT -f /boot/initrd-$krel $krel\" as soon as your system is complete." >&2
+	    ;;
+	"mkosi-initrd")
+	    # FIXME: mkosi-initrd fails to cp files directly to /boot
+	    echo "Please run \"$MKOSI_INITRD --kernel-version $krel -o initrd-$krel && \
+chmod 600 initrd-$krel && cp initrd-$krel /boot\" as soon as your system is complete." >&2
+	    ;;
+	esac
 	return 1
     fi
     # KMPs can force initrd rebuild with %kernel_module_package -b that sets
@@ -556,7 +603,18 @@
 		    doit "$SDBOOTUTIL" --no-reuse-initrd add-kernel "$krel"
 		elif [ -z "$SDBOOTUTIL" ]; then
 		    local initrd="$(get_current_initrd $krel)"
-		    doit "$DRACUT" -f "$initrd" $krel
+		    case "$INITRD_GENERATOR" in
+			"dracut")
+			    doit "$DRACUT" -f "$initrd" $krel
+			    ;;
+			"mkosi-initrd")
+			    # FIXME: mkosi-initrd fails to cp files directly to /boot
+			    doit "$MKOSI_INITRD" --kernel-version "$krel" -O "$tmpdir" -o "initrd-$krel" && \
+			    doit chmod 600 "$tmpdir/initrd-$krel" && \
+			    doit cp --reflink=auto "$tmpdir/initrd-$krel" "$initrd" && \
+			    doit rm -f "$tmpdir/initrd-$krel"*
+			    ;;
+		    esac
 		fi
 		status=$?
 	    fi
@@ -929,6 +987,7 @@
 find_depmod
 find_lsinitrd
 find_sdbootutil
+find_initrd_generator
 
 tmpdir=$(mktemp -d /var/tmp/${0##*/}.XXXXXX)
 trap "rm -rf $tmpdir" EXIT

++++++ suse-module-tools.obsinfo ++++++
--- /var/tmp/diff_new_pack.r4zWe2/_old	2024-09-12 16:54:13.547533039 +0200
+++ /var/tmp/diff_new_pack.r4zWe2/_new	2024-09-12 16:54:13.551533206 +0200
@@ -1,5 +1,5 @@
 name: suse-module-tools
-version: 16.0.50
-mtime: 1725023005
-commit: 503d772e6951ef8c268bc14f39b4c8d5f5a90986
+version: 16.0.51
+mtime: 1725530311
+commit: 747e2bfce7f245987ff87cea6b80c31ce39dc2fa

    

commit suse-module-tools for openSUSE:Factory

Source-Sync