diff options
| author |   Christian Heim <phreak@gentoo.org> | 2005-12-22 09:21:39 +0000 |
|---|---|---|
| committer | Christian Heim <phreak@gentoo.org> | 2005-12-22 09:21:39 +0000 |
| commit | 489228bf1b7061469ec79fed2550aa460c8575a6 (patch) | |
| tree | 7ee277c9216a1eb13d899fc5e6c2702a05a57925 /net-scripts/init.d/net.lo | |
| parent | fix devpts for openvz (diff) | |
| download | baselayout-vserver-489228bf1b7061469ec79fed2550aa460c8575a6.tar.gz baselayout-vserver-489228bf1b7061469ec79fed2550aa460c8575a6.tar.bz2 baselayout-vserver-489228bf1b7061469ec79fed2550aa460c8575a6.zip | |
Merging latest changes to the baselayout branch. This merge is based upon revision 1767.
svn path=/baselayout-vserver/branches/baselayout-1_12/; revision=175
Diffstat (limited to 'net-scripts/init.d/net.lo')
| -rwxr-xr-x | net-scripts/init.d/net.lo | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/net-scripts/init.d/net.lo b/net-scripts/init.d/net.lo index 1ba02d9..2218475 100755 --- a/net-scripts/init.d/net.lo +++ b/net-scripts/init.d/net.lo @@ -698,7 +698,8 @@ iface_stop() { interface_del_addresses "${i}" # Do final shut down of this alias - if ! ${IN_BACKGROUND}; then + if [[ ${IN_BACKGROUND} != "true" \ + && ${RC_DOWN_INTERFACE} == "yes" ]]; then ebegin "Shutting down ${i}" interface_iface_stop "${i}" eend "$?" @@ -774,7 +775,9 @@ run_start() { # Start the interface if ! iface_start "${iface}" ; then - interface_exists "${iface}" && interface_down "${iface}" + if [[ ${IN_BACKGROUND} != "true" ]]; then + interface_exists "${iface}" && interface_down "${iface}" + fi eend 1 return 1 fi @@ -904,6 +907,8 @@ run() { eoutdent fi fi + [[ ${IN_BACKGROUND} == "true" ]] \ + && mark_service_inactive "net.${iface}" fi return "${r}" |