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:09 -0400 |
| commit | 0c751be2ecfa5f10e7fd6f703cb2834efc72eefb (patch) | |
| tree | 9d6136fc3684a6045ecd1ca66902b197f29fcbe0 | |
| parent | f15080a9fe3486d643782a4b3e5e8eaaf7b520bf (diff) | |
| download | initscripts-0c751be2ecfa5f10e7fd6f703cb2834efc72eefb.tar initscripts-0c751be2ecfa5f10e7fd6f703cb2834efc72eefb.tar.gz initscripts-0c751be2ecfa5f10e7fd6f703cb2834efc72eefb.tar.bz2 initscripts-0c751be2ecfa5f10e7fd6f703cb2834efc72eefb.tar.xz initscripts-0c751be2ecfa5f10e7fd6f703cb2834efc72eefb.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 |