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:18:15 -0400 |
| commit | 9f8376705fd7589d65f7c4716a1a151ec18d4dc4 (patch) | |
| tree | 984ccfa0b4fc017d690a747d301c290f81b028cd | |
| parent | 72e39e1f8154623b6fbbd495e582355b0e96a265 (diff) | |
| download | initscripts-9f8376705fd7589d65f7c4716a1a151ec18d4dc4.tar initscripts-9f8376705fd7589d65f7c4716a1a151ec18d4dc4.tar.gz initscripts-9f8376705fd7589d65f7c4716a1a151ec18d4dc4.tar.bz2 initscripts-9f8376705fd7589d65f7c4716a1a151ec18d4dc4.tar.xz initscripts-9f8376705fd7589d65f7c4716a1a151ec18d4dc4.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 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 |