diff options
| author | Bill Nottingham <notting@redhat.com> | 2010-03-04 12:30:07 -0500 |
|---|---|---|
| committer | Bill Nottingham <notting@redhat.com> | 2010-04-09 16:39:14 -0400 |
| commit | c69d7c4d2b1cc939701e5caa00955010297c7c26 (patch) | |
| tree | 9506a30bd391042062273f7c47b5e08236a39396 | |
| parent | 1d4d3b409fe823c8769ad8a618d49b9c9eae50cf (diff) | |
| download | initscripts-c69d7c4d2b1cc939701e5caa00955010297c7c26.tar initscripts-c69d7c4d2b1cc939701e5caa00955010297c7c26.tar.gz initscripts-c69d7c4d2b1cc939701e5caa00955010297c7c26.tar.bz2 initscripts-c69d7c4d2b1cc939701e5caa00955010297c7c26.tar.xz initscripts-c69d7c4d2b1cc939701e5caa00955010297c7c26.zip | |
Pull device from NetworkManager, if possible.
Requires a fairly recent nmcli.
| -rwxr-xr-x | sysconfig/network-scripts/ifdown | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/sysconfig/network-scripts/ifdown b/sysconfig/network-scripts/ifdown index fd766427..addf7345 100755 --- a/sysconfig/network-scripts/ifdown +++ b/sysconfig/network-scripts/ifdown @@ -41,9 +41,14 @@ then exit 0 fi -if [ "$USE_NM" = "true" ]] && is_nm_active "$DEVICE" ; then - nmcli dev disconnect iface "$DEVICE" - exit $? +if [ "$USE_NM" = "true" ]; then + if [ -n "$UUID" -a -z "$DEVICE" ]; then + DEVICE=$(nmcli con status | awk "\$4 == \"$UUID\" { print \$3 }") + fi + if [ -n "$DEVICE" ] && is_nm_active "$DEVICE" ; then + nmcli dev disconnect iface "$DEVICE" + exit $? + fi fi if [ -x /sbin/ifdown-pre-local ]; then |