diff mbox series

[RFC,06/15] network scripts: remove check for AUTOCONNECT

Message ID	20230523172314.7826-7-jonatan.schlag@ipfire.org
State	Changes Requested
Headers	From: Jonatan Schlag <jonatan.schlag@ipfire.org> To: development@lists.ipfire.org Subject: [Patch RFC 06/15] network scripts: remove check for AUTOCONNECT Date: Tue, 23 May 2023 19:23:06 +0200 Message-Id: <20230523172314.7826-7-jonatan.schlag@ipfire.org> In-Reply-To: <20230523172314.7826-1-jonatan.schlag@ipfire.org> References: <20230523172314.7826-1-jonatan.schlag@ipfire.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: list Errors-To: development-bounces@lists.ipfire.org Sender: "Development" <development-bounces@lists.ipfire.org>
Series	[RFC,01/15] Remove ipsec interface creation from network startup \| [RFC,01/15] Remove ipsec interface creation from network startup [RFC,02/15] Remove Start/Stop links for client175 [RFC,03/15] Use bash as shebang in network initscripts [RFC,04/15] network initscripts: check if the zone in the current config exists [RFC,05/15] network initscripts: Remove code for old zone scheme [RFC,06/15] network scripts: remove check for AUTOCONNECT [RFC,07/15] network startup: Reload routing informations for every interface [RFC,08/15] network startup: Always cleanup before red gets started [RFC,09/15] network startup: check for correct action at start [RFC,10/15] network startup: Refactor how cmd args are processed [RFC,11/15] network startup: Clean up duplicated Code [RFC,12/15] network script: add extra scripts for action that depend on a network [RFC,13/15] network startup: Add scripts for local and uplink [RFC,14/15] network startup: Start local and uplink network independent [RFC,15/15] network startup: Only work with configured zones

Commit Message

Jonatan Schlag May 23, 2023, 5:23 p.m. UTC

  This setting is also old (2007) and cannot be set via the webinterface
anymore. So why checking for something, which can only be true.

Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>
---
 src/initscripts/system/network | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Michael Tremer May 24, 2023, 9 a.m. UTC | #1

True, we no longer support dial-on-demand.

> On 23 May 2023, at 18:23, Jonatan Schlag <jonatan.schlag@ipfire.org> wrote:
> 
> This setting is also old (2007) and cannot be set via the webinterface
> anymore. So why checking for something, which can only be true.
> 
> Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>
> ---
> src/initscripts/system/network | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/src/initscripts/system/network b/src/initscripts/system/network
> index 146b3fda8..6a47456f3 100644
> --- a/src/initscripts/system/network
> +++ b/src/initscripts/system/network
> @@ -63,7 +63,7 @@ case "${DO}" in
> if [ "$red" == "1" ]; then
> # Remove possible leftover files
> rm -f /var/ipfire/red/{active,device,dial-on-demand,dns1,dns2,local-ipaddress,remote-ipaddress,resolv.conf}
> - [ "$AUTOCONNECT" == "off" ] || /etc/rc.d/init.d/networking/red start
> + /etc/rc.d/init.d/networking/red start
> fi
> 
> /etc/rc.d/init.d/static-routes start
> -- 
> 2.30.2
>

diff mbox series

Patch

diff --git a/src/initscripts/system/network b/src/initscripts/system/network
index 146b3fda8..6a47456f3 100644
--- a/src/initscripts/system/network
+++ b/src/initscripts/system/network
@@ -63,7 +63,7 @@  case "${DO}" in
 		if [ "$red" == "1" ]; then
 			# Remove possible leftover files
 			rm -f /var/ipfire/red/{active,device,dial-on-demand,dns1,dns2,local-ipaddress,remote-ipaddress,resolv.conf}
-			[ "$AUTOCONNECT" == "off" ] || /etc/rc.d/init.d/networking/red start
+			/etc/rc.d/init.d/networking/red start
 		fi
 
 		/etc/rc.d/init.d/static-routes start