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-04-25 16:54:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dracut (Old) and /work/SRC/openSUSE:Factory/.dracut.new.1533 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dracut" Tue Apr 25 16:54:07 2023 rev:207 rq:1082507 version:059+suse.375.gafb362e4 Changes: -------- --- /work/SRC/openSUSE:Factory/dracut/dracut.changes 2023-04-11 13:51:02.843321801 +0200 +++ /work/SRC/openSUSE:Factory/.dracut.new.1533/dracut.changes 2023-04-25 16:54:08.550599259 +0200 @@ -1,0 +2,12 @@ +Mon Apr 24 09:35:19 UTC 2023 - [email protected] + +- Update to version 059+suse.375.gafb362e4: + * fix(network-legacy): handle do_dhcp calls without arguments (bsc#1210640) + + fips=1 and separate /boot break s390x (bsc#1204478): + * fix(fips): move fips-boot script to pre-pivot + * fix(fips): only unmount /boot if it was mounted by the fips module + * feat(fips): add progress messages + * fix(fips): do not blindly remove /boot + +------------------------------------------------------------------- Old: ---- dracut-059+suse.368.g2e7ac134.obscpio New: ---- dracut-059+suse.375.gafb362e4.obscpio ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dracut.spec ++++++ --- /var/tmp/diff_new_pack.ObanIh/_old 2023-04-25 16:54:09.274606722 +0200 +++ /var/tmp/diff_new_pack.ObanIh/_new 2023-04-25 16:54:09.278606764 +0200 @@ -25,7 +25,7 @@ %endif Name: dracut -Version: 059+suse.368.g2e7ac134 +Version: 059+suse.375.gafb362e4 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.ObanIh/_old 2023-04-25 16:54:09.350607505 +0200 +++ /var/tmp/diff_new_pack.ObanIh/_new 2023-04-25 16:54:09.354607547 +0200 @@ -1,6 +1,6 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/opensuse/dracut.git</param> - <param name="changesrevision">83bf6728f481360fb7311cdab11c27cfad188c38</param></service></servicedata> + <param name="changesrevision">afb362e4cb6c21ef878907e96e8bc66db740930a</param></service></servicedata> (No newline at EOF) ++++++ dracut-059+suse.368.g2e7ac134.obscpio -> dracut-059+suse.375.gafb362e4.obscpio ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dracut-059+suse.368.g2e7ac134/modules.d/01fips/fips-boot.sh new/dracut-059+suse.375.gafb362e4/modules.d/01fips/fips-boot.sh --- old/dracut-059+suse.368.g2e7ac134/modules.d/01fips/fips-boot.sh 2023-04-10 08:59:27.000000000 +0200 +++ new/dracut-059+suse.375.gafb362e4/modules.d/01fips/fips-boot.sh 2023-04-24 11:34:04.000000000 +0200 @@ -8,7 +8,9 @@ die "FIPS mode have to be enabled by 'fips=1' not just 'fips'" elif getarg boot= > /dev/null; then . /sbin/fips.sh + fips_info "fips-boot: start" if mount_boot; then do_fips || die "FIPS integrity test failed" fi + fips_info "fips-boot: done!" fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dracut-059+suse.368.g2e7ac134/modules.d/01fips/fips-load-crypto.sh new/dracut-059+suse.375.gafb362e4/modules.d/01fips/fips-load-crypto.sh --- old/dracut-059+suse.368.g2e7ac134/modules.d/01fips/fips-load-crypto.sh 2023-04-10 08:59:27.000000000 +0200 +++ new/dracut-059+suse.375.gafb362e4/modules.d/01fips/fips-load-crypto.sh 2023-04-24 11:34:04.000000000 +0200 @@ -8,5 +8,7 @@ die "FIPS mode have to be enabled by 'fips=1' not just 'fips'" else . /sbin/fips.sh + fips_info "fips-load-crypto: start" fips_load_crypto || die "FIPS integrity test failed" + fips_info "fips-load-crypto: done!" fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dracut-059+suse.368.g2e7ac134/modules.d/01fips/fips-noboot.sh new/dracut-059+suse.375.gafb362e4/modules.d/01fips/fips-noboot.sh --- old/dracut-059+suse.368.g2e7ac134/modules.d/01fips/fips-noboot.sh 2023-04-10 08:59:27.000000000 +0200 +++ new/dracut-059+suse.375.gafb362e4/modules.d/01fips/fips-noboot.sh 2023-04-24 11:34:04.000000000 +0200 @@ -8,6 +8,8 @@ die "FIPS mode have to be enabled by 'fips=1' not just 'fips'" elif ! [ -f /tmp/fipsdone ]; then . /sbin/fips.sh + fips_info "fips-noboot: start" mount_boot do_fips || die "FIPS integrity test failed" + fips_info "fips-noboot: done!" fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dracut-059+suse.368.g2e7ac134/modules.d/01fips/fips.sh new/dracut-059+suse.375.gafb362e4/modules.d/01fips/fips.sh --- old/dracut-059+suse.368.g2e7ac134/modules.d/01fips/fips.sh 2023-04-10 08:59:27.000000000 +0200 +++ new/dracut-059+suse.375.gafb362e4/modules.d/01fips/fips.sh 2023-04-24 11:34:04.000000000 +0200 @@ -34,6 +34,15 @@ boot=$(getarg boot=) if [ -n "$boot" ]; then + if [ -d /boot ] && ismounted /boot; then + boot_dev= + if command -v findmnt > /dev/null; then + boot_dev=$(findmnt -n -o SOURCE /boot) + fi + fips_info "Ignoring 'boot=$boot' as /boot is already mounted ${boot_dev:+"from '$boot_dev'"}" + return 0 + fi + case "$boot" in LABEL=* | UUID=* | PARTUUID=* | PARTLABEL=*) boot="$(label_uuid_to_dev "$boot")" @@ -63,10 +72,13 @@ mkdir -p /boot fips_info "Mounting $boot as /boot" mount -oro "$boot" /boot || return 1 - elif [ -d "$NEWROOT/boot" ]; then + FIPS_MOUNTED_BOOT=1 + elif ! ismounted /boot && [ -d "$NEWROOT/boot" ]; then # shellcheck disable=SC2114 rm -fr -- /boot ln -sf "$NEWROOT/boot" /boot + else + die "You have to specify boot=<boot device> as a boot option for fips=1" fi } @@ -231,7 +243,12 @@ : > /tmp/fipsdone - umount /boot > /dev/null 2>&1 + if [ "$FIPS_MOUNTED_BOOT" = 1 ]; then + fips_info "Unmounting /boot" + umount /boot > /dev/null 2>&1 + else + fips_info "Not unmounting /boot" + fi return 0 } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dracut-059+suse.368.g2e7ac134/modules.d/01fips/module-setup.sh new/dracut-059+suse.375.gafb362e4/modules.d/01fips/module-setup.sh --- old/dracut-059+suse.368.g2e7ac134/modules.d/01fips/module-setup.sh 2023-04-10 08:59:27.000000000 +0200 +++ new/dracut-059+suse.375.gafb362e4/modules.d/01fips/module-setup.sh 2023-04-24 11:34:04.000000000 +0200 @@ -67,7 +67,7 @@ # called by dracut install() { - inst_hook pre-mount 01 "$moddir/fips-boot.sh" + inst_hook pre-pivot 00 "$moddir/fips-boot.sh" inst_hook pre-pivot 01 "$moddir/fips-noboot.sh" inst_hook pre-udev 01 "$moddir/fips-load-crypto.sh" inst_script "$moddir/fips.sh" /sbin/fips.sh diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dracut-059+suse.368.g2e7ac134/modules.d/35network-legacy/ifup.sh new/dracut-059+suse.375.gafb362e4/modules.d/35network-legacy/ifup.sh --- old/dracut-059+suse.368.g2e7ac134/modules.d/35network-legacy/ifup.sh 2023-04-10 08:59:27.000000000 +0200 +++ new/dracut-059+suse.375.gafb362e4/modules.d/35network-legacy/ifup.sh 2023-04-24 11:34:04.000000000 +0200 @@ -154,10 +154,12 @@ } dhcp_wicked_run() { + local _ipv=${1:-"-4"} + [ -d /var/lib/wicked ] || mkdir -p /var/lib/wicked dhclient= - if [ "$1" = "-6" ] ; then + if [ "$_ipv" = "-6" ] ; then ipv6_mode= if [ -f "/tmp/net.$netif.auto6" ] ; then ipv6_mode="auto" @@ -175,8 +177,8 @@ fi if dhcp_wicked_read_ifcfg ; then - [ -n "$macaddr" ] && ip "$1" link set address $macaddr dev $netif - [ -n "$mtu" ] && ip "$1" link set mtu $mtu dev $netif + [ -n "$macaddr" ] && ip "$_ipv" link set address $macaddr dev $netif + [ -n "$mtu" ] && ip "$_ipv" link set mtu $mtu dev $netif fi local needtimeout=0 @@ -196,12 +198,12 @@ _timeout=60 fi - $dhclient ${_timeout:+--timeout $_timeout} --format leaseinfo --output "/tmp/leaseinfo.${netif}.dhcp.ipv${1:1:1}" --request - $netif << EOF + $dhclient ${_timeout:+--timeout $_timeout} --format leaseinfo --output "/tmp/leaseinfo.${netif}.dhcp.ipv${_ipv:1:1}" --request - $netif << EOF <request type="lease"/> EOF - dhcp_wicked_apply $1 || return $? + dhcp_wicked_apply "$_ipv" || return $? - if [ "$1" = "-6" ] ; then + if [ "$_ipv" = "-6" ] ; then wait_for_ipv6_dad $netif fi ++++++ dracut.obsinfo ++++++ --- /var/tmp/diff_new_pack.ObanIh/_old 2023-04-25 16:54:09.658610681 +0200 +++ /var/tmp/diff_new_pack.ObanIh/_new 2023-04-25 16:54:09.662610722 +0200 @@ -1,5 +1,5 @@ name: dracut -version: 059+suse.368.g2e7ac134 -mtime: 1681109967 -commit: 2e7ac13466874179b8769dce8ad0a81cef1efa7e +version: 059+suse.375.gafb362e4 +mtime: 1682328844 +commit: afb362e4cb6c21ef878907e96e8bc66db740930a
