Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package dracut for openSUSE:Factory checked
in at 2023-11-20 21:18:57
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/dracut (Old)
and /work/SRC/openSUSE:Factory/.dracut.new.2521 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dracut"
Mon Nov 20 21:18:57 2023 rev:216 rq:1127289 version:059+suse.522.g0fc72191
Changes:
--------
--- /work/SRC/openSUSE:Factory/dracut/dracut.changes 2023-11-01
22:09:28.650551395 +0100
+++ /work/SRC/openSUSE:Factory/.dracut.new.2521/dracut.changes 2023-11-20
21:19:10.797985706 +0100
@@ -1,0 +2,14 @@
+Fri Nov 17 11:38:12 UTC 2023 - antonio.fei...@suse.com
+
+- Update to version 059+suse.522.g0fc72191:
+ * fix(install.d): do not create rescue entry when working with UKIs
+ * fix(install.d): skip if $KERNEL_INSTALL_INITRD_GENERATOR is set otherwise
+ * feat(resume): do not attempt to install systemd-hibernate-resume@.service
+ * feat(install.d): add sort-key field to rescue BLS entries
+ * fix(install.d): do not generate a new initrd if any INITRD_FILE is provided
+ * fix(install.d): do not create initramfs if the supplied image is UKI
+ * feat(install.d): allow using dracut in combination with ukify
+ * fix(resume): add new systemd-hibernate-resume.service
+ * feat(systemd): install systemd-executor
+
+-------------------------------------------------------------------
Old:
----
dracut-059+suse.511.g0bdb16ac.obscpio
New:
----
dracut-059+suse.522.g0fc72191.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ dracut.spec ++++++
--- /var/tmp/diff_new_pack.nLkh3s/_old 2023-11-20 21:19:13.998103810 +0100
+++ /var/tmp/diff_new_pack.nLkh3s/_new 2023-11-20 21:19:14.002103958 +0100
@@ -25,7 +25,7 @@
%endif
Name: dracut
-Version: 059+suse.511.g0bdb16ac
+Version: 059+suse.522.g0fc72191
Release: 0
Summary: Event driven initramfs infrastructure
License: GPL-2.0-only AND GPL-2.0-or-later AND LGPL-2.1-or-later
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.nLkh3s/_old 2023-11-20 21:19:14.086107058 +0100
+++ /var/tmp/diff_new_pack.nLkh3s/_new 2023-11-20 21:19:14.090107206 +0100
@@ -1,6 +1,6 @@
<servicedata>
<service name="tar_scm">
<param
name="url">https://github.com/opensuse/dracut.git</param>
- <param
name="changesrevision">0bdb16ac0d445cf1051875116c4c015eb2e8575a</param></service></servicedata>
+ <param
name="changesrevision">0fc7219102945050453e5512c989998e94860219</param></service></servicedata>
(No newline at EOF)
++++++ dracut-059+suse.511.g0bdb16ac.obscpio ->
dracut-059+suse.522.g0fc72191.obscpio ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/dracut-059+suse.511.g0bdb16ac/install.d/50-dracut.install
new/dracut-059+suse.522.g0fc72191/install.d/50-dracut.install
--- old/dracut-059+suse.511.g0bdb16ac/install.d/50-dracut.install
2023-10-30 13:53:00.000000000 +0100
+++ new/dracut-059+suse.522.g0fc72191/install.d/50-dracut.install
2023-11-17 12:37:20.000000000 +0100
@@ -4,6 +4,7 @@
KERNEL_VERSION="$2"
BOOT_DIR_ABS="$3"
KERNEL_IMAGE="$4"
+INITRD_OPTIONS_SHIFT=4
# If KERNEL_INSTALL_MACHINE_ID is defined but empty, BOOT_DIR_ABS is a fake
directory.
# So, let's skip to create initrd.
@@ -11,15 +12,33 @@
exit 0
fi
+# Do not attempt to create initramfs if the supplied image is already a UKI
+if [[ "$KERNEL_INSTALL_IMAGE_TYPE" = "uki" ]]; then
+ exit 0
+fi
+
# Mismatching the install layout and the --uefi/--no-uefi opts just creates a
mess.
if [[ $KERNEL_INSTALL_LAYOUT == "uki" && -n $KERNEL_INSTALL_STAGING_AREA ]];
then
BOOT_DIR_ABS="$KERNEL_INSTALL_STAGING_AREA"
- IMAGE="uki.efi"
- UEFI_OPTS="--uefi"
+ if [[ -z $KERNEL_INSTALL_UKI_GENERATOR || $KERNEL_INSTALL_UKI_GENERATOR ==
"dracut" ]]; then
+ # No uki generator preference set or we have been chosen
+ IMAGE="uki.efi"
+ UEFI_OPTS="--uefi"
+ elif [[ -z $KERNEL_INSTALL_INITRD_GENERATOR ||
$KERNEL_INSTALL_INITRD_GENERATOR == "dracut" ]]; then
+ # We aren't the uki generator, but we have been requested to make the
initrd
+ IMAGE="initrd"
+ UEFI_OPTS="--no-uefi"
+ else
+ exit 0
+ fi
elif [[ $KERNEL_INSTALL_LAYOUT == "bls" && -n $KERNEL_INSTALL_STAGING_AREA ]];
then
BOOT_DIR_ABS="$KERNEL_INSTALL_STAGING_AREA"
- IMAGE="initrd"
- UEFI_OPTS="--no-uefi"
+ if [[ -z $KERNEL_INSTALL_INITRD_GENERATOR ||
$KERNEL_INSTALL_INITRD_GENERATOR == "dracut" ]]; then
+ IMAGE="initrd"
+ UEFI_OPTS="--no-uefi"
+ else
+ exit 0
+ fi
else
# No layout information, use users --uefi/--no-uefi preference
UEFI_OPTS=""
@@ -35,6 +54,12 @@
case "$COMMAND" in
add)
+ if (($# > INITRD_OPTIONS_SHIFT)); then
+ [[ $KERNEL_INSTALL_VERBOSE == 1 ]] && echo \
+ "One or more INITRD_FILEs were provided to the 'add' command,
skipping generating a new one"
+ exit 0
+ fi
+
if [[ $IMAGE == "uki.efi" ]]; then
IMAGE_PREGENERATED=${KERNEL_IMAGE%/*}/uki.efi
else
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/dracut-059+suse.511.g0bdb16ac/install.d/51-dracut-rescue.install
new/dracut-059+suse.522.g0fc72191/install.d/51-dracut-rescue.install
--- old/dracut-059+suse.511.g0bdb16ac/install.d/51-dracut-rescue.install
2023-10-30 13:53:00.000000000 +0100
+++ new/dracut-059+suse.522.g0fc72191/install.d/51-dracut-rescue.install
2023-11-17 12:37:20.000000000 +0100
@@ -7,6 +7,17 @@
BOOT_DIR_ABS="${3%/*}/0-rescue"
KERNEL_IMAGE="$4"
+# Skip this plugin if we're using a different generator. If nothing is
specified,
+# assume we're wanted since we're installed.
+if [ "${KERNEL_INSTALL_INITRD_GENERATOR:-dracut}" != "dracut" ]; then
+ exit 0
+fi
+
+# Do not attempt to create a rescue image when working with UKIs
+if [[ $KERNEL_INSTALL_LAYOUT == "uki" || $KERNEL_INSTALL_IMAGE_TYPE == "uki"
]]; then
+ exit 0
+fi
+
dropindirs_sort() {
suffix=$1
shift
@@ -38,6 +49,9 @@
[[ -n $PRETTY_NAME ]] || PRETTY_NAME="Linux $KERNEL_VERSION"
+SORT_KEY="$IMAGE_ID"
+[[ -z "$SORT_KEY" ]] && SORT_KEY="$ID"
+
if [[ ${KERNEL_INSTALL_MACHINE_ID+x} ]]; then
MACHINE_ID=$KERNEL_INSTALL_MACHINE_ID
elif [[ -f /etc/machine-id ]]; then
@@ -128,6 +142,7 @@
echo "title $PRETTY_NAME - Rescue Image"
echo "version $KERNEL_VERSION"
echo "machine-id $MACHINE_ID"
+ [[ -n "$SORT_KEY" ]] && echo "sort-key $SORT_KEY"
echo "options ${BOOT_OPTIONS[*]} rd.auto=1"
echo "linux $BOOT_DIR/linux"
echo "initrd $BOOT_DIR/initrd"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/dracut-059+suse.511.g0bdb16ac/modules.d/00systemd/module-setup.sh
new/dracut-059+suse.522.g0fc72191/modules.d/00systemd/module-setup.sh
--- old/dracut-059+suse.511.g0bdb16ac/modules.d/00systemd/module-setup.sh
2023-10-30 13:53:00.000000000 +0100
+++ new/dracut-059+suse.522.g0fc72191/modules.d/00systemd/module-setup.sh
2023-11-17 12:37:20.000000000 +0100
@@ -34,6 +34,7 @@
"$systemdutildir"/systemd \
"$systemdutildir"/systemd-coredump \
"$systemdutildir"/systemd-cgroups-agent \
+ "$systemdutildir"/systemd-executor \
"$systemdutildir"/systemd-shutdown \
"$systemdutildir"/systemd-reply-password \
"$systemdutildir"/systemd-fsck \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/dracut-059+suse.511.g0bdb16ac/modules.d/95resume/module-setup.sh
new/dracut-059+suse.522.g0fc72191/modules.d/95resume/module-setup.sh
--- old/dracut-059+suse.511.g0bdb16ac/modules.d/95resume/module-setup.sh
2023-10-30 13:53:00.000000000 +0100
+++ new/dracut-059+suse.522.g0fc72191/modules.d/95resume/module-setup.sh
2023-11-17 12:37:20.000000000 +0100
@@ -67,7 +67,7 @@
if dracut_module_included "systemd" && [[ -x
$dracutsysrootdir$systemdutildir/systemd-hibernate-resume ]]; then
inst_multiple -o \
"$systemdutildir"/system-generators/systemd-hibernate-resume-generator \
- "$systemdsystemunitdir"/systemd-hibernate-resume@.service \
+ "$systemdsystemunitdir"/systemd-hibernate-resume.service \
"$systemdutildir"/systemd-hibernate-resume
return 0
fi
++++++ dracut.obsinfo ++++++
--- /var/tmp/diff_new_pack.nLkh3s/_old 2023-11-20 21:19:14.382117983 +0100
+++ /var/tmp/diff_new_pack.nLkh3s/_new 2023-11-20 21:19:14.386118131 +0100
@@ -1,5 +1,5 @@
name: dracut
-version: 059+suse.511.g0bdb16ac
-mtime: 1698670380
-commit: 0bdb16ac0d445cf1051875116c4c015eb2e8575a
+version: 059+suse.522.g0fc72191
+mtime: 1700221040
+commit: 0fc7219102945050453e5512c989998e94860219
