diff options
| -rw-r--r-- | initscripts.spec | 1 | ||||
| -rwxr-xr-x | sysconfig/network-scripts/ifdown | 2 | ||||
| -rw-r--r-- | sysconfig/network-scripts/network-functions | 4 |
3 files changed, 4 insertions, 3 deletions
diff --git a/initscripts.spec b/initscripts.spec index a3419059..e6e4e1b7 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -28,6 +28,7 @@ Requires: udev >= 125-1 Requires: cpio Requires: hostname Conflicts: ipsec-tools < 0.8.0-2 +Conflicts: NetworkManager < 0.9.9.0-9.git20130807 Requires(pre): /usr/sbin/groupadd Requires(post): /sbin/chkconfig, coreutils Requires(preun): /sbin/chkconfig diff --git a/sysconfig/network-scripts/ifdown b/sysconfig/network-scripts/ifdown index 65608ee2..7fbedbea 100755 --- a/sysconfig/network-scripts/ifdown +++ b/sysconfig/network-scripts/ifdown @@ -43,7 +43,7 @@ fi if [ "$_use_nm" = "true" ]; then if [ -n "$UUID" -a -z "$DEVICE" ]; then - DEVICE=$(nmcli -t --fields uuid,devices con status | awk -F ':' "\$1 == \"$UUID\" { print \$2 }") + DEVICE=$(nmcli r -t --fields uuid,devices con show active | awk -F ':' "\$1 == \"$UUID\" { print \$2 }") fi if [ -n "$DEVICE" ] && ! is_nm_device_unmanaged "$DEVICE" ; then if ! LC_ALL=C nmcli -t -f STATE,DEVICE dev status | egrep -q "^(failed|disconnected|unmanaged|unavailable):$DEVICE$"; then diff --git a/sysconfig/network-scripts/network-functions b/sysconfig/network-scripts/network-functions index c699fc0d..cd4171fe 100644 --- a/sysconfig/network-scripts/network-functions +++ b/sysconfig/network-scripts/network-functions @@ -271,7 +271,7 @@ do_netreport () is_nm_running () { - [ "$(LANG=C nmcli -t --fields running nm status 2>/dev/null)" = "running" ] + [ "$(LANG=C nmcli -t --fields running general status 2>/dev/null)" = "running" ] } is_nm_active () @@ -281,7 +281,7 @@ is_nm_active () is_nm_device_unmanaged () { - LANG=C nmcli -t --fields GENERAL dev list iface "${1}" 2>/dev/null | awk -F ':' '/GENERAL.STATE/ { if ($2 == "unmanaged") exit 0 ; else exit 1; }' + LANG=C nmcli -t --fields GENERAL dev show "${1}" 2>/dev/null | awk -F ':' '/GENERAL.STATE/ { if ($2 == "unmanaged") exit 0 ; else exit 1; }' } # Sets $alias to the device module if $? != 0 |