diff options
| author | Bill Nottingham <notting@redhat.com> | 2010-06-04 14:17:15 -0400 |
|---|---|---|
| committer | Bill Nottingham <notting@redhat.com> | 2010-06-04 14:17:15 -0400 |
| commit | 300aaee62cd7a3166969e795b53b065c510e09c1 (patch) | |
| tree | 2ee1bd66989b8a1c2f7c59456bcfc2e9eb263d7f | |
| parent | cf97478390b735858393eeecbb55b89588b91513 (diff) | |
| download | initscripts-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.)
| -rw-r--r-- | sysconfig/network-scripts/network-functions | 2 |
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 |