Hello community, here is the log from the commit of package mkinitrd for openSUSE:Factory checked in at 2011-12-12 16:57:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mkinitrd (Old) and /work/SRC/openSUSE:Factory/.mkinitrd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mkinitrd", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/mkinitrd/mkinitrd.changes 2011-11-23 19:36:57.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.mkinitrd.new/mkinitrd.changes 2011-12-12 17:03:11.000000000 +0100 @@ -1,0 +2,18 @@ +Thu Dec 8 10:56:45 UTC 2011 - [email protected] + +- license update: GPL-2.0+ + Use SPDX format (http://www.spdx.org/licenses) + +------------------------------------------------------------------- +Wed Dec 7 21:14:12 UTC 2011 - [email protected] + +- setup-network: Remember the interface name as a fallback if the + mac address does not match (bnc#733375). + +------------------------------------------------------------------- +Mon Nov 28 15:31:26 UTC 2011 - [email protected] + +- setup-ibft: Do not assume that interface names start with 'eth' + (bnc#728631). + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ 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-11-22 13:49:46.000000000 +0100 +++ new/mkinitrd-2.7.0/mkinitrd.changes 2011-12-07 22:16:36.000000000 +0100 @@ -1,4 +1,16 @@ ------------------------------------------------------------------- +Wed Dec 7 21:14:12 UTC 2011 - [email protected] + +- setup-network: Remember the interface name as a fallback if the + mac address does not match (bnc#733375). + +------------------------------------------------------------------- +Mon Nov 28 15:31:26 UTC 2011 - [email protected] + +- setup-ibft: Do not assume that interface names start with 'eth' + (bnc#728631). + +------------------------------------------------------------------- Tue Nov 22 12:29:02 UTC 2011 - [email protected] - setup-modules: Allow aliases as dependencies in the SUSE INITRD diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mkinitrd-2.7.0/scripts/boot-network.sh new/mkinitrd-2.7.0/scripts/boot-network.sh --- old/mkinitrd-2.7.0/scripts/boot-network.sh 2011-11-22 13:49:46.000000000 +0100 +++ new/mkinitrd-2.7.0/scripts/boot-network.sh 2011-12-07 22:16:36.000000000 +0100 @@ -118,9 +118,10 @@ } +# macaddr2if eth0:00:00:de:ad:be:ef macaddr2if() { - local macaddress=$1 tmpmac dev + local macaddress=${1#*:} fallback=${1%%:*} tmpmac dev for dev in /sys/class/net/* ; do # skip files that are no directories @@ -134,6 +135,7 @@ return fi done + echo "$fallback" } i=0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mkinitrd-2.7.0/scripts/setup-ibft.sh new/mkinitrd-2.7.0/scripts/setup-ibft.sh --- old/mkinitrd-2.7.0/scripts/setup-ibft.sh 2011-11-22 13:49:46.000000000 +0100 +++ new/mkinitrd-2.7.0/scripts/setup-ibft.sh 2011-12-07 22:16:36.000000000 +0100 @@ -4,9 +4,15 @@ #%depends: network ibft_set_iface() { - local if=$(cd $ibft_nic/device/net; ls -d eth* 2>/dev/null) - [ "$if" ] && { - interface=$if + local iface + + for iface in $ibft_nic/device/net/*/addr_len; do + break + done + iface=${iface%/*} + iface=${iface##*/} + if test -n "$iface"; then + interface=$iface drvlink=$(get_network_module $interface) if [ ! "$nettype" -a -e $ibft_nic/dhcp ]; then nettype=dhcp @@ -15,7 +21,7 @@ else nettype=static fi - } + fi } ibft_nic=/sys/firmware/ibft/ethernet0 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-11-22 13:49:46.000000000 +0100 +++ new/mkinitrd-2.7.0/scripts/setup-network.sh 2011-12-07 22:16:36.000000000 +0100 @@ -237,9 +237,9 @@ drvlink="$drvlink $(get_network_module $iface)" read macaddress < /sys/class/net/$iface/address if $static; then - static_macaddresses="$static_macaddresses $macaddress" + static_macaddresses="$static_macaddresses $iface:$macaddress" else - dhcp_macaddresses="$dhcp_macaddresses $macaddress" + dhcp_macaddresses="$dhcp_macaddresses $iface:$macaddress" fi elif [ -d /sys/class/net/$iface/bonding ] ; then verbose "[NETWORK]\tConfigure bonding for $iface" -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
