48 lines
1.6 KiB
Diff
48 lines
1.6 KiB
Diff
From 880d155967bb54f61e5960347aa8bbab6da8f86d Mon Sep 17 00:00:00 2001
|
|
From: Martin Wilck <mwilck@suse.de>
|
|
Date: Sat, 11 Jul 2020 00:19:09 +0200
|
|
Subject: [PATCH] 95nfs: use ip_params_for_remote_addr()
|
|
|
|
Use the new helper function.
|
|
---
|
|
modules.d/95nfs/module-setup.sh | 17 ++---------------
|
|
1 file changed, 2 insertions(+), 15 deletions(-)
|
|
|
|
diff --git a/modules.d/95nfs/module-setup.sh b/modules.d/95nfs/module-setup.sh
|
|
index d9a91fdf..4a8e140b 100755
|
|
--- a/modules.d/95nfs/module-setup.sh
|
|
+++ b/modules.d/95nfs/module-setup.sh
|
|
@@ -47,7 +47,6 @@ cmdline() {
|
|
local nfs_root
|
|
local nfs_address
|
|
local lookup
|
|
- local ifname
|
|
|
|
### nfsroot= ###
|
|
nfs_device=$(findmnt -t nfs4 -n -o SOURCE /)
|
|
@@ -69,21 +68,9 @@ cmdline() {
|
|
lookup=$(host "${nfs_device%%:*}"| grep " address " | head -n1)
|
|
nfs_address=${lookup##* }
|
|
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)
|
|
- if [ $bootproto ]; then
|
|
- printf 'ip=%s:%s ' ${ifname} ${bootproto}
|
|
- else
|
|
- printf 'ip=%s:static ' ${ifname}
|
|
- fi
|
|
+ [[ $nfs_address ]] || return
|
|
+ ip_params_for_remote_addr "$nfs_address"
|
|
}
|
|
|
|
# called by dracut
|
|
|