Hello community, here is the log from the commit of package mkinitrd for openSUSE:Factory checked in at 2014-03-12 14:45:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mkinitrd (Old) and /work/SRC/openSUSE:Factory/.mkinitrd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mkinitrd" Changes: -------- --- /work/SRC/openSUSE:Factory/mkinitrd/mkinitrd.changes 2013-10-31 10:21:11.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.mkinitrd.new/mkinitrd.changes 2014-03-12 14:45:41.000000000 +0100 @@ -1,0 +2,15 @@ +Tue Jan 14 12:25:42 CET 2014 - [email protected] + +- Add cciss compat rules to mkinitrd (bnc#858663) + +------------------------------------------------------------------- +Thu Dec 19 18:55:23 UTC 2013 - [email protected] + +- Support second ibft iscsi interface (bnc#830968) + +------------------------------------------------------------------- +Fri Nov 29 13:58:34 CET 2013 - [email protected] + +- Wait for multipath devices when MD is active (bnc#848293). + +------------------------------------------------------------------- @@ -203,0 +219,5 @@ + +------------------------------------------------------------------- +Mon May 13 19:10:09 UTC 2013 - [email protected] + +- Do not overwrite the drvlink variable (bnc#803760) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mkinitrd.spec ++++++ --- /var/tmp/diff_new_pack.tXTyQw/_old 2014-03-12 14:45:42.000000000 +0100 +++ /var/tmp/diff_new_pack.tXTyQw/_new 2014-03-12 14:45:42.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package mkinitrd # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed ++++++ mkinitrd.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mkinitrd-2.8.1/mkinitrd.changes new/mkinitrd-2.8.1/mkinitrd.changes --- old/mkinitrd-2.8.1/mkinitrd.changes 2013-10-29 18:31:03.000000000 +0100 +++ new/mkinitrd-2.8.1/mkinitrd.changes 2014-02-05 17:51:01.000000000 +0100 @@ -1,4 +1,19 @@ ------------------------------------------------------------------- +Tue Jan 14 12:25:42 CET 2014 - [email protected] + +- Add cciss compat rules to mkinitrd (bnc#858663) + +------------------------------------------------------------------- +Thu Dec 19 18:55:23 UTC 2013 - [email protected] + +- Support second ibft iscsi interface (bnc#830968) + +------------------------------------------------------------------- +Fri Nov 29 13:58:34 CET 2013 - [email protected] + +- Wait for multipath devices when MD is active (bnc#848293). + +------------------------------------------------------------------- Tue Oct 29 18:25:41 CET 2013 - [email protected] - Fix code which handles missing or incomplete fstab (bnc#848038) @@ -203,6 +218,11 @@ - Package 61-msft.rules and sg_inq (bnc#805059) ------------------------------------------------------------------- +Mon May 13 19:10:09 UTC 2013 - [email protected] + +- Do not overwrite the drvlink variable (bnc#803760) + +------------------------------------------------------------------- Fri May 10 12:28:01 UTC 2013 - [email protected] - s390x: add support for scm devices (bnc#814540) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mkinitrd-2.8.1/scripts/boot-devfunctions.sh new/mkinitrd-2.8.1/scripts/boot-devfunctions.sh --- old/mkinitrd-2.8.1/scripts/boot-devfunctions.sh 2013-10-29 18:31:03.000000000 +0100 +++ new/mkinitrd-2.8.1/scripts/boot-devfunctions.sh 2014-02-05 17:51:01.000000000 +0100 @@ -100,6 +100,10 @@ retval=0 break; fi + elif [ -x "$(type -p multipath)" -a -z "$cmd_root_no_mpath" ] ; then + echo -n "!" + multipath -v 0 + wait_for_events fi usleep 25000 ((timeout % 40 == 1)) && echo -n "." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mkinitrd-2.8.1/scripts/boot-ibft.sh new/mkinitrd-2.8.1/scripts/boot-ibft.sh --- old/mkinitrd-2.8.1/scripts/boot-ibft.sh 2013-10-29 18:31:03.000000000 +0100 +++ new/mkinitrd-2.8.1/scripts/boot-ibft.sh 2014-02-05 17:51:01.000000000 +0100 @@ -13,22 +13,24 @@ load_modules ibft_get_att() { - if [ -f $ibft_nic/$1 ]; then - cat $ibft_nic/$1 + local attr=$1 nic=$2 + + if [ -f $nic/$attr ]; then + cat $nic/$attr else echo "" fi } ibft_get_ethdev() { - local iface + local iface nic=$1 - if test -d "$ibft_nic/device/net" ; then - for iface in $ibft_nic/device/net/*/addr_len; do + if test -d "$nic/device/net" ; then + for iface in $nic/device/net/*/addr_len; do break done else - for iface in $ibft_nic/device/*/*/addr_len; do + for iface in $nic/device/*/*/addr_len; do break done fi @@ -51,32 +53,39 @@ done } -if [ -d $ibft_nic ]; then - if [ -s $ibft_nic/dhcp ]; then +setup_ibft_nic() { + local nic=$1 + + if [ -s $nic/dhcp ]; then nettype='dhcp' - read ibft_dhcp < $ibft_nic/dhcp + read ibft_dhcp < $nic/dhcp [ "$ibft_dhcp" = "0.0.0.0" ] && nettype='static' else nettype='static' fi - ipaddr="$(ibft_get_att ip-addr)" + ipaddr="$(ibft_get_att ip-addr $nic)" case "$ipaddr" in *:*) netmask=64 ipaddr="[$ipaddr]" ;; *) - netmask="$(ibft_get_att subnet-mask)" + netmask="$(ibft_get_att subnet-mask $nic)" ;; esac - ip="$ipaddr::$(ibft_get_att gateway):$netmask:$ibft_hostname:$(ibft_get_ethdev):$nettype" + ip="$ipaddr::$(ibft_get_att gateway $nic):$netmask:$ibft_hostname:$(ibft_get_ethdev):$nettype" interface=$(ibft_get_ethdev) - macaddress=$(ibft_get_att mac) - InitiatorName=$(ibft_get_initiatorname) + macaddress=$(ibft_get_att mac $nic) if [ $nettype = 'dhcp' ] ; then dhcp_macaddresses="$interface:$macaddress $dhcp_macaddresses" else static_macaddresses="$interface:$macaddress $static_macaddresses" static_ips="$ip $static_ips" fi +} + +if [ -d $ibft_nic ]; then + setup_ibft_nic $ibft_nic + InitiatorName=$(ibft_get_initiatorname) + [ -d $ibft_nic2 ] && setup_ibft_nic $ibft_nic2 fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mkinitrd-2.8.1/scripts/setup-ibft.sh new/mkinitrd-2.8.1/scripts/setup-ibft.sh --- old/mkinitrd-2.8.1/scripts/setup-ibft.sh 2013-10-29 18:31:03.000000000 +0100 +++ new/mkinitrd-2.8.1/scripts/setup-ibft.sh 2014-02-05 17:51:01.000000000 +0100 @@ -19,7 +19,7 @@ iface=${iface##*/} if test -n "$iface"; then interface=$iface - drvlink=$(get_network_module $interface) + drvlink="$drvlink $(get_network_module $interface)" if [ ! "$nettype" -a -e $ibft_nic/dhcp ]; then nettype=dhcp read ibft_dhcp < $ibft_nic/dhcp @@ -31,6 +31,7 @@ } ibft_nic=/sys/firmware/ibft/ethernet0 +ibft_nic2=/sys/firmware/ibft/ethernet1 ibft_hostname=$(hostname) if [ "$root_iscsi" = 1 -a -d $ibft_nic ]; then diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mkinitrd-2.8.1/scripts/setup-network.sh new/mkinitrd-2.8.1/scripts/setup-network.sh --- old/mkinitrd-2.8.1/scripts/setup-network.sh 2013-10-29 18:31:03.000000000 +0100 +++ new/mkinitrd-2.8.1/scripts/setup-network.sh 2014-02-05 17:51:01.000000000 +0100 @@ -141,7 +141,7 @@ get_network_module() { - local interface=$1 + local interface=$1 drvlink ifpath=$(cd -P /sys/class/net/$interface/device; echo $PWD) if [ -f /sys/class/net/$interface/device/modalias ] ; then diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mkinitrd-2.8.1/scripts/setup-udev.sh new/mkinitrd-2.8.1/scripts/setup-udev.sh --- old/mkinitrd-2.8.1/scripts/setup-udev.sh 2013-10-29 18:31:03.000000000 +0100 +++ new/mkinitrd-2.8.1/scripts/setup-udev.sh 2014-02-05 17:51:01.000000000 +0100 @@ -79,7 +79,7 @@ 61-msft.rules \ 62-dm_linear.rules \ 64-device-mapper.rules \ - 75-net-description.rules \ + 65-cciss-compat.rules \ 79-kms.rules \ 80-drivers.rules \ 80-net-name-slot.rules \ -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
