Move wait for if functions to net lib
net-lib.sh are created for net related functions, move the wait_for_if* to net-lib.sh naturally. Signed-off-by: Dave Young <dyoung@redhat.com>master
parent
3baa150bd4
commit
efa5eb424d
|
@ -51,6 +51,7 @@ PATH=/usr/sbin:/usr/bin:/sbin:/bin
|
||||||
export PS4="dhclient.$interface.$$ + "
|
export PS4="dhclient.$interface.$$ + "
|
||||||
exec >>/run/initramfs/loginit.pipe 2>>/run/initramfs/loginit.pipe
|
exec >>/run/initramfs/loginit.pipe 2>>/run/initramfs/loginit.pipe
|
||||||
type getarg >/dev/null 2>&1 || . /lib/dracut-lib.sh
|
type getarg >/dev/null 2>&1 || . /lib/dracut-lib.sh
|
||||||
|
type ip_to_var >/dev/null 2>&1 || . /lib/net-lib.sh
|
||||||
|
|
||||||
# We already need a set netif here
|
# We already need a set netif here
|
||||||
netif=$interface
|
netif=$interface
|
||||||
|
|
|
@ -322,3 +322,26 @@ parse_ifname_opts() {
|
||||||
esac
|
esac
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
wait_for_if_up() {
|
||||||
|
local cnt=0
|
||||||
|
local li
|
||||||
|
while [ $cnt -lt 200 ]; do
|
||||||
|
li=$(ip -o link show up dev $1)
|
||||||
|
[ -n "$li" ] && return 0
|
||||||
|
sleep 0.1
|
||||||
|
cnt=$(($cnt+1))
|
||||||
|
done
|
||||||
|
return 1
|
||||||
|
}
|
||||||
|
|
||||||
|
wait_for_route_ok() {
|
||||||
|
local cnt=0
|
||||||
|
while [ $cnt -lt 200 ]; do
|
||||||
|
li=$(ip route show)
|
||||||
|
[ -n "$li" ] && [ -z "${li##*$1*}" ] && return 0
|
||||||
|
sleep 0.1
|
||||||
|
cnt=$(($cnt+1))
|
||||||
|
done
|
||||||
|
return 1
|
||||||
|
}
|
||||||
|
|
|
@ -16,6 +16,7 @@ PATH=/usr/sbin:/usr/bin:/sbin:/bin
|
||||||
export PS4="fcoe-up.$1.$$ + "
|
export PS4="fcoe-up.$1.$$ + "
|
||||||
exec >>/run/initramfs/loginit.pipe 2>>/run/initramfs/loginit.pipe
|
exec >>/run/initramfs/loginit.pipe 2>>/run/initramfs/loginit.pipe
|
||||||
type getarg >/dev/null 2>&1 || . /lib/dracut-lib.sh
|
type getarg >/dev/null 2>&1 || . /lib/dracut-lib.sh
|
||||||
|
type ip_to_var >/dev/null 2>&1 || . /lib/net-lib.sh
|
||||||
|
|
||||||
netif=$1
|
netif=$1
|
||||||
dcb=$2
|
dcb=$2
|
||||||
|
|
|
@ -481,29 +481,6 @@ else
|
||||||
}
|
}
|
||||||
fi
|
fi
|
||||||
|
|
||||||
wait_for_if_up() {
|
|
||||||
local cnt=0
|
|
||||||
local li
|
|
||||||
while [ $cnt -lt 200 ]; do
|
|
||||||
li=$(ip -o link show up dev $1)
|
|
||||||
[ -n "$li" ] && return 0
|
|
||||||
sleep 0.1
|
|
||||||
cnt=$(($cnt+1))
|
|
||||||
done
|
|
||||||
return 1
|
|
||||||
}
|
|
||||||
|
|
||||||
wait_for_route_ok() {
|
|
||||||
local cnt=0
|
|
||||||
while [ $cnt -lt 200 ]; do
|
|
||||||
li=$(ip route show)
|
|
||||||
[ -n "$li" ] && [ -z "${li##*$1*}" ] && return 0
|
|
||||||
sleep 0.1
|
|
||||||
cnt=$(($cnt+1))
|
|
||||||
done
|
|
||||||
return 1
|
|
||||||
}
|
|
||||||
|
|
||||||
# root=nfs:[<server-ip>:]<root-dir>[:<nfs-options>]
|
# root=nfs:[<server-ip>:]<root-dir>[:<nfs-options>]
|
||||||
# root=nfs4:[<server-ip>:]<root-dir>[:<nfs-options>]
|
# root=nfs4:[<server-ip>:]<root-dir>[:<nfs-options>]
|
||||||
nfsroot_to_var() {
|
nfsroot_to_var() {
|
||||||
|
|
Loading…
Reference in New Issue