From 1dedc710c01a48fa493c2922e4000e64415bb120 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ji=C5=99=C3=AD=20Klime=C5=A1?= <jklimes@redhat.com>
Date: Mon, 1 Nov 2010 10:37:03 +0100
Subject: Fix ifdown calling nmcli for NM-managed devices; others are handled
 by ifdown-${DEVICETYPE} (#612934).

---
 sysconfig/network-scripts/ifdown            | 2 +-
 sysconfig/network-scripts/network-functions | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

(limited to 'sysconfig')

diff --git a/sysconfig/network-scripts/ifdown b/sysconfig/network-scripts/ifdown
index f308d317..db045da4 100755
--- a/sysconfig/network-scripts/ifdown
+++ b/sysconfig/network-scripts/ifdown
@@ -45,7 +45,7 @@ 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 }")
     fi
-    if [ -n "$DEVICE" ] && is_nm_active "$DEVICE" ; then
+    if [ -n "$DEVICE" ] && ! is_nm_device_unmanaged "$DEVICE" ; then
 	nmcli dev disconnect iface "$DEVICE"
 	exit $?
     fi
diff --git a/sysconfig/network-scripts/network-functions b/sysconfig/network-scripts/network-functions
index e72c8098..68ff961a 100644
--- a/sysconfig/network-scripts/network-functions
+++ b/sysconfig/network-scripts/network-functions
@@ -209,6 +209,11 @@ is_nm_active ()
     LANG=C nmcli -t --fields device,state  dev status 2>/dev/null | grep -q "^${1}:connected$"
 }
 
+is_nm_device_unmanaged ()
+{
+    LANG=C nmcli -t --fields device,state  dev status 2>/dev/null | grep -q "^${1}:unmanaged$"
+}
+
 # Sets $alias to the device module if $? != 0
 is_available ()
 {
-- 
cgit v1.2.1