Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package dracut for openSUSE:Factory checked in at 2025-09-20 22:03:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dracut (Old) and /work/SRC/openSUSE:Factory/.dracut.new.27445 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dracut" Sat Sep 20 22:03:54 2025 rev:248 rq:1306006 version:059+suse.762.g8903c5e2 Changes: -------- --- /work/SRC/openSUSE:Factory/dracut/dracut.changes 2025-09-12 21:09:22.574838005 +0200 +++ /work/SRC/openSUSE:Factory/.dracut.new.27445/dracut.changes 2025-09-20 22:04:05.194686460 +0200 @@ -1,0 +2,8 @@ +Fri Sep 19 12:45:53 UTC 2025 - [email protected] + +- Update to version 059+suse.762.g8903c5e2: + * fix(dracut.sh): check that custom fw search path exists before reading it + * fix(fs-lib): include modules for charsets for working vfat support + * fix(lsinitrd, dracut-initramfs-restore): detect initrd for BLS Type #1 entries (bsc#1248271) + +------------------------------------------------------------------- Old: ---- dracut-059+suse.757.g0d1d426d.obscpio New: ---- dracut-059+suse.762.g8903c5e2.obscpio ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dracut.spec ++++++ --- /var/tmp/diff_new_pack.xyXSPq/_old 2025-09-20 22:04:06.098724380 +0200 +++ /var/tmp/diff_new_pack.xyXSPq/_new 2025-09-20 22:04:06.102724548 +0200 @@ -26,7 +26,7 @@ %endif Name: dracut -Version: 059+suse.757.g0d1d426d +Version: 059+suse.762.g8903c5e2 Release: 0 Summary: Event driven initramfs infrastructure License: GPL-2.0-only AND GPL-2.0-or-later AND LGPL-2.1-or-later @@ -70,7 +70,7 @@ # suse-module-tools >= 15.4.7 is prepared for the removal of mkinitrd-suse.sh Conflicts: suse-module-tools < 15.4.7 %{?systemd_requires} -Requires: (jq if nvme-cli) +Requires: (jq if (nvme-cli or systemd-boot or grub2-x86_64-efi-bls)) %description Dracut contains tools to create a bootable initramfs for Linux kernels >= 2.6. ++++++ README.susemaint ++++++ --- /var/tmp/diff_new_pack.xyXSPq/_old 2025-09-20 22:04:06.134725890 +0200 +++ /var/tmp/diff_new_pack.xyXSPq/_new 2025-09-20 22:04:06.138726058 +0200 @@ -436,4 +436,6 @@ 52155dde fix(dracut): library directory creation in --kernel-only 1b11affd fix(74nvmf): only set netroot if it's yet empty f879b04d fix(74nvmf): make sure autoconnect script is run at least once +51bd1331 fix(fs-lib): include modules for charsets for working vfat support +89dcdd91 fix(dracut.sh): check that custom fw search patch exists before reading it ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.xyXSPq/_old 2025-09-20 22:04:06.170727400 +0200 +++ /var/tmp/diff_new_pack.xyXSPq/_new 2025-09-20 22:04:06.174727568 +0200 @@ -1,6 +1,6 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/opensuse/dracut.git</param> - <param name="changesrevision">0d1d426da1bd2a522e9381094d1b3579ac3199de</param></service></servicedata> + <param name="changesrevision">8903c5e2a507acb2d4fbaa347b0c7d8be2c6c845</param></service></servicedata> (No newline at EOF) ++++++ dracut-059+suse.757.g0d1d426d.obscpio -> dracut-059+suse.762.g8903c5e2.obscpio ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dracut-059+suse.757.g0d1d426d/dracut-initramfs-restore.sh new/dracut-059+suse.762.g8903c5e2/dracut-initramfs-restore.sh --- old/dracut-059+suse.757.g0d1d426d/dracut-initramfs-restore.sh 2025-09-11 14:38:19.000000000 +0200 +++ new/dracut-059+suse.762.g8903c5e2/dracut-initramfs-restore.sh 2025-09-19 14:41:41.000000000 +0200 @@ -28,26 +28,49 @@ mount -o ro /boot &> /dev/null || true -if [[ -d /efi/loader/entries || -L /efi/loader/entries ]] \ - && [[ -d /efi/$MACHINE_ID || -L /efi/$MACHINE_ID ]]; then - IMG="/efi/${MACHINE_ID}/${KERNEL_VERSION}/initrd" -elif [[ -d /boot/loader/entries || -L /boot/loader/entries ]] \ - && [[ -d /boot/$MACHINE_ID || -L /boot/$MACHINE_ID ]]; then - IMG="/boot/${MACHINE_ID}/${KERNEL_VERSION}/initrd" -elif [[ -d /boot/efi/loader/entries || -L /boot/efi/loader/entries ]] \ - && [[ -d /boot/efi/$MACHINE_ID || -L /boot/efi/$MACHINE_ID ]]; then - IMG="/boot/efi/$MACHINE_ID/$KERNEL_VERSION/initrd" -elif [[ -f /lib/modules/${KERNEL_VERSION}/initrd ]]; then - IMG="/lib/modules/${KERNEL_VERSION}/initrd" -elif [[ -f /boot/initrd-${KERNEL_VERSION} ]]; then - IMG="/boot/initrd-${KERNEL_VERSION}" -elif mountpoint -q /efi; then - IMG="/efi/$MACHINE_ID/$KERNEL_VERSION/initrd" -elif mountpoint -q /boot/efi; then - IMG="/boot/efi/$MACHINE_ID/$KERNEL_VERSION/initrd" -else - echo "No initramfs image found to restore!" - exit 1 +if command -v bootctl > /dev/null && command -v jq > /dev/null; then + # get proper path to $BOOT + base_path=$(bootctl -x) + # get initrd key of the selected bootloader entry (i.e., the one that + # is actually used to boot the system) + mapfile -t files < <(bootctl --json=pretty list 2> /dev/null | jq -r '.[] | select(.isSelected).initrd[]' 2> /dev/null) + if [[ ${#files[@]} -ge 1 ]] && [[ -e "${base_path}${files[0]}" ]]; then + IMG="${base_path}${files[0]}" + else + # if the selected bootloader entry does not have any initrd keys, check + # the default (maybe the current selected entry was removed) + # also check at least that the default bootloader entry has the same + # kernel version + mapfile -t files < <(bootctl --json=pretty list 2> /dev/null | jq -r '.[] | select(.isDefault).initrd[]' 2> /dev/null) + if [[ ${#files[@]} -ge 1 ]] && [[ -e "${base_path}${files[0]}" ]] \ + && [[ ${files[0]} == *"${kernel_version}"* ]]; then + IMG="${base_path}${files[0]}" + fi + fi +fi + +if [[ -z $IMG ]]; then + if [[ -d /efi/loader/entries || -L /efi/loader/entries ]] \ + && [[ -d /efi/$MACHINE_ID || -L /efi/$MACHINE_ID ]]; then + IMG="/efi/${MACHINE_ID}/${KERNEL_VERSION}/initrd" + elif [[ -d /boot/loader/entries || -L /boot/loader/entries ]] \ + && [[ -d /boot/$MACHINE_ID || -L /boot/$MACHINE_ID ]]; then + IMG="/boot/${MACHINE_ID}/${KERNEL_VERSION}/initrd" + elif [[ -d /boot/efi/loader/entries || -L /boot/efi/loader/entries ]] \ + && [[ -d /boot/efi/$MACHINE_ID || -L /boot/efi/$MACHINE_ID ]]; then + IMG="/boot/efi/$MACHINE_ID/$KERNEL_VERSION/initrd" + elif [[ -f /lib/modules/${KERNEL_VERSION}/initrd ]]; then + IMG="/lib/modules/${KERNEL_VERSION}/initrd" + elif [[ -f /boot/initrd-${KERNEL_VERSION} ]]; then + IMG="/boot/initrd-${KERNEL_VERSION}" + elif mountpoint -q /efi; then + IMG="/efi/$MACHINE_ID/$KERNEL_VERSION/initrd" + elif mountpoint -q /boot/efi; then + IMG="/boot/efi/$MACHINE_ID/$KERNEL_VERSION/initrd" + else + echo "No initramfs image found to restore!" + exit 1 + fi fi cd /run/initramfs diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dracut-059+suse.757.g0d1d426d/dracut.sh new/dracut-059+suse.762.g8903c5e2/dracut.sh --- old/dracut-059+suse.757.g0d1d426d/dracut.sh 2025-09-11 14:38:19.000000000 +0200 +++ new/dracut-059+suse.762.g8903c5e2/dracut.sh 2025-09-19 14:41:41.000000000 +0200 @@ -1092,7 +1092,8 @@ [[ $lvmconf_l ]] && lvmconf=$lvmconf_l [[ $dracutbasedir ]] || dracutbasedir="$dracutsysrootdir"/usr/lib/dracut [[ $fw_dir ]] || { - fw_path_para=$(< /sys/module/firmware_class/parameters/path) + [[ -e /sys/module/firmware_class/parameters/path ]] \ + && fw_path_para=$(< /sys/module/firmware_class/parameters/path) fw_dir="${fw_path_para:+$dracutsysrootdir$fw_path_para:}$dracutsysrootdir/lib/firmware/updates/$kernel:$dracutsysrootdir/lib/firmware/updates:$dracutsysrootdir/lib/firmware/$kernel:$dracutsysrootdir/lib/firmware" } [[ $tmpdir_l ]] && tmpdir="$tmpdir_l" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dracut-059+suse.757.g0d1d426d/lsinitrd.sh new/dracut-059+suse.762.g8903c5e2/lsinitrd.sh --- old/dracut-059+suse.757.g0d1d426d/lsinitrd.sh 2025-09-11 14:38:19.000000000 +0200 +++ new/dracut-059+suse.762.g8903c5e2/lsinitrd.sh 2025-09-19 14:41:41.000000000 +0200 @@ -109,39 +109,59 @@ exit 1 fi else - if [[ -d /efi/Default ]] || [[ -d /boot/Default ]] || [[ -d /boot/efi/Default ]]; then - MACHINE_ID="Default" - elif [[ -s /etc/machine-id ]]; then - read -r MACHINE_ID < /etc/machine-id - [[ $MACHINE_ID == "uninitialized" ]] && MACHINE_ID="Default" - else - MACHINE_ID="Default" + if command -v bootctl > /dev/null && command -v jq > /dev/null; then + # get proper path to $BOOT + base_path=$(bootctl -x) + # get initrd key of the selected bootloader entry (i.e., the one that + # is actually used to boot the system) + mapfile -t files < <(bootctl --json=pretty list 2> /dev/null | jq -r '.[] | select(.isSelected).initrd[]' 2> /dev/null) + if [[ ${#files[@]} -ge 1 ]] && [[ -e "${base_path}${files[0]}" ]]; then + image="${base_path}${files[0]}" + else + # if the selected bootloader entry does not have any initrd keys, check + # the default (maybe the current selected entry was removed) + mapfile -t files < <(bootctl --json=pretty list 2> /dev/null | jq -r '.[] | select(.isDefault).initrd[]' 2> /dev/null) + if [[ ${#files[@]} -ge 1 ]] && [[ -e "${base_path}${files[0]}" ]]; then + image="${base_path}${files[0]}" + fi + fi fi - if [[ -d /efi/loader/entries || -L /efi/loader/entries ]] \ - && [[ $MACHINE_ID ]] \ - && [[ -d /efi/${MACHINE_ID} || -L /efi/${MACHINE_ID} ]]; then - image="/efi/${MACHINE_ID}/${KERNEL_VERSION}/initrd" - elif [[ -d /boot/loader/entries || -L /boot/loader/entries ]] \ - && [[ $MACHINE_ID ]] \ - && [[ -d /boot/${MACHINE_ID} || -L /boot/${MACHINE_ID} ]]; then - image="/boot/${MACHINE_ID}/${KERNEL_VERSION}/initrd" - elif [[ -d /boot/efi/loader/entries || -L /boot/efi/loader/entries ]] \ - && [[ $MACHINE_ID ]] \ - && [[ -d /boot/efi/${MACHINE_ID} || -L /boot/efi/${MACHINE_ID} ]]; then - image="/boot/efi/${MACHINE_ID}/${KERNEL_VERSION}/initrd" - elif [[ -f /lib/modules/${KERNEL_VERSION}/initrd ]]; then - image="/lib/modules/${KERNEL_VERSION}/initrd" - elif [[ -f /boot/initrd-${KERNEL_VERSION} ]]; then - image="/boot/initrd-${KERNEL_VERSION}" - elif [[ $MACHINE_ID ]] \ - && mountpoint -q /efi; then - image="/efi/${MACHINE_ID}/${KERNEL_VERSION}/initrd" - elif [[ $MACHINE_ID ]] \ - && mountpoint -q /boot/efi; then - image="/boot/efi/${MACHINE_ID}/${KERNEL_VERSION}/initrd" - else - image="" + if [[ -z $image ]]; then + if [[ -d /efi/Default ]] || [[ -d /boot/Default ]] || [[ -d /boot/efi/Default ]]; then + MACHINE_ID="Default" + elif [[ -s /etc/machine-id ]]; then + read -r MACHINE_ID < /etc/machine-id + [[ $MACHINE_ID == "uninitialized" ]] && MACHINE_ID="Default" + else + MACHINE_ID="Default" + fi + + if [[ -d /efi/loader/entries || -L /efi/loader/entries ]] \ + && [[ $MACHINE_ID ]] \ + && [[ -d /efi/${MACHINE_ID} || -L /efi/${MACHINE_ID} ]]; then + image="/efi/${MACHINE_ID}/${KERNEL_VERSION}/initrd" + elif [[ -d /boot/loader/entries || -L /boot/loader/entries ]] \ + && [[ $MACHINE_ID ]] \ + && [[ -d /boot/${MACHINE_ID} || -L /boot/${MACHINE_ID} ]]; then + image="/boot/${MACHINE_ID}/${KERNEL_VERSION}/initrd" + elif [[ -d /boot/efi/loader/entries || -L /boot/efi/loader/entries ]] \ + && [[ $MACHINE_ID ]] \ + && [[ -d /boot/efi/${MACHINE_ID} || -L /boot/efi/${MACHINE_ID} ]]; then + image="/boot/efi/${MACHINE_ID}/${KERNEL_VERSION}/initrd" + elif [[ -f /lib/modules/${KERNEL_VERSION}/initrd ]]; then + image="/lib/modules/${KERNEL_VERSION}/initrd" + elif [[ -f /boot/initrd-${KERNEL_VERSION} ]]; then + image="/boot/initrd-${KERNEL_VERSION}" + elif [[ $MACHINE_ID ]] \ + && mountpoint -q /efi; then + image="/efi/${MACHINE_ID}/${KERNEL_VERSION}/initrd" + elif [[ $MACHINE_ID ]] \ + && mountpoint -q /boot/efi; then + image="/boot/efi/${MACHINE_ID}/${KERNEL_VERSION}/initrd" + else + image="" + fi fi fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dracut-059+suse.757.g0d1d426d/modules.d/99fs-lib/module-setup.sh new/dracut-059+suse.762.g8903c5e2/modules.d/99fs-lib/module-setup.sh --- old/dracut-059+suse.757.g0d1d426d/modules.d/99fs-lib/module-setup.sh 2025-09-11 14:38:19.000000000 +0200 +++ new/dracut-059+suse.762.g8903c5e2/modules.d/99fs-lib/module-setup.sh 2025-09-19 14:41:41.000000000 +0200 @@ -43,17 +43,21 @@ f2fs) instmods crc32 ;; + vfat) + instmods "=fs/nls" + ;; esac } # called by dracut installkernel() { - # xfs/btrfs/ext4 need crc32c, f2fs needs crc32 + # xfs/btrfs/ext4 need crc32c, f2fs needs crc32, + # vfat needs charsets for codepage= and iocharset= if [[ $hostonly ]]; then for_each_host_dev_fs include_fs_helper_modules : else - instmods crc32c crc32 + instmods crc32c crc32 "=fs/nls" fi } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dracut-059+suse.757.g0d1d426d/suse/README.susemaint new/dracut-059+suse.762.g8903c5e2/suse/README.susemaint --- old/dracut-059+suse.757.g0d1d426d/suse/README.susemaint 2025-09-11 14:38:19.000000000 +0200 +++ new/dracut-059+suse.762.g8903c5e2/suse/README.susemaint 2025-09-19 14:41:41.000000000 +0200 @@ -436,3 +436,5 @@ 52155dde fix(dracut): library directory creation in --kernel-only 1b11affd fix(74nvmf): only set netroot if it's yet empty f879b04d fix(74nvmf): make sure autoconnect script is run at least once +51bd1331 fix(fs-lib): include modules for charsets for working vfat support +89dcdd91 fix(dracut.sh): check that custom fw search patch exists before reading it diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dracut-059+suse.757.g0d1d426d/suse/dracut.spec new/dracut-059+suse.762.g8903c5e2/suse/dracut.spec --- old/dracut-059+suse.757.g0d1d426d/suse/dracut.spec 2025-09-11 14:38:19.000000000 +0200 +++ new/dracut-059+suse.762.g8903c5e2/suse/dracut.spec 2025-09-19 14:41:41.000000000 +0200 @@ -69,7 +69,7 @@ # suse-module-tools >= 15.4.7 is prepared for the removal of mkinitrd-suse.sh Conflicts: suse-module-tools < 15.4.7 %{?systemd_requires} -Requires: (jq if nvme-cli) +Requires: (jq if (nvme-cli or systemd-boot or grub2-x86_64-efi-bls)) %description Dracut contains tools to create a bootable initramfs for Linux kernels >= 2.6. ++++++ dracut.obsinfo ++++++ --- /var/tmp/diff_new_pack.xyXSPq/_old 2025-09-20 22:04:06.462739649 +0200 +++ /var/tmp/diff_new_pack.xyXSPq/_new 2025-09-20 22:04:06.466739816 +0200 @@ -1,5 +1,5 @@ name: dracut -version: 059+suse.757.g0d1d426d -mtime: 1757594299 -commit: 0d1d426da1bd2a522e9381094d1b3579ac3199de +version: 059+suse.762.g8903c5e2 +mtime: 1758285701 +commit: 8903c5e2a507acb2d4fbaa347b0c7d8be2c6c845
