[gentoo-commits] proj/openrc:master commit in: init.d/, conf.d/, doc/

[gentoo-commits] proj/openrc:master commit in: init.d/, conf.d/, doc/

[William Hubbs]

commit:     5bfebbecea6514037ceef3b832660f70acf8a945
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Mon Feb 11 15:45:14 2013 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Mon Feb 11 15:45:14 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=5bfebbec

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.

---
 conf.d/network.in        |    2 +-
 doc/net.example.BSD.in   |    2 +-
 doc/net.example.Linux.in |    2 +-
 init.d/net.lo.in         |    2 +-
 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 c7f948c..d5477a0 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 38b6dbf..3aae310 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 ed3b80b..d8fa084 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 10a7cb6..b6773fe 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 6e9b8c1..13895f0 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"