From 9f8376705fd7589d65f7c4716a1a151ec18d4dc4 Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@redhat.com>
Date: Fri, 4 Jun 2010 14:17:15 -0400
Subject: Check NM_CONTROLLED before deciding to use NM for a connection.
 (#599707, probably others.)

---
 sysconfig/network-scripts/network-functions | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sysconfig/network-scripts/network-functions b/sysconfig/network-scripts/network-functions
index 777a1f8a..4790875e 100644
--- a/sysconfig/network-scripts/network-functions
+++ b/sysconfig/network-scripts/network-functions
@@ -137,7 +137,7 @@ source_config ()
     else
 	ISALIAS=no
     fi
-    is_nm_running && USE_NM=true
+    ! is_false $NM_CONTROLLED && is_nm_running && USE_NM=true
     if [ -z "$UUID" -a "$USE_NM" = "true" ]; then
 	UUID=$(get_uuid_by_config $CONFIG)
     fi
-- 
cgit v1.2.1