diff mbox series

[RFC,11/15] network startup: Clean up duplicated Code

Message ID	20230523172314.7826-12-jonatan.schlag@ipfire.org
State	Changes Requested
Headers	From: Jonatan Schlag <jonatan.schlag@ipfire.org> To: development@lists.ipfire.org Subject: [Patch RFC 11/15] network startup: Clean up duplicated Code Date: Tue, 23 May 2023 19:23:11 +0200 Message-Id: <20230523172314.7826-12-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 gives us more flexibilty for future changes.

Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>
---
 src/initscripts/system/network | 43 +++++++++++++---------------------
 1 file changed, 16 insertions(+), 27 deletions(-)

Comments

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

???

> On 23 May 2023, at 18:23, Jonatan Schlag <jonatan.schlag@ipfire.org> wrote:
> 
> This gives us more flexibilty for future changes.
> 
> Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>
> ---
> src/initscripts/system/network | 43 +++++++++++++---------------------
> 1 file changed, 16 insertions(+), 27 deletions(-)
> 
> diff --git a/src/initscripts/system/network b/src/initscripts/system/network
> index 008fbbe2b..0db64eaad 100644
> --- a/src/initscripts/system/network
> +++ b/src/initscripts/system/network
> @@ -31,6 +31,13 @@ if ! [[ "${DO}" == "start" ||  "${DO}" == "restart" || "${DO}" == "stop" ]]; the
> exit 1
> fi
> 
> +declare -a VALID_ZONES
> +
> +VALID_ZONES+=("blue")
> +VALID_ZONES+=("green")
> +VALID_ZONES+=("orange")
> +VALID_ZONES+=("red")
> +
> declare -A ZONE_ACTION
> 
> ZONE_ACTION[blue]=false
> @@ -47,7 +54,7 @@ fi
> 
> while [ $# -ne 0 ]; do
> ZONE_VALID=false
> - for i in green red blue orange; do
> + for i in "${VALID_ZONES[@]}"; do
> if [ "${i}" == "${1}" ]; then
> ZONE_ACTION[${i}]=true
> ZONE_VALID=true
> @@ -65,17 +72,9 @@ done
> case "${DO}" in
> start)
> # Starting interfaces...
> - # GREEN
> - ${ZONE_ACTION[green]} && /etc/rc.d/init.d/networking/green start
> -
> - # BLUE
> - ${ZONE_ACTION[blue]} && /etc/rc.d/init.d/networking/blue start
> -
> - # ORANGE
> - ${ZONE_ACTION[orange]} && /etc/rc.d/init.d/networking/orange start
> -
> - # RED
> - ${ZONE_ACTION[red]} && /etc/rc.d/init.d/networking/red start
> + for i in "${VALID_ZONES[@]}"; do
> + ${ZONE_ACTION[${i}]} && /etc/rc.d/init.d/networking/${i} start
> + done
> 
> boot_mesg "Mounting network file systems..."
> mount -a -O _netdev
> @@ -88,26 +87,16 @@ case "${DO}" in
> evaluate_retval
> 
> # Stopping interfaces...
> - # GREEN
> - ${ZONE_ACTION[green]} && /etc/rc.d/init.d/networking/green stop
> -
> - # BLUE
> - ${ZONE_ACTION[blue]} && /etc/rc.d/init.d/networking/blue stop
> -
> - # ORANGE
> - ${ZONE_ACTION[orange]} && /etc/rc.d/init.d/networking/orange stop
> -
> - # RED
> - if ${ZONE_ACTION[red]}; then
> - /etc/rc.d/init.d/networking/red stop
> - fi
> + for i in "${VALID_ZONES[@]}"; do
> + ${ZONE_ACTION[${i}]} && /etc/rc.d/init.d/networking/${i} stop
> + done
> 
> exit 0
> ;;
> 
> restart)
> - for i in green red blue orange; do
> - if {ZONE_ACTION[${i}]}; then
> + for i in "${VALID_ZONES[@]}"; do
> + if ${ZONE_ACTION[${i}]}; then
> ARGS+=" ${i}"
> fi
> done
> -- 
> 2.30.2
>

diff mbox series

Patch

diff --git a/src/initscripts/system/network b/src/initscripts/system/network
index 008fbbe2b..0db64eaad 100644
--- a/src/initscripts/system/network
+++ b/src/initscripts/system/network
@@ -31,6 +31,13 @@  if ! [[ "${DO}" == "start" ||  "${DO}" == "restart" || "${DO}" == "stop" ]]; the
 		exit 1
 fi
 
+declare -a VALID_ZONES
+
+VALID_ZONES+=("blue")
+VALID_ZONES+=("green")
+VALID_ZONES+=("orange")
+VALID_ZONES+=("red")
+
 declare -A ZONE_ACTION
 
 ZONE_ACTION[blue]=false
@@ -47,7 +54,7 @@  fi
 
 while [ $# -ne 0 ]; do
 	ZONE_VALID=false
-	for i in green red blue orange; do
+	for i in "${VALID_ZONES[@]}"; do
 		if [ "${i}" == "${1}" ]; then
 			ZONE_ACTION[${i}]=true
 			ZONE_VALID=true
@@ -65,17 +72,9 @@  done
 case "${DO}" in
 	start)
 		# Starting interfaces...
-		# GREEN
-		${ZONE_ACTION[green]} && /etc/rc.d/init.d/networking/green start
-
-		# BLUE
-		${ZONE_ACTION[blue]} && /etc/rc.d/init.d/networking/blue start
-
-		# ORANGE
-		${ZONE_ACTION[orange]} && /etc/rc.d/init.d/networking/orange start
-
-		# RED
-		${ZONE_ACTION[red]} && /etc/rc.d/init.d/networking/red start
+		for i in "${VALID_ZONES[@]}"; do
+			${ZONE_ACTION[${i}]} && /etc/rc.d/init.d/networking/${i} start
+		done
 
 		boot_mesg "Mounting network file systems..."
 		mount -a -O _netdev
@@ -88,26 +87,16 @@  case "${DO}" in
 		evaluate_retval
 
 		# Stopping interfaces...
-		# GREEN
-		${ZONE_ACTION[green]} && /etc/rc.d/init.d/networking/green stop
-
-		# BLUE
-		${ZONE_ACTION[blue]} && /etc/rc.d/init.d/networking/blue stop
-
-		# ORANGE
-		${ZONE_ACTION[orange]} && /etc/rc.d/init.d/networking/orange stop
-
-		# RED
-		if ${ZONE_ACTION[red]}; then
-			/etc/rc.d/init.d/networking/red stop
-		fi
+		for i in "${VALID_ZONES[@]}"; do
+			${ZONE_ACTION[${i}]} && /etc/rc.d/init.d/networking/${i} stop
+		done
 
 		exit 0
 		;;
 
 	restart)
-		for i in green red blue orange; do
-			if {ZONE_ACTION[${i}]}; then
+		for i in "${VALID_ZONES[@]}"; do
+			if ${ZONE_ACTION[${i}]}; then
 				ARGS+=" ${i}"
 			fi
 		done