Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package dracut for openSUSE:Factory checked in at 2022-07-22 19:20:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dracut (Old) and /work/SRC/openSUSE:Factory/.dracut.new.21925 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dracut" Fri Jul 22 19:20:18 2022 rev:194 rq:990354 version:057+suse.303.gc4ea1bea Changes: -------- --- /work/SRC/openSUSE:Factory/dracut/dracut.changes 2022-07-05 12:27:43.373892270 +0200 +++ /work/SRC/openSUSE:Factory/.dracut.new.21925/dracut.changes 2022-07-22 19:20:19.884568390 +0200 @@ -1,0 +2,10 @@ +Wed Jul 20 06:41:54 UTC 2022 - antonio.fei...@suse.com + +- Update to version 057+suse.303.gc4ea1bea: + * fix(network-legacy): add auto timeout to wicked DHCP test (bsc#1198709) + * fix(network-legacy): check if dhclient has --timeout option + * fix(man): correct typo + * fix(network-legacy): properly install dhclient + * fix(fips): add missing bash dependency + +------------------------------------------------------------------- Old: ---- dracut-057+suse.294.gaa9ea2d2.obscpio New: ---- dracut-057+suse.303.gc4ea1bea.obscpio ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dracut.spec ++++++ --- /var/tmp/diff_new_pack.1GCR81/_old 2022-07-22 19:20:20.372569229 +0200 +++ /var/tmp/diff_new_pack.1GCR81/_new 2022-07-22 19:20:20.376569235 +0200 @@ -25,7 +25,7 @@ %endif Name: dracut -Version: 057+suse.294.gaa9ea2d2 +Version: 057+suse.303.gc4ea1bea 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.1GCR81/_old 2022-07-22 19:20:20.436569338 +0200 +++ /var/tmp/diff_new_pack.1GCR81/_new 2022-07-22 19:20:20.440569345 +0200 @@ -1,6 +1,6 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/opensuse/dracut.git</param> - <param name="changesrevision">cafb600e08ef5c7c3808cecb73511ef8183b57d4</param></service></servicedata> + <param name="changesrevision">88d5e4579acf6d8112eab2fe167d57aaa750dd00</param></service></servicedata> (No newline at EOF) ++++++ dracut-057+suse.294.gaa9ea2d2.obscpio -> dracut-057+suse.303.gc4ea1bea.obscpio ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dracut-057+suse.294.gaa9ea2d2/man/dracut.cmdline.7.asc new/dracut-057+suse.303.gc4ea1bea/man/dracut.cmdline.7.asc --- old/dracut-057+suse.294.gaa9ea2d2/man/dracut.cmdline.7.asc 2022-07-04 14:42:30.000000000 +0200 +++ new/dracut-057+suse.303.gc4ea1bea/man/dracut.cmdline.7.asc 2022-07-14 10:08:17.000000000 +0200 @@ -740,7 +740,7 @@ Default is 1. **rd.net.timeout.dhcp=**__<arg>__:: - If this option is set, dhclient is called with "-timeout <arg>". + If this option is set, dhclient is called with "--timeout <arg>". **rd.net.timeout.iflink=**__<seconds>__:: Wait <seconds> until link shows up. Default is 60 seconds. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dracut-057+suse.294.gaa9ea2d2/modules.d/01fips/module-setup.sh new/dracut-057+suse.303.gc4ea1bea/modules.d/01fips/module-setup.sh --- old/dracut-057+suse.294.gaa9ea2d2/modules.d/01fips/module-setup.sh 2022-07-04 14:42:30.000000000 +0200 +++ new/dracut-057+suse.303.gc4ea1bea/modules.d/01fips/module-setup.sh 2022-07-14 10:08:17.000000000 +0200 @@ -7,6 +7,7 @@ # called by dracut depends() { + echo bash return 0 } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dracut-057+suse.294.gaa9ea2d2/modules.d/35network-legacy/dhcp-multi.sh new/dracut-057+suse.303.gc4ea1bea/modules.d/35network-legacy/dhcp-multi.sh --- old/dracut-057+suse.294.gaa9ea2d2/modules.d/35network-legacy/dhcp-multi.sh 2022-07-04 14:42:30.000000000 +0200 +++ new/dracut-057+suse.303.gc4ea1bea/modules.d/35network-legacy/dhcp-multi.sh 2022-07-14 10:08:17.000000000 +0200 @@ -21,6 +21,13 @@ _timeout=$(getarg rd.net.timeout.dhcp=) _DHCPRETRY=$(getargnum 1 1 1000000000 rd.net.dhcp.retry=) + if [ -n "$_timeout" ]; then + if ! (dhclient --help 2>&1 | grep -q -F -- '--timeout' 2> /dev/null); then + warn "rd.net.timeout.dhcp has no effect because dhclient does not implement the --timeout option" + unset _timeout + fi + fi + while [ $_COUNT -lt "$_DHCPRETRY" ]; do info "Starting dhcp for interface $netif" dhclient "$arg" \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dracut-057+suse.294.gaa9ea2d2/modules.d/35network-legacy/ifup.sh new/dracut-057+suse.303.gc4ea1bea/modules.d/35network-legacy/ifup.sh --- old/dracut-057+suse.294.gaa9ea2d2/modules.d/35network-legacy/ifup.sh 2022-07-04 14:42:30.000000000 +0200 +++ new/dracut-057+suse.303.gc4ea1bea/modules.d/35network-legacy/ifup.sh 2022-07-14 10:08:17.000000000 +0200 @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # # We don't need to check for ip= errors here, that is handled by the # cmdline parser script @@ -134,6 +134,13 @@ dhcp_dhclient_run() { + if [ -n "$_timeout" ]; then + if ! (dhclient --help 2>&1 | grep -q -F -- '--timeout' 2> /dev/null); then + warn "rd.net.timeout.dhcp has no effect because dhclient does not implement the --timeout option" + unset _timeout + fi + fi + dhclient "$@" \ ${_timeout:+--timeout $_timeout} \ -q \ @@ -172,6 +179,23 @@ [ -n "$mtu" ] && ip "$1" link set mtu $mtu dev $netif fi + local needtimeout=0 + local CMDLINE=$(getcmdline) + local cmdlineopt + for cmdlineopt in $CMDLINE; do + case "$cmdlineopt" in + rd.iscsi.*) ;& + rd.fcoe*) ;& + root=nfs:*) ;& + root=iscsi:*) + needtimeout=1 + ;; + esac + done + if [ $needtimeout -eq 1 -a -z "$_timeout" ]; then + _timeout=60 + fi + $dhclient ${_timeout:+--timeout $_timeout} --format leaseinfo --output "/tmp/leaseinfo.${netif}.dhcp.ipv${1:1:1}" --request - $netif << EOF <request type="lease"/> EOF diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dracut-057+suse.294.gaa9ea2d2/modules.d/35network-legacy/module-setup.sh new/dracut-057+suse.303.gc4ea1bea/modules.d/35network-legacy/module-setup.sh --- old/dracut-057+suse.294.gaa9ea2d2/modules.d/35network-legacy/module-setup.sh 2022-07-04 14:42:30.000000000 +0200 +++ new/dracut-057+suse.303.gc4ea1bea/modules.d/35network-legacy/module-setup.sh 2022-07-14 10:08:17.000000000 +0200 @@ -12,6 +12,7 @@ # called by dracut depends() { + echo bash return 0 } @@ -31,7 +32,7 @@ fi inst_multiple ip sed awk grep pgrep tr expr - inst_simple -o dhclient + inst -o dhclient inst_multiple -o arping arping2 if command -v arping > /dev/null; then ++++++ dracut.obsinfo ++++++ --- /var/tmp/diff_new_pack.1GCR81/_old 2022-07-22 19:20:20.688569771 +0200 +++ /var/tmp/diff_new_pack.1GCR81/_new 2022-07-22 19:20:20.688569771 +0200 @@ -1,6 +1,6 @@ name: dracut -version: 057+suse.294.gaa9ea2d2 -mtime: 1656938550 -commit: aa9ea2d2a7a2ba45f9585389162850f4e41a4d1f +version: 057+suse.303.gc4ea1bea +mtime: 1657786097 +commit: c4ea1bea20765f62a9c09486492c3a18ee584a24