diff options
| author | Lukas Nykryn <lnykryn@redhat.com> | 2014-07-24 13:52:13 +0200 |
|---|---|---|
| committer | Lukas Nykryn <lnykryn@redhat.com> | 2014-07-24 13:52:50 +0200 |
| commit | a788682bd31937468739a223c28e99cffc72e869 (patch) | |
| tree | c49ffe2b88d7d8ad4f54c08abb276e402524e3b3 /rc.d/init.d/network | |
| parent | e2d575550ef975cb3cf5456060d75a66cd63aee4 (diff) | |
| download | initscripts-a788682bd31937468739a223c28e99cffc72e869.tar initscripts-a788682bd31937468739a223c28e99cffc72e869.tar.gz initscripts-a788682bd31937468739a223c28e99cffc72e869.tar.bz2 initscripts-a788682bd31937468739a223c28e99cffc72e869.tar.xz initscripts-a788682bd31937468739a223c28e99cffc72e869.zip | |
network: tell nm to wake the slaves
Diffstat (limited to 'rc.d/init.d/network')
| -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 |