aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2016-06-13 16:40:46 +0200
committerLukas Nykryn <lnykryn@redhat.com>2016-06-13 16:41:16 +0200
commit61fb1cb4efd62120ffbc021d7fdee1cd25059c08 (patch)
treee9891d422fd4f82046d971a18b63fa22e976e0be
parentc1880449e4a518ca649120e5589e409d26a82550 (diff)
downloadinitscripts-61fb1cb4efd62120ffbc021d7fdee1cd25059c08.tar
initscripts-61fb1cb4efd62120ffbc021d7fdee1cd25059c08.tar.gz
initscripts-61fb1cb4efd62120ffbc021d7fdee1cd25059c08.tar.bz2
initscripts-61fb1cb4efd62120ffbc021d7fdee1cd25059c08.tar.xz
initscripts-61fb1cb4efd62120ffbc021d7fdee1cd25059c08.zip
source_config: tell NetworkManger to load ifcfg file even for NM_CONTROLLED=no
-rw-r--r--sysconfig/network-scripts/network-functions10
1 files changed, 6 insertions, 4 deletions
diff --git a/sysconfig/network-scripts/network-functions b/sysconfig/network-scripts/network-functions
index 9715d8d1..d1f12560 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
}