From: Jonatan Schlag <jonatan.schlag@ipfire.org>
To: development@lists.ipfire.org
Subject: [Patch RFC 13/15] network startup: Add scripts for local and uplink
Date: Tue, 23 May 2023 19:23:13 +0200 [thread overview]
Message-ID: <20230523172314.7826-14-jonatan.schlag@ipfire.org> (raw)
In-Reply-To: <20230523172314.7826-1-jonatan.schlag@ipfire.org>
[-- Attachment #1: Type: text/plain, Size: 3693 bytes --]
This allows us to start the local and uplink network independent of each
other. The function of /etc/init.d/network remains unchangend to
maintain backwards compatibility.
Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
---
config/rootfiles/common/aarch64/initscripts | 2 ++
config/rootfiles/common/riscv64/initscripts | 2 ++
config/rootfiles/common/x86_64/initscripts | 2 ++
lfs/initscripts | 3 +++
src/initscripts/system/network | 22 ++++++++++++---------
5 files changed, 22 insertions(+), 9 deletions(-)
diff --git a/config/rootfiles/common/aarch64/initscripts b/config/rootfiles/common/aarch64/initscripts
index 506f616e6..739503ae6 100644
--- a/config/rootfiles/common/aarch64/initscripts
+++ b/config/rootfiles/common/aarch64/initscripts
@@ -36,6 +36,8 @@ etc/rc.d/init.d/mountfs
etc/rc.d/init.d/mountkernfs
etc/rc.d/init.d/mounttmpfs
etc/rc.d/init.d/network
+etc/rc.d/init.d/network-local
+etc/rc.d/init.d/network-uplink
#etc/rc.d/init.d/networking
etc/rc.d/init.d/networking/any
etc/rc.d/init.d/networking/blue
diff --git a/config/rootfiles/common/riscv64/initscripts b/config/rootfiles/common/riscv64/initscripts
index e834cbfc3..ed1eae904 100644
--- a/config/rootfiles/common/riscv64/initscripts
+++ b/config/rootfiles/common/riscv64/initscripts
@@ -36,6 +36,8 @@ etc/rc.d/init.d/mountfs
etc/rc.d/init.d/mountkernfs
etc/rc.d/init.d/mounttmpfs
etc/rc.d/init.d/network
+etc/rc.d/init.d/network-local
+etc/rc.d/init.d/network-uplink
#etc/rc.d/init.d/networking
etc/rc.d/init.d/networking/any
etc/rc.d/init.d/networking/blue
diff --git a/config/rootfiles/common/x86_64/initscripts b/config/rootfiles/common/x86_64/initscripts
index e834cbfc3..ed1eae904 100644
--- a/config/rootfiles/common/x86_64/initscripts
+++ b/config/rootfiles/common/x86_64/initscripts
@@ -36,6 +36,8 @@ etc/rc.d/init.d/mountfs
etc/rc.d/init.d/mountkernfs
etc/rc.d/init.d/mounttmpfs
etc/rc.d/init.d/network
+etc/rc.d/init.d/network-local
+etc/rc.d/init.d/network-uplink
#etc/rc.d/init.d/networking
etc/rc.d/init.d/networking/any
etc/rc.d/init.d/networking/blue
diff --git a/lfs/initscripts b/lfs/initscripts
index 263292da9..e8a2e4c6e 100644
--- a/lfs/initscripts
+++ b/lfs/initscripts
@@ -193,6 +193,9 @@ $(TARGET) :
ln -sf any /etc/rc.d/init.d/networking/$$i; \
done
+ ln -sf /etc/rc.d/init.d/network /etc/rc.d/init.d/network-local
+ ln -sf /etc/rc.d/init.d/networking/red /etc/rc.d/init.d/network-uplink
+
# intel intel no swconfig
ifeq "$(BUILD_PLATFORM)" "arm"
ln -sf ../init.d/swconfig /etc/rc.d/rcsysinit.d/S73swconfig
diff --git a/src/initscripts/system/network b/src/initscripts/system/network
index e3fe47597..ff305e472 100644
--- a/src/initscripts/system/network
+++ b/src/initscripts/system/network
@@ -36,20 +36,24 @@ declare -a VALID_ZONES
VALID_ZONES+=("blue")
VALID_ZONES+=("green")
VALID_ZONES+=("orange")
-VALID_ZONES+=("red")
+
+# If we are called as /etc/init.d/network also red is a valid zone.
+# Otherwise we are called as /etc/init.d/network-local where red
+# is invalid.
+if [[ "$(basename $0)" == "network" ]]; then
+ VALID_ZONES+=("red")
+fi
declare -A ZONE_ACTION
-ZONE_ACTION[blue]=false
-ZONE_ACTION[green]=false
-ZONE_ACTION[orange]=false
-ZONE_ACTION[red]=false
+for i in "${VALID_ZONES[@]}"; do
+ ZONE_ACTION[${i}]=false
+done
if [ $# -eq 0 ]; then
- ZONE_ACTION[blue]=true
- ZONE_ACTION[green]=true
- ZONE_ACTION[orange]=true
- ZONE_ACTION[red]=true
+ for i in "${VALID_ZONES[@]}"; do
+ ZONE_ACTION[${i}]=true
+ done
fi
while [ $# -ne 0 ]; do
--
2.30.2
next prev parent reply other threads:[~2023-05-23 17:23 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-23 17:23 Start local and uplink network independent Jonatan Schlag
2023-05-23 17:23 ` [Patch RFC 01/15] Remove ipsec interface creation from network startup Jonatan Schlag
2023-05-24 8:59 ` Michael Tremer
2023-05-23 17:23 ` [Patch RFC 02/15] Remove Start/Stop links for client175 Jonatan Schlag
2023-05-23 17:23 ` [Patch RFC 03/15] Use bash as shebang in network initscripts Jonatan Schlag
2023-05-24 8:59 ` Michael Tremer
2023-05-23 17:23 ` [Patch RFC 04/15] network initscripts: check if the zone in the current config exists Jonatan Schlag
2023-05-24 9:00 ` Michael Tremer
2023-08-18 12:55 ` Jonatan Schlag
2023-08-21 9:40 ` Michael Tremer
2023-05-23 17:23 ` [Patch RFC 05/15] network initscripts: Remove code for old zone scheme Jonatan Schlag
2023-05-24 9:00 ` Michael Tremer
2023-05-23 17:23 ` [Patch RFC 06/15] network scripts: remove check for AUTOCONNECT Jonatan Schlag
2023-05-24 9:00 ` Michael Tremer
2023-05-23 17:23 ` [Patch RFC 07/15] network startup: Reload routing informations for every interface Jonatan Schlag
2023-05-24 9:00 ` Michael Tremer
2023-05-23 17:23 ` [Patch RFC 08/15] network startup: Always cleanup before red gets started Jonatan Schlag
2023-05-24 9:00 ` Michael Tremer
2023-05-23 17:23 ` [Patch RFC 09/15] network startup: check for correct action at start Jonatan Schlag
2023-05-24 9:00 ` Michael Tremer
2023-08-18 10:23 ` Jonatan Schlag
2023-05-23 17:23 ` [Patch RFC 10/15] network startup: Refactor how cmd args are processed Jonatan Schlag
2023-05-24 9:00 ` Michael Tremer
2023-05-23 17:23 ` [Patch RFC 11/15] network startup: Clean up duplicated Code Jonatan Schlag
2023-05-24 9:00 ` Michael Tremer
2023-05-23 17:23 ` [Patch RFC 12/15] network script: add extra scripts for action that depend on a network Jonatan Schlag
2023-05-24 9:00 ` Michael Tremer
2023-05-23 17:23 ` Jonatan Schlag [this message]
2023-05-24 9:00 ` [Patch RFC 13/15] network startup: Add scripts for local and uplink Michael Tremer
2023-05-23 17:23 ` [Patch RFC 14/15] network startup: Start local and uplink network independent Jonatan Schlag
2023-05-24 9:00 ` Michael Tremer
2023-05-23 17:23 ` [Patch RFC 15/15] network startup: Only work with configured zones Jonatan Schlag
2023-05-24 9:00 ` Michael Tremer
2023-05-24 8:59 ` Start local and uplink network independent Michael Tremer
2023-08-18 10:30 ` Jonatan Schlag
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230523172314.7826-14-jonatan.schlag@ipfire.org \
--to=jonatan.schlag@ipfire.org \
--cc=development@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox