diff options
| author | William Hubbs <w.d.hubbs@gmail.com> | 2013-02-11 09:45:14 -0600 |
|---|---|---|
| committer | William Hubbs <w.d.hubbs@gmail.com> | 2013-02-11 09:45:14 -0600 |
| commit | 5bfebbecea6514037ceef3b832660f70acf8a945 (patch) | |
| tree | 2c984e7669137555cb62ea6ee809040292fcc830 | |
| parent | 1280b97749ec60b4cd3f77d1c68202f305ad79b4 (diff) | |
Rename shutdown_network setting to keep_network
We were telling users that setting shutdown_network=YES would shut down
the network interfaces during shutdown, but this was exactly the
opposite of what we were doing. The default was YES, which was keeping
the interfaces active.
This keeps the default behavior, but renames the setting to keep_network
which more accurately describes its function, and instructs users to set
it to NO if they want the network interfaces to go down.
| -rw-r--r-- | conf.d/network.in | 2 | ||||
| -rw-r--r-- | doc/net.example.BSD.in | 2 | ||||
| -rw-r--r-- | doc/net.example.Linux.in | 2 | ||||
| -rw-r--r-- | init.d/net.lo.in | 2 | ||||
| -rw-r--r-- | init.d/network.in | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/conf.d/network.in b/conf.d/network.in index c7f948cc..d5477a0d 100644 --- a/conf.d/network.in +++ b/conf.d/network.in @@ -7,7 +7,7 @@ # You also have ifup_eth0 and ifdown_eth0 to run other commands when # eth0 is started and stopped. # You should note that we don't stop the network at system shutdown by default. -# If you really need this, then set shutdown_network=YES +# If you really need this, then set keep_network=NO # Lastly, the interfaces variable pulls in virtual interfaces that cannot # be automatically detected. diff --git a/doc/net.example.BSD.in b/doc/net.example.BSD.in index 38b6dbf9..3aae310c 100644 --- a/doc/net.example.BSD.in +++ b/doc/net.example.BSD.in @@ -442,4 +442,4 @@ #} # You should note that we don't stop the network at system shutdown by default. -# If you really need this, then set shutdown_network=YES +# If you really need this, then set keep_network=NO diff --git a/doc/net.example.Linux.in b/doc/net.example.Linux.in index ed3b80bc..d8fa0842 100644 --- a/doc/net.example.Linux.in +++ b/doc/net.example.Linux.in @@ -1244,4 +1244,4 @@ #} # You should note that we don't stop the network at system shutdown by default. -# If you really need this, then set shutdown_network=YES +# If you really need this, then set keep_network=NO diff --git a/init.d/net.lo.in b/init.d/net.lo.in index 10a7cb61..b6773fe9 100644 --- a/init.d/net.lo.in +++ b/init.d/net.lo.in @@ -712,7 +712,7 @@ stop() # Don't stop the network at shutdown. # We don't use the noshutdown keyword so that we are started again # correctly if we go back to multiuser. - yesno ${shutdown_network:-YES} && yesno $RC_GOINGDOWN && return 0 + yesno ${keep_network:-YES} && yesno $RC_GOINGDOWN && return 0 local IFACE=${RC_SVCNAME#*.} module= local IFVAR=$(shell_var "${IFACE}") opts= diff --git a/init.d/network.in b/init.d/network.in index 6e9b8c1f..13895f0c 100644 --- a/init.d/network.in +++ b/init.d/network.in @@ -323,7 +323,7 @@ stop() # Don't stop the network at shutdown. # We don't use the noshutdown keyword so that we are started again # correctly if we go back to multiuser. - yesno ${shutdown_network:-YES} && yesno $RC_GOINGDOWN && return 0 + yesno ${keep_network:-YES} && yesno $RC_GOINGDOWN && return 0 local int= intv= cmd= downcmd= r= einfo "Stopping network" |