diff options
| author | Colin Guthrie <colin@mageia.org> | 2013-10-17 19:56:43 +0100 |
|---|---|---|
| committer | Colin Guthrie <colin@mageia.org> | 2013-10-18 09:35:39 +0100 |
| commit | 9cec39ee7ef6a745c3a9b19d1ba6e89b09da43c3 (patch) | |
| tree | 3a122662900195e7b14067a03cd5124358db9daf /sysconfig/network-scripts/ifdown | |
| parent | 423b437e3d29673dfad4051515506e6d711d20e6 (diff) | |
| parent | 8f5a82934f801ec94847fc899d235a39df9967a7 (diff) | |
| download | initscripts-user/colin/update-to-9-50.tar initscripts-user/colin/update-to-9-50.tar.gz initscripts-user/colin/update-to-9-50.tar.bz2 initscripts-user/colin/update-to-9-50.tar.xz initscripts-user/colin/update-to-9-50.zip | |
Merge tag 'initscripts-9.50-1' into distro/mgauser/colin/update-to-9-50
Tag as initscripts-9.50-1
Conflicts:
Makefile
lang.csh
lang.sh
po/Makefile
rc.d/init.d/network
service
sysconfig.txt
sysconfig/init
sysconfig/network-scripts/ifup
sysconfig/network-scripts/ifup-eth
sysconfig/network-scripts/ifup-ippp
sysconfig/network-scripts/network-functions
sysctl.conf
systemd/fedora-storage-init
Diffstat (limited to 'sysconfig/network-scripts/ifdown')
| -rwxr-xr-x | sysconfig/network-scripts/ifdown | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/sysconfig/network-scripts/ifdown b/sysconfig/network-scripts/ifdown index 34a10c53..b9a7a1fc 100755 --- a/sysconfig/network-scripts/ifdown +++ b/sysconfig/network-scripts/ifdown @@ -12,14 +12,14 @@ cd /etc/sysconfig/network-scripts CONFIG=$1 [ -z "$CONFIG" ] && { - echo $"usage: ifdown <device name>" >&2 + echo $"usage: ifdown <configuration>" >&2 exit 1 } need_config "${CONFIG}" [ -f "$CONFIG" ] || { - echo $"usage: ifdown <device name>" >&2 + echo $"usage: ifdown <configuration>" >&2 exit 1 } @@ -46,8 +46,11 @@ if [ "$_use_nm" = "true" ]; then DEVICE=$(nmcli -t --fields uuid,devices con status | awk -F ':' "\$1 == \"$UUID\" { print \$2 }") fi if [ -n "$DEVICE" ] && ! is_nm_device_unmanaged "$DEVICE" ; then - nmcli dev disconnect iface "$DEVICE" - exit $? + if ! LC_ALL=C nmcli -t -f STATE,DEVICE dev status | egrep -q "^(failed|disconnected|unmanaged|unavailable):$DEVICE$"; then + nmcli dev disconnect iface "$DEVICE" + exit $? + fi + exit 0 fi echo $"$0: interface ${CONFIG} is controlled by NetworkManager; skipping." >&2 exit 0 |