diff options
| author | Jim Pryor <profjim@jimpryor.net> | 2009-08-11 14:05:13 +0200 |
|---|---|---|
| committer | James Rayner <james@archlinux.org> | 2009-08-15 04:28:30 +0200 |
| commit | e27d094577f874613c49cc3d93796162230ca2c8 (patch) | |
| tree | fbd7cb78b7c6d11b6d12febce6a9f99581a64a67 /src/network | |
| parent | 2282776f1dd928b6c5f56e30cbf2c52a4f26303d (diff) | |
| download | netctl-e27d094577f874613c49cc3d93796162230ca2c8.tar.gz netctl-e27d094577f874613c49cc3d93796162230ca2c8.tar.xz | |
start consolidation of ifconfig/ip/set_interface
* try to factor all the ifconfig/ip set dev code to single location
(currently networks/set_interface, though I recommend a different name
for this function because it's too close in name and different
in functionality from set_iface, set_profile).
* added "forcedown" option to set_interface, meaning "just go down
don't worry about 'nodown' quirks"
* even with "forcedown", this factoring would introduce "ip addr
flush dev $INTERFACE" calls to existing code. I assume that's
harmless? or even beneficial?
* one code block (in ethernet_iproute) had stdout,stderr of the
down calls redirected to /dev/null. I've moved that to
set_interface, so now everyone's getting that behavior. I assume
that's appropriate...
* now no more calls to "ip" or "ifconfig" outside of set_interface,
except the checks for NO-CARRIER after ethernet*/set_interface up.
They might also be moved to network/set_interface?
* as of this commit, all the set_interface calls are now using ip
instead of ifconfig. A subsequent commit will isolate the ip-use
to ethernet-iproute and the ifconfig-use to ethernet.
* ALERT: attend to wireless_down, it seems to be calling
set_interface down twice (once in ethernet_down, once in itself).
And neither this commit nor the code it's patching respects
quirk nodown in the ethernet_down block.
Signed-off-by: Jim Pryor <profjim@jimpryor.net>
Diffstat (limited to 'src/network')
| -rw-r--r-- | src/network | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/src/network b/src/network index ae74837..d65c899 100644 --- a/src/network +++ b/src/network @@ -336,17 +336,19 @@ set_iface() { set_interface() { - INTERFACE=$2 - case $1 in + INTERFACE="$2" + case "$1" in up) at_interface_up - ip link set dev $INTERFACE up - sleep ${UP_SLEEP:-2} + ip link set dev "$INTERFACE" up + sleep "${UP_SLEEP:-2}" ;; - down) + down|forcedown) at_interface_down - ip addr flush dev "$INTERFACE" - quirk nodown || ip link set dev "$INTERFACE" down + ip addr flush dev "$INTERFACE" &>/dev/null + if ! quirk nodown || [ "$1" = forcedown ]; then + ip link set dev "$INTERFACE" down &>/dev/null + fi ;; *) return 1 |