c6bd0e9989
* add 0314-nfs_do_not_pass_ifname_for_bonding_devices.patch - Find devices by path for S390x (bsc#915218) * add s390x_persistent_device.conf OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=289
17 lines
840 B
Diff
17 lines
840 B
Diff
Index: dracut-044/modules.d/95nfs/module-setup.sh
|
|
===================================================================
|
|
--- dracut-044.orig/modules.d/95nfs/module-setup.sh 2016-12-07 11:46:32.799438777 +0100
|
|
+++ dracut-044/modules.d/95nfs/module-setup.sh 2016-12-07 11:46:33.519479687 +0100
|
|
@@ -57,7 +57,10 @@ cmdline() {
|
|
nfs_address=${lookup##* }
|
|
fi
|
|
ifname=$(ip -o route get to $nfs_address | sed -n 's/.*dev \([^ ]*\).*/\1/p')
|
|
- if [ -e /sys/class/net/$ifname/address ] ; then
|
|
+ if [ -d /sys/class/net/$ifname/bonding ]; then
|
|
+ dinfo "Found bonded interface '${ifname}'. Make sure to provide an appropriate 'bond=' cmdline."
|
|
+ return
|
|
+ elif [ -e /sys/class/net/$ifname/address ] ; then
|
|
ifmac=$(cat /sys/class/net/$ifname/address)
|
|
printf 'ifname=%s:%s ' ${ifname} ${ifmac}
|
|
fi
|