diff options
| author | dyoung@redhat.com <dyoung@redhat.com> | 2012-12-12 12:23:23 +0800 |
|---|---|---|
| committer | Harald Hoyer <harald@redhat.com> | 2012-12-14 09:08:59 +0100 |
| commit | 3bd7fba7af6a03f9b1ff8f5aac879a881491dd6c (patch) | |
| tree | 47881e7af87400a6eae3f11766dc7105d74b2435 /modules.d/40network | |
| parent | b455451f49cdcf0b48b3c8c5f5d81754fc259011 (diff) | |
| download | dracut-3bd7fba7af6a03f9b1ff8f5aac879a881491dd6c.tar.gz dracut-3bd7fba7af6a03f9b1ff8f5aac879a881491dd6c.tar.bz2 dracut-3bd7fba7af6a03f9b1ff8f5aac879a881491dd6c.zip | |
Change to use linkup function in network scripts
Update ifup.sh and fcoe-up.sh, use linkup function instead of directly
call ip command.
Signed-off-by: Dave Young <dyoung@redhat.com>
Diffstat (limited to 'modules.d/40network')
| -rwxr-xr-x | modules.d/40network/ifup.sh | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/modules.d/40network/ifup.sh b/modules.d/40network/ifup.sh index 576e2766..4ac22ffc 100755 --- a/modules.d/40network/ifup.sh +++ b/modules.d/40network/ifup.sh @@ -93,8 +93,7 @@ do_ipv6auto() { echo 0 > /proc/sys/net/ipv6/conf/$netif/forwarding echo 1 > /proc/sys/net/ipv6/conf/$netif/accept_ra echo 1 > /proc/sys/net/ipv6/conf/$netif/accept_redirects - ip link set $netif up - wait_for_if_up $netif + linkup $netif [ -n "$hostname" ] && echo "echo $hostname > /proc/sys/kernel/hostname" > /tmp/net.$netif.hostname @@ -105,8 +104,7 @@ do_ipv6auto() { do_static() { strstr $ip '*:*:*' && load_ipv6 - ip link set dev $netif up - wait_for_if_up $netif + linkup $netif [ -n "$macaddr" ] && ip link set address $macaddr dev $netif [ -n "$mtu" ] && ip link set mtu $mtu dev $netif if strstr $ip '*:*:*'; then @@ -156,13 +154,12 @@ if [ -e /tmp/bond.info ]; then fi done - ip link set $netif up + linkup $netif for slave in $bondslaves ; do ip link set $slave down echo "+$slave" > /sys/class/net/$bondname/bonding/slaves - ip link set $slave up - wait_for_if_up $slave + linkup $slave done # add the bits to setup the needed post enslavement parameters @@ -211,9 +208,8 @@ if [ -e /tmp/bridge.info ]; then if [ "$ethname" = "$bondname" ] ; then DO_BOND_SETUP=yes ifup $bondname -m else - ip link set $ethname up + linkup $ethname fi - wait_for_if_up $ethname brctl addif $bridgename $ethname done fi @@ -235,9 +231,8 @@ if [ "$netif" = "$vlanname" ] && [ ! -e /tmp/net.$vlanname.up ]; then if [ "$phydevice" = "$bondname" ] ; then DO_BOND_SETUP=yes ifup $phydevice -m else - ip link set "$phydevice" up + linkup "$phydevice" fi - wait_for_if_up "$phydevice" ip link add dev "$vlanname" link "$phydevice" type vlan id "$(get_vid $vlanname; echo $?)" fi |