diff options
| author | James Rayner <james@archlinux.org> | 2009-09-22 14:15:02 +0200 |
|---|---|---|
| committer | James Rayner <james@archlinux.org> | 2009-09-22 14:15:02 +0200 |
| commit | 1c6760ebd6b7d6630fbab75885fac5dbea90c78b (patch) | |
| tree | 05e67c2ab4fab972984fae3671b2b5cae116d2e7 /src/network | |
| parent | 57bed3df9310db328d80b32b31fdefa8418bbd1e (diff) | |
| download | netctl-1c6760ebd6b7d6630fbab75885fac5dbea90c78b.tar.gz netctl-1c6760ebd6b7d6630fbab75885fac5dbea90c78b.tar.xz | |
Merge connections ethernet/ethernet-iproute
Diffstat (limited to 'src/network')
| -rw-r--r-- | src/network | 23 |
1 files changed, 6 insertions, 17 deletions
diff --git a/src/network b/src/network index 165d6e3..be814d4 100644 --- a/src/network +++ b/src/network @@ -337,32 +337,21 @@ bring_interface() { INTERFACE="$2" case "$1" in - up|up-old) + up) if ! ( eval $IFACE_UP ); then return 1 fi - if [ "$1" = old ]; then - ifconfig "$INTERFACE" up - else - ip link set dev "$INTERFACE" up &>/dev/null # man ip is inconsistent about whether to use "dev" - fi + ip link set dev "$INTERFACE" up &>/dev/null # man ip is inconsistent about whether to use "dev" sleep "${UP_SLEEP:-2}" ;; - down|forcedown|down-old|forcedown-old) + down|forcedown) # should this be placed elsewhere? if ! ( eval $IFACE_DOWN ); then return 1 fi - if [ "${1%-old}" != "$1" ]; then - ifconfig "$INTERFACE" 0.0.0.0 - if ! quirk nodown || [ "$1" = forcedown-old ]; then - ifconfig "$INTERFACE" down - fi - else - ip addr flush dev "$INTERFACE" &>/dev/null - if ! quirk nodown || [ "$1" = forcedown ]; then - ip link set dev "$INTERFACE" down &>/dev/null # man ip is inconsistent about whether to use "dev" - fi + ip addr flush dev "$INTERFACE" &>/dev/null + if ! quirk nodown || [ "$1" = forcedown ]; then + ip link set dev "$INTERFACE" down &>/dev/null # man ip is inconsistent about whether to use "dev" fi ;; *) |