diff options
| author | Thomas Haller <thaller@redhat.com> | 2016-06-13 16:40:46 +0200 |
|---|---|---|
| committer | Lukas Nykryn <lnykryn@redhat.com> | 2016-06-13 16:42:20 +0200 |
| commit | a4eefc6bdfb1e6872ef83428b833a0cc6474e8e2 (patch) | |
| tree | a085be10414c7d57b0e2009c6176c7bd0bf5bfd9 /sysconfig | |
| parent | 3afde913951ed28180b059e204a7061b18084644 (diff) | |
| download | initscripts-a4eefc6bdfb1e6872ef83428b833a0cc6474e8e2.tar initscripts-a4eefc6bdfb1e6872ef83428b833a0cc6474e8e2.tar.gz initscripts-a4eefc6bdfb1e6872ef83428b833a0cc6474e8e2.tar.bz2 initscripts-a4eefc6bdfb1e6872ef83428b833a0cc6474e8e2.tar.xz initscripts-a4eefc6bdfb1e6872ef83428b833a0cc6474e8e2.zip | |
source_config: tell NetworkManger to load ifcfg file even for NM_CONTROLLED=no
Diffstat (limited to 'sysconfig')
| -rw-r--r-- | sysconfig/network-scripts/network-functions | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/sysconfig/network-scripts/network-functions b/sysconfig/network-scripts/network-functions index 61a851f0..db729cc6 100644 --- a/sysconfig/network-scripts/network-functions +++ b/sysconfig/network-scripts/network-functions @@ -170,10 +170,12 @@ source_config () else ISALIAS=no fi - if ! is_false $NM_CONTROLLED && is_nm_running; then - nmcli con load "/etc/sysconfig/network-scripts/$CONFIG" - UUID=$(get_uuid_by_config $CONFIG) - [ -n "$UUID" ] && _use_nm=true + if is_nm_running; then + nmcli con load "/etc/sysconfig/network-scripts/$CONFIG" + if ! is_false $NM_CONTROLLED; then + UUID=$(get_uuid_by_config $CONFIG) + [ -n "$UUID" ] && _use_nm=true + fi fi } |