Hello community, here is the log from the commit of package mkinitrd for openSUSE:Factory checked in at Fri Jul 1 16:31:50 CEST 2011.
-------- --- mkinitrd/mkinitrd.changes 2011-06-22 17:32:36.000000000 +0200 +++ /mounts/work_src_done/STABLE/mkinitrd/mkinitrd.changes 2011-06-30 23:11:12.000000000 +0200 @@ -1,0 +2,11 @@ +Thu Jun 30 21:07:11 UTC 2011 - [email protected] + +- Allow scripts to set multiple interfaces in the $interface + variable (fate#311345). + +------------------------------------------------------------------- +Thu Jun 30 09:47:17 UTC 2011 - [email protected] + +- Fix typo in resolve_device() (bnc#698946). + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mkinitrd.spec ++++++ --- /var/tmp/diff_new_pack.Vyvuzr/_old 2011-07-01 16:29:38.000000000 +0200 +++ /var/tmp/diff_new_pack.Vyvuzr/_new 2011-07-01 16:29:38.000000000 +0200 @@ -31,7 +31,7 @@ %endif AutoReqProv: on Version: 2.7.0 -Release: 15 +Release: 17 Conflicts: udev < 118 Requires: dhcpcd PreReq: %fillup_prereq ++++++ mkinitrd.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mkinitrd-2.7.0/mkinitrd.changes new/mkinitrd-2.7.0/mkinitrd.changes --- old/mkinitrd-2.7.0/mkinitrd.changes 2011-06-22 17:28:22.000000000 +0200 +++ new/mkinitrd-2.7.0/mkinitrd.changes 2011-06-30 23:10:43.000000000 +0200 @@ -1,4 +1,15 @@ ------------------------------------------------------------------- +Thu Jun 30 21:07:11 UTC 2011 - [email protected] + +- Allow scripts to set multiple interfaces in the $interface + variable (fate#311345). + +------------------------------------------------------------------- +Thu Jun 30 09:47:17 UTC 2011 - [email protected] + +- Fix typo in resolve_device() (bnc#698946). + +------------------------------------------------------------------- Wed Jun 22 15:02:26 UTC 2011 - [email protected] - dcbd was replaced with lldpad. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mkinitrd-2.7.0/scripts/setup-network.sh new/mkinitrd-2.7.0/scripts/setup-network.sh --- old/mkinitrd-2.7.0/scripts/setup-network.sh 2011-06-22 17:28:22.000000000 +0200 +++ new/mkinitrd-2.7.0/scripts/setup-network.sh 2011-06-30 23:10:43.000000000 +0200 @@ -177,7 +177,7 @@ # get the default interface if requested if [ "$interface" = "default" ]; then interface= - if -z "$static_interfaces$dhcp_interfaces"; then + if test -z "$static_interfaces$dhcp_interfaces"; then ifspec=$(get_default_interface) case "${ifspec##*/}" in dhcp*) @@ -190,6 +190,22 @@ fi fi +for iface in $interface; do + cfg=/etc/sysconfig/network/ifcfg-$iface + BOOTPROTO= + if test -e "$cfg"; then + eval $(grep BOOTPROTO "$cfg") + fi + case "$BOOTPROTO" in + dhcp*) + dhcp_interfaces="$dhcp_interfaces $iface" + ;; + *) + static_interfaces="$static_interfaces $iface" + esac +done +interface= + if [ "$create_monster_initrd" ]; then # include all network card modules for i in $(find $root_dir/lib/modules/$kernel_version/kernel/drivers/net -name "*.ko" -o -name "*.ko.gz"); do @@ -199,16 +215,18 @@ done fi -if test -n "$interface"; then - echo "XXX: \$interface still set (to $interface), should not happen." >&2 -fi - static=true +seen_interfaces= for iface in $static_interfaces -- $dhcp_interfaces; do if test "x$iface" = "x--"; then static=false continue fi + case " $seen_interfaces " in + *" $iface "*) + continue + esac + seen_interfaces="$seen_interfaces $iface" if [ -d /sys/class/net/$iface/device ] ; then drvlink="$drvlink $(get_network_module $iface)" read macaddress < /sys/class/net/$iface/address diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mkinitrd-2.7.0/scripts/setup-storage.sh new/mkinitrd-2.7.0/scripts/setup-storage.sh --- old/mkinitrd-2.7.0/scripts/setup-storage.sh 2011-06-22 17:28:22.000000000 +0200 +++ new/mkinitrd-2.7.0/scripts/setup-storage.sh 2011-06-30 23:10:43.000000000 +0200 @@ -216,7 +216,7 @@ case "$realrootdev" in LABEL=*|UUID=*) # get real root via fsck hack - realrootdev=$(fsck -N "$rootdev" \ + realrootdev=$(fsck -N "$realrootdev" \ | sed -ne '2s/.* \/dev/\/dev/p' \ | sed -e 's/ *//g') if [ -z "$realrootdev" -o ! -b "$realrootdev" ] ; then ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
