From 2b784ad0b77c5a4f15e9af1535ed79b35d8ae6f4 Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@redhat.com>
Date: Wed, 5 May 2010 12:20:00 -0400
Subject: Update for new nmcli syntax.

---
 initscripts.spec                            | 7 +++++--
 sysconfig/network-scripts/ifdown            | 2 +-
 sysconfig/network-scripts/network-functions | 4 ++--
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/initscripts.spec b/initscripts.spec
index 9a305192..d7582c26 100644
--- a/initscripts.spec
+++ b/initscripts.spec
@@ -2,7 +2,7 @@
 
 Summary: The inittab file and the /etc/init.d scripts
 Name: initscripts
-Version: 9.11
+Version: 9.12
 # ppp-watch is GPLv2+, everything else is GPLv2
 License: GPLv2 and GPLv2+
 Group: System Environment/Base
@@ -40,7 +40,7 @@ Conflicts: dmraid < 1.0.0.rc16-7
 Conflicts: e2fsprogs < 1.15
 # http://bugzilla.redhat.com/show_bug.cgi?id=252973
 Conflicts: nut < 2.2.0
-Conflicts: NetworkManager < 1:0.8.0
+Conflicts: NetworkManager < 1:0.8.0-12.git20100504
 Obsoletes: hotplug <= 3:2004_09_23-10.1
 Requires(pre): /usr/sbin/groupadd
 Requires(post): /sbin/chkconfig, coreutils
@@ -241,6 +241,9 @@ rm -rf $RPM_BUILD_ROOT
 /etc/profile.d/debug*
 
 %changelog
+* Wed May  5 2010 Bill Nottingham <notting@redhat.com> - 9.12-1
+- update for final nmcli syntax
+
 * Mon May  3 2010 Bill Nottingham <notting@redhat.com> - 9.11-1
 - init/plymouth-shutdown.conf: add 'task' here as well
 
diff --git a/sysconfig/network-scripts/ifdown b/sysconfig/network-scripts/ifdown
index addf7345..f308d317 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 con status | awk "\$4 == \"$UUID\" { print \$3 }")
+	DEVICE=$(nmcli -t --fields uuid,devices con status | awk -F ':' "\$1 == \"$UUID\" { print \$2 }")
     fi
     if [ -n "$DEVICE" ] && is_nm_active "$DEVICE" ; then
 	nmcli dev disconnect iface "$DEVICE"
diff --git a/sysconfig/network-scripts/network-functions b/sysconfig/network-scripts/network-functions
index c8846ef8..9fc84bca 100644
--- a/sysconfig/network-scripts/network-functions
+++ b/sysconfig/network-scripts/network-functions
@@ -201,12 +201,12 @@ do_netreport ()
 
 is_nm_running ()
 {
-    LANG=C nmcli nm status 2>/dev/null| grep -Eq "NM running:[[:space:]]+running"
+    [ "$(LANG=C nmcli -t --fields running nm status 2>/dev/null)" = "running" ]
 }
 
 is_nm_active ()
 {
-    LANG=C nmcli -t dev status 2>/dev/null| grep -Eq "^${1}[[:space:]]*.*[[:space:]]*connected"
+    LANG=C nmcli -t --fields device,state  dev status 2>/dev/null | grep -q "^${1}:connected$"
 }
 
 # Sets $alias to the device module if $? != 0
-- 
cgit v1.2.1