| 1 |
From f7d3fead844d504c88ef4bd2bd3b2a5d168cd1eb Mon Sep 17 00:00:00 2001 |
| 2 |
From: Colin Guthrie <colin@mageia.org> |
| 3 |
Date: Wed, 23 Jul 2014 11:54:18 +0100 |
| 4 |
Subject: [PATCH] Quick fix for network manager API change |
| 5 |
|
| 6 |
--- |
| 7 |
sysconfig/network-scripts/network-functions | 5 +++-- |
| 8 |
1 file changed, 3 insertions(+), 2 deletions(-) |
| 9 |
|
| 10 |
diff --git a/sysconfig/network-scripts/network-functions b/sysconfig/network-scripts/network-functions |
| 11 |
index fd6572b..ac5917d 100644 |
| 12 |
--- a/sysconfig/network-scripts/network-functions |
| 13 |
+++ b/sysconfig/network-scripts/network-functions |
| 14 |
@@ -274,7 +274,7 @@ do_netreport () |
| 15 |
is_nm_running () |
| 16 |
{ |
| 17 |
[ -x /usr/bin/nmcli ] && \ |
| 18 |
- [ "$(LANG=C LC_ALL=C nmcli -t --fields running nm status 2>/dev/null)" = "running" ] |
| 19 |
+ [ "$(LANG=C LC_ALL=C nmcli -t --fields running general status 2>/dev/null)" = "running" ] |
| 20 |
} |
| 21 |
|
| 22 |
is_nm_device_unavailable () |
| 23 |
@@ -291,7 +291,8 @@ is_nm_active () |
| 24 |
|
| 25 |
is_nm_device_unmanaged () |
| 26 |
{ |
| 27 |
- LANG=C LC_ALL=C nmcli -t --fields GENERAL dev list iface "${1}" 2>/dev/null | awk -F ':' '/GENERAL.STATE/ { if ($2 == "unmanaged") exit 0 ; else exit 1; }' |
| 28 |
+ [ -x /usr/bin/nmcli ] && \ |
| 29 |
+ LANG=C LC_ALL=C nmcli -t --fields GENERAL dev show "${1}" 2>/dev/null | awk -F ':' '/GENERAL.STATE/ { if ($2 == "unmanaged") exit 0 ; else exit 1; }' |
| 30 |
} |
| 31 |
|
| 32 |
# Sets $alias to the device module if $? != 0 |
| 33 |
-- |
| 34 |
1.9.2 |
| 35 |
|
Parent Directory
| 
Revision Log