diff options
| author | Bill Nottingham <notting@redhat.com> | 2001-09-26 20:33:53 +0000 |
|---|---|---|
| committer | Bill Nottingham <notting@redhat.com> | 2001-09-26 20:33:53 +0000 |
| commit | 9ec96fbd11123f5b7531e9cc0681ae5b7a0a1b38 (patch) | |
| tree | 973f4f3273caa5da5248bfa1385e48aa63a81e7b /sysconfig/network-scripts/ifup | |
| parent | 35b744c27dd1387f2eb5f3a357fcc2dfa047dc14 (diff) | |
| download | initscripts-9ec96fbd11123f5b7531e9cc0681ae5b7a0a1b38.tar initscripts-9ec96fbd11123f5b7531e9cc0681ae5b7a0a1b38.tar.gz initscripts-9ec96fbd11123f5b7531e9cc0681ae5b7a0a1b38.tar.bz2 initscripts-9ec96fbd11123f5b7531e9cc0681ae5b7a0a1b38.tar.xz initscripts-9ec96fbd11123f5b7531e9cc0681ae5b7a0a1b38.zip | |
some more DEVICE -> REALDEVICE changes; flush all addresses on bringing down main device
Diffstat (limited to 'sysconfig/network-scripts/ifup')
| -rwxr-xr-x | sysconfig/network-scripts/ifup | 23 |
1 files changed, 8 insertions, 15 deletions
diff --git a/sysconfig/network-scripts/ifup b/sysconfig/network-scripts/ifup index db8d3ca5..8b782ed4 100755 --- a/sysconfig/network-scripts/ifup +++ b/sysconfig/network-scripts/ifup @@ -57,7 +57,7 @@ fi # figure out more about what we are dealing with DEVICETYPE=`echo ${DEVICE} | sed "s/[0-9]*$//"` -REALDEVICE=`echo ${DEVICE} | sed 's/:.*//g'` +[ -z "$REALDEVICE" ] && REALDEVICE=`echo ${DEVICE} | sed 's/:.*//g'` if echo ${DEVICE} | grep -q ':' ; then ISALIAS=yes else @@ -181,7 +181,7 @@ if [ -n "${DYNCONFIG}" ]; then else if [ -z "${IPADDR}" ]; then # enable device without IP, useful for e.g. PPPoE - ip link set ${DEVICE} up + ip link set ${REALDEVICE} up if [ "${NETWORKING_IPV6}" = "yes" ]; then /etc/sysconfig/network-scripts/ifup-ipv6 ${CONFIG} fi @@ -191,16 +191,16 @@ else expand_config [ -n "${ARP}${PROMISC}${ALLMULTI}" ] && \ - ip link set ${DEVICE} $(toggle_value arp $ARP) \ + ip link set ${REALDEVICE} $(toggle_value arp $ARP) \ $(toggle_value promisc $PROMISC) \ $(toggle_value allmulti $ALLMULTI) - if ! ip link set ${DEVICE} up ; then + if ! ip link set ${REALDEVICE} up ; then echo $"Failed to bring up ${DEVICE}." exit 1 fi - if ! arping -q -c 2 -w 3 -D -I ${DEVICE} ${IPADDR} ; then + if ! arping -q -c 2 -w 3 -D -I ${REALDEVICE} ${IPADDR} ; then echo $"Error, some other host already uses address ${IPADDR}." exit 1 fi @@ -212,17 +212,10 @@ else fi if ! LC_ALL=C ip addr ls ${REALDEVICE} | grep -q "${IPADDR}/${PREFIX}" ; then - if [ "$ISALIAS" = "yes" ]; then if ! ip addr add ${IPADDR}/${PREFIX} \ brd ${BROADCAST:-+} dev ${REALDEVICE} ${SCOPE} label ${DEVICE}; then echo $"Error adding address ${IPADDR} for ${DEVICE}." fi - else - if ! ip addr add ${IPADDR}/${PREFIX} \ - brd ${BROADCAST:-+} dev ${REALDEVICE} ${SCOPE} ; then - echo $"Error adding address ${IPADDR} for ${DEVICE}." - fi - fi fi # update ARP cache of neighboring computers @@ -232,16 +225,16 @@ else # Add a route for the subnet. Replace any existing route. if [ "${ISALIAS}" = no ]; then - ip route replace ${NETWORK}/${PREFIX} dev ${DEVICE} + ip route replace ${NETWORK}/${PREFIX} dev ${REALDEVICE} fi # Set a default route. - if [ -z "${GATEWAYDEV}" -o "${GATEWAYDEV}" = "${DEVICE}" ]; then + if [ -z "${GATEWAYDEV}" -o "${GATEWAYDEV}" = "${REALDEVICE}" ]; then # set up default gateway if [ -n "${GATEWAY}" -a "`ipcalc --network ${GATEWAY} ${NETMASK} 2>/dev/null`" = "NETWORK=${NETWORK}" ]; then ip route add default via ${GATEWAY} elif [ "${GATEWAYDEV}" = "${DEVICE}" ]; then - ip route add default dev ${DEVICE} + ip route add default dev ${REALDEVICE} fi fi fi |