From 032eeb4dd68bbacd78c677de37cc8a1642ec67ab Mon Sep 17 00:00:00 2001
From: Lukas Nykryn <lnykryn@redhat.com>
Date: Wed, 12 Feb 2014 14:46:12 +0100
Subject: update ifup/ifdown NetworkManager interaction (#1036701, #1061810)

---
 sysconfig/network-scripts/network-functions | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'sysconfig/network-scripts/network-functions')

diff --git a/sysconfig/network-scripts/network-functions b/sysconfig/network-scripts/network-functions
index cd4171fe..1e459249 100644
--- a/sysconfig/network-scripts/network-functions
+++ b/sysconfig/network-scripts/network-functions
@@ -170,9 +170,10 @@ source_config ()
     else
 	ISALIAS=no
     fi
-    ! is_false $NM_CONTROLLED && is_nm_running && _use_nm=true
-    if [ -z "$UUID" -a "$_use_nm" = "true" ]; then
+    if ! is_false $NM_CONTROLLED && is_nm_running; then
+	nmcli con load "/etc/sysconfig/network-scripts/$CONFIG"
 	UUID=$(get_uuid_by_config $CONFIG)
+	[ -n "$UUID" ] && _use_nm=true
     fi
 }
 
-- 
cgit v1.2.1