aboutsummaryrefslogtreecommitdiffstats
path: root/sysconfig
diff options
context:
space:
mode:
authorBill Nottingham <notting@redhat.com>2010-06-04 14:17:15 -0400
committerBill Nottingham <notting@redhat.com>2010-06-04 14:17:15 -0400
commit300aaee62cd7a3166969e795b53b065c510e09c1 (patch)
tree2ee1bd66989b8a1c2f7c59456bcfc2e9eb263d7f /sysconfig
parentcf97478390b735858393eeecbb55b89588b91513 (diff)
downloadinitscripts-300aaee62cd7a3166969e795b53b065c510e09c1.tar
initscripts-300aaee62cd7a3166969e795b53b065c510e09c1.tar.gz
initscripts-300aaee62cd7a3166969e795b53b065c510e09c1.tar.bz2
initscripts-300aaee62cd7a3166969e795b53b065c510e09c1.tar.xz
initscripts-300aaee62cd7a3166969e795b53b065c510e09c1.zip
Check NM_CONTROLLED before deciding to use NM for a connection. (#599707, probably others.)
Diffstat (limited to 'sysconfig')
-rw-r--r--sysconfig/network-scripts/network-functions2
1 files changed, 1 insertions, 1 deletions
diff --git a/sysconfig/network-scripts/network-functions b/sysconfig/network-scripts/network-functions
index 013286ca..e7491cd0 100644
--- a/sysconfig/network-scripts/network-functions
+++ b/sysconfig/network-scripts/network-functions
@@ -143,7 +143,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