From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id CA5CB1389A0 for ; Mon, 11 Feb 2013 15:52:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 82C3421C001; Mon, 11 Feb 2013 15:52:41 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 046AC21C001 for ; Mon, 11 Feb 2013 15:52:40 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E3AC233E67A for ; Mon, 11 Feb 2013 15:52:39 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 8772AE4073 for ; Mon, 11 Feb 2013 15:52:38 +0000 (UTC) From: "William Hubbs" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "William Hubbs" Message-ID: <1360597514.5bfebbecea6514037ceef3b832660f70acf8a945.WilliamH@OpenRC> Subject: [gentoo-commits] proj/openrc:master commit in: init.d/, conf.d/, doc/ X-VCS-Repository: proj/openrc X-VCS-Files: conf.d/network.in doc/net.example.BSD.in doc/net.example.Linux.in init.d/net.lo.in init.d/network.in X-VCS-Directories: init.d/ conf.d/ doc/ X-VCS-Committer: WilliamH X-VCS-Committer-Name: William Hubbs X-VCS-Revision: 5bfebbecea6514037ceef3b832660f70acf8a945 X-VCS-Branch: master Date: Mon, 11 Feb 2013 15:52:38 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 13da0834-c4a0-4f21-a911-cb8ecfb20d67 X-Archives-Hash: a19e5082ec7eeac007e299d321bad386 commit: 5bfebbecea6514037ceef3b832660f70acf8a945 Author: William Hubbs gmail com> AuthorDate: Mon Feb 11 15:45:14 2013 +0000 Commit: William Hubbs gentoo 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"