diff options
| author | Bill Nottingham <notting@redhat.com> | 2010-02-17 15:32:22 -0500 |
|---|---|---|
| committer | Bill Nottingham <notting@redhat.com> | 2010-03-01 16:03:37 -0500 |
| commit | ec7c088ad300e79a4bed6310c3a19e6c9bc03c4e (patch) | |
| tree | c97c2ce9a3b933ccab002637d54a61a39625be31 /sysconfig | |
| parent | 1733f15b20d44fe195550d81e98dd3c68b0c8d3b (diff) | |
| download | initscripts-ec7c088ad300e79a4bed6310c3a19e6c9bc03c4e.tar initscripts-ec7c088ad300e79a4bed6310c3a19e6c9bc03c4e.tar.gz initscripts-ec7c088ad300e79a4bed6310c3a19e6c9bc03c4e.tar.bz2 initscripts-ec7c088ad300e79a4bed6310c3a19e6c9bc03c4e.tar.xz initscripts-ec7c088ad300e79a4bed6310c3a19e6c9bc03c4e.zip | |
When bringing devices down, disconnect the device, don't down the connection.
Diffstat (limited to 'sysconfig')
| -rwxr-xr-x | sysconfig/network-scripts/ifdown | 8 | ||||
| -rw-r--r-- | sysconfig/network-scripts/network-functions | 5 |
2 files changed, 7 insertions, 6 deletions
diff --git a/sysconfig/network-scripts/ifdown b/sysconfig/network-scripts/ifdown index 9c9112cb..31d3f716 100755 --- a/sysconfig/network-scripts/ifdown +++ b/sysconfig/network-scripts/ifdown @@ -41,12 +41,8 @@ then exit 0 fi -if [ "$USE_NM" = "true" -a -n "$NAME" -o -n "$UUID" ]; then - if [ -n "$UUID" ]; then - nmcli con down uuid "$UUID" - elif [ -n "$NAME" ]; then - nmcli con down id "$NAME" - fi +if [ "$USE_NM" = "true" ]] && is_nm_active "$DEVICE" ; then + nmcli dev disconnect iface "$DEVICE" exit $? fi diff --git a/sysconfig/network-scripts/network-functions b/sysconfig/network-scripts/network-functions index 8ae752ba..a29c9764 100644 --- a/sysconfig/network-scripts/network-functions +++ b/sysconfig/network-scripts/network-functions @@ -200,6 +200,11 @@ is_nm_running () LANG=C nmcli nm status | grep -Eq "NM running:[[:space:]]+running" } +is_nm_active () +{ + LANG=C nmcli -t dev status | grep -Eq "^${1}[[:space:]]*.*[[:space:]]*connected$" +} + # Sets $alias to the device module if $? != 0 is_available () { |