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:13 +0200 |
| commit | 22115405ab3f578500884de21f4bb9ebf80dbc62 (patch) | |
| tree | e18361daf39eb7d9edd790ec70000032e7d484b7 /rc.d | |
| parent | 2a4bb8e267996666a768dc5d99b2ce68f53fa0ff (diff) | |
| download | initscripts-22115405ab3f578500884de21f4bb9ebf80dbc62.tar initscripts-22115405ab3f578500884de21f4bb9ebf80dbc62.tar.gz initscripts-22115405ab3f578500884de21f4bb9ebf80dbc62.tar.bz2 initscripts-22115405ab3f578500884de21f4bb9ebf80dbc62.tar.xz initscripts-22115405ab3f578500884de21f4bb9ebf80dbc62.zip | |
network: tell nm to wake the slaves
Diffstat (limited to 'rc.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 74da26d9..e287c7b2 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 |