kernel
/
dracut
mirror of https://git.kernel.org/pub/scm/boot/dracut/dracut.git/
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

95nfs: use ip_params_for_remote_addr() 

Use the new helper function.
master
Martin Wilck 2020-07-11 00:19:09 +02:00 committed by Daniel Molkentin
parent 6dbae7e772
commit 880d155967
1 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
modules.d/95nfs/module-setup.sh
View File

@ -47,7 +47,6 @@ cmdline() {
local nfs_root local nfs_root
local nfs_address local nfs_address
local lookup local lookup
local ifname


### nfsroot= ### ### nfsroot= ###
nfs_device=$(findmnt -t nfs4 -n -o SOURCE /) nfs_device=$(findmnt -t nfs4 -n -o SOURCE /)
@ -69,21 +68,9 @@ cmdline() {
lookup=$(host "${nfs_device%%:*}"| grep " address " | head -n1) lookup=$(host "${nfs_device%%:*}"| grep " address " | head -n1)
nfs_address=${lookup##* } nfs_address=${lookup##* }
fi fi
ifname=$(ip -o route get to $nfs_address | sed -n 's/.*dev \([^ ]*\).*/\1/p')
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


bootproto=$(sed -n "/BOOTPROTO/s/BOOTPROTO='\([[:alpha:]]*6\?\)4\?'/\1/p" /etc/sysconfig/network/ifcfg-$ifname) [[ $nfs_address ]] || return
if [ $bootproto ]; then ip_params_for_remote_addr "$nfs_address"
printf 'ip=%s:%s ' ${ifname} ${bootproto}
else
printf 'ip=%s:static ' ${ifname}
fi
} }


# called by dracut # called by dracut