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-01 22:09:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dracut (Old) and /work/SRC/openSUSE:Factory/.dracut.new.17445 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dracut" Wed Nov 1 22:09:25 2023 rev:215 rq:1121178 version:059+suse.511.g0bdb16ac Changes: -------- --- /work/SRC/openSUSE:Factory/dracut/dracut.changes 2023-10-22 21:01:30.108509110 +0200 +++ /work/SRC/openSUSE:Factory/.dracut.new.17445/dracut.changes 2023-11-01 22:09:28.650551395 +0100 @@ -1,0 +2,11 @@ +Mon Oct 30 12:53:53 UTC 2023 - [email protected] + +- Update to version 059+suse.511.g0bdb16ac: + * fix(pkcs11): delete trailing dot on libcryptsetup-token-systemd-pkcs11.so + * fix(systemd-repart): correct undefined $libdir + * fix(dracut-systemd): use `DRACUT_VERSION` instead of `VERSION` + * fix(dracut.sh): abort if Bash is in POSIX mode + * fix(dracut-initramfs-restore.sh): do not set selinux labels if disabled + * fix(network): correct network device naming (bsc#1192986) + +------------------------------------------------------------------- Old: ---- dracut-059+suse.503.g41e99e72.obscpio New: ---- dracut-059+suse.511.g0bdb16ac.obscpio ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dracut.spec ++++++ --- /var/tmp/diff_new_pack.XIasse/_old 2023-11-01 22:09:29.530583696 +0100 +++ /var/tmp/diff_new_pack.XIasse/_new 2023-11-01 22:09:29.530583696 +0100 @@ -25,7 +25,7 @@ %endif Name: dracut -Version: 059+suse.503.g41e99e72 +Version: 059+suse.511.g0bdb16ac 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.XIasse/_old 2023-11-01 22:09:29.578585458 +0100 +++ /var/tmp/diff_new_pack.XIasse/_new 2023-11-01 22:09:29.582585604 +0100 @@ -1,6 +1,6 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/opensuse/dracut.git</param> - <param name="changesrevision">37e011dd37dcebfb7a3e9d5542e1e5e13c9f9913</param></service></servicedata> + <param name="changesrevision">0bdb16ac0d445cf1051875116c4c015eb2e8575a</param></service></servicedata> (No newline at EOF) ++++++ dracut-059+suse.503.g41e99e72.obscpio -> dracut-059+suse.511.g0bdb16ac.obscpio ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dracut-059+suse.503.g41e99e72/dracut-initramfs-restore.sh new/dracut-059+suse.511.g0bdb16ac/dracut-initramfs-restore.sh --- old/dracut-059+suse.503.g41e99e72/dracut-initramfs-restore.sh 2023-10-19 15:08:26.000000000 +0200 +++ new/dracut-059+suse.511.g0bdb16ac/dracut-initramfs-restore.sh 2023-10-30 13:53:00.000000000 +0100 @@ -75,9 +75,12 @@ fi fi -if [ -e /etc/selinux/config -a -x /usr/sbin/setfiles ]; then +if grep -q -w selinux /sys/kernel/security/lsm 2> /dev/null \ + && [ -e /etc/selinux/config -a -x /usr/sbin/setfiles ]; then . /etc/selinux/config - [ -n "${SELINUXTYPE}" ] && /usr/sbin/setfiles -v -r /run/initramfs /etc/selinux/"${SELINUXTYPE}"/contexts/files/file_contexts /run/initramfs > /dev/null + if [[ $SELINUX != "disabled" && -n $SELINUXTYPE ]]; then + /usr/sbin/setfiles -v -r /run/initramfs /etc/selinux/"${SELINUXTYPE}"/contexts/files/file_contexts /run/initramfs > /dev/null + fi fi exit 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dracut-059+suse.503.g41e99e72/dracut.sh new/dracut-059+suse.511.g0bdb16ac/dracut.sh --- old/dracut-059+suse.503.g41e99e72/dracut.sh 2023-10-19 15:08:26.000000000 +0200 +++ new/dracut-059+suse.511.g0bdb16ac/dracut.sh 2023-10-30 13:53:00.000000000 +0100 @@ -29,6 +29,11 @@ exit 1 fi +if [[ -n $POSIXLY_CORRECT ]]; then + printf "%s\n" "dracut[F]: dracut is not compatible with Bash in POSIX mode" >&2 + exit 1 +fi + dracut_args=("$@") # shellcheck disable=SC2155 readonly dracut_cmd=$(readlink -f "$0") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dracut-059+suse.503.g41e99e72/modules.d/01systemd-repart/module-setup.sh new/dracut-059+suse.511.g0bdb16ac/modules.d/01systemd-repart/module-setup.sh --- old/dracut-059+suse.503.g41e99e72/modules.d/01systemd-repart/module-setup.sh 2023-10-19 15:08:26.000000000 +0200 +++ new/dracut-059+suse.511.g0bdb16ac/modules.d/01systemd-repart/module-setup.sh 2023-10-30 13:53:00.000000000 +0100 @@ -25,7 +25,7 @@ install() { inst_multiple -o \ - "$libdir/repart.d/*.conf" \ + "/usr/lib/repart.d/*.conf" \ "$systemdsystemunitdir"/systemd-repart.service \ "$systemdsystemunitdir"/initrd-root-fs.target.wants/systemd-repart.service \ systemd-repart diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dracut-059+suse.503.g41e99e72/modules.d/35network-legacy/module-setup.sh new/dracut-059+suse.511.g0bdb16ac/modules.d/35network-legacy/module-setup.sh --- old/dracut-059+suse.503.g41e99e72/modules.d/35network-legacy/module-setup.sh 2023-10-19 15:08:26.000000000 +0200 +++ new/dracut-059+suse.511.g0bdb16ac/modules.d/35network-legacy/module-setup.sh 2023-10-30 13:53:00.000000000 +0100 @@ -26,8 +26,10 @@ install() { local _arch - #Adding default link - if dracut_module_included "systemd"; then + # Add default link if there is no persistent network device naming + if [ ! -e /etc/udev/rules.d/70-persistent-net.rules ] &&\ + dracut_module_included "systemd"; then + inst_multiple -o "${systemdnetwork}/99-default.link" [[ $hostonly ]] && inst_multiple -H -o "${systemdnetworkconfdir}/*.link" fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dracut-059+suse.503.g41e99e72/modules.d/35network-manager/module-setup.sh new/dracut-059+suse.511.g0bdb16ac/modules.d/35network-manager/module-setup.sh --- old/dracut-059+suse.503.g41e99e72/modules.d/35network-manager/module-setup.sh 2023-10-19 15:08:26.000000000 +0200 +++ new/dracut-059+suse.511.g0bdb16ac/modules.d/35network-manager/module-setup.sh 2023-10-30 13:53:00.000000000 +0100 @@ -51,9 +51,12 @@ inst_simple "$moddir"/nm-initrd.service "$systemdsystemunitdir"/nm-initrd.service inst_simple "$moddir"/nm-wait-online-initrd.service "$systemdsystemunitdir"/nm-wait-online-initrd.service - # Adding default link - inst_multiple -o "${systemdnetwork}/99-default.link" - [[ $hostonly ]] && inst_multiple -H -o "${systemdnetworkconfdir}/*.link" + # Add default link if there is no persistent network device naming + if [ ! -e /etc/udev/rules.d/70-persistent-net.rules ]; then + + inst_multiple -o "${systemdnetwork}/99-default.link" + [[ $hostonly ]] && inst_multiple -H -o "${systemdnetworkconfdir}/*.link" + fi $SYSTEMCTL -q --root "$initdir" enable nm-initrd.service fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dracut-059+suse.503.g41e99e72/modules.d/91pkcs11/module-setup.sh new/dracut-059+suse.511.g0bdb16ac/modules.d/91pkcs11/module-setup.sh --- old/dracut-059+suse.503.g41e99e72/modules.d/91pkcs11/module-setup.sh 2023-10-19 15:08:26.000000000 +0200 +++ new/dracut-059+suse.511.g0bdb16ac/modules.d/91pkcs11/module-setup.sh 2023-10-30 13:53:00.000000000 +0100 @@ -30,6 +30,6 @@ {"tls/$_arch/",tls/,"$_arch/",}"libffi.so.*" \ {"tls/$_arch/",tls/,"$_arch/",}"libp11-kit.so.*" \ {"tls/$_arch/",tls/,"$_arch/",}"libcryptsetup.so.*" \ - {"tls/$_arch/",tls/,"$_arch/",}"/cryptsetup/libcryptsetup-token-systemd-pkcs11.so.*" + {"tls/$_arch/",tls/,"$_arch/",}"/cryptsetup/libcryptsetup-token-systemd-pkcs11.so*" } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dracut-059+suse.503.g41e99e72/modules.d/95udev-rules/module-setup.sh new/dracut-059+suse.511.g0bdb16ac/modules.d/95udev-rules/module-setup.sh --- old/dracut-059+suse.503.g41e99e72/modules.d/95udev-rules/module-setup.sh 2023-10-19 15:08:26.000000000 +0200 +++ new/dracut-059+suse.511.g0bdb16ac/modules.d/95udev-rules/module-setup.sh 2023-10-30 13:53:00.000000000 +0100 @@ -37,7 +37,6 @@ 60-persistent-storage.rules \ 64-btrfs.rules \ 70-uaccess.rules \ - 70-persistent-net.rules \ 71-seat.rules \ 73-seat-late.rules \ 75-net-description.rules \ @@ -47,8 +46,16 @@ "$moddir/61-persistent-storage.rules" prepare_udev_rules 59-persistent-storage.rules 61-persistent-storage.rules - # legacy persistent network device name rules - [[ $hostonly ]] && inst_rules 70-persistent-net.rules + + # only include persistent network device name rules if network is set up + # in the initrd + # Avoid interference with systemd predictable network device naming + if dracut_module_included "network-legacy" || dracut_module_included "network-manager"; then + if [ -e /etc/udev/rules.d/70-persistent-net.rules ] && \ + ! dracut_module_included "systemd-networkd"; then + [[ $hostonly ]] && inst_rules 70-persistent-net.rules + fi + fi { for i in cdrom tape dialout floppy; do diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dracut-059+suse.503.g41e99e72/modules.d/98dracut-systemd/dracut-cmdline.sh new/dracut-059+suse.511.g0bdb16ac/modules.d/98dracut-systemd/dracut-cmdline.sh --- old/dracut-059+suse.503.g41e99e72/modules.d/98dracut-systemd/dracut-cmdline.sh 2023-10-19 15:08:26.000000000 +0200 +++ new/dracut-059+suse.511.g0bdb16ac/modules.d/98dracut-systemd/dracut-cmdline.sh 2023-10-30 13:53:00.000000000 +0100 @@ -6,7 +6,7 @@ type getarg > /dev/null 2>&1 || . /lib/dracut-lib.sh [ -f /usr/lib/initrd-release ] && . /usr/lib/initrd-release -[ -n "$VERSION" ] && info "dracut-$VERSION" +[ -n "$DRACUT_VERSION" ] && info "dracut-$DRACUT_VERSION" if ! getargbool 1 'rd.hostonly'; then [ -f /etc/cmdline.d/99-cmdline-ask.conf ] && mv /etc/cmdline.d/99-cmdline-ask.conf /tmp/99-cmdline-ask.conf ++++++ dracut.obsinfo ++++++ --- /var/tmp/diff_new_pack.XIasse/_old 2023-11-01 22:09:29.870596176 +0100 +++ /var/tmp/diff_new_pack.XIasse/_new 2023-11-01 22:09:29.874596323 +0100 @@ -1,5 +1,5 @@ name: dracut -version: 059+suse.503.g41e99e72 -mtime: 1697720906 -commit: 41e99e72894c4e9a19ca388da9dc313daaa39c46 +version: 059+suse.511.g0bdb16ac +mtime: 1698670380 +commit: 0bdb16ac0d445cf1051875116c4c015eb2e8575a
