diff options
Diffstat (limited to 'rc.d/init.d')
| -rwxr-xr-x | rc.d/init.d/network | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/rc.d/init.d/network b/rc.d/init.d/network index 2f0cc904..ea3ce8f9 100755 --- a/rc.d/init.d/network +++ b/rc.d/init.d/network @@ -83,10 +83,11 @@ case "$1" in eval $(LANG=C grep -F "DEVICE=" ifcfg-$i) eval $(LANG=C grep -F "TYPE=" ifcfg-$i) eval $(LANG=C grep -F "SLAVE=" ifcfg-$i) + eval $(LANG=C grep -F "NM_CONTROLLED=" ifcfg-$i) if [ -z "$DEVICE" ] ; then DEVICE="$i"; fi - if [ "$SLAVE" = "yes" ]; then + if [ "$SLAVE" = "yes" ] && ( ! is_nm_running || is_false $NM_CONTROLLED ) ; then continue fi |