From patchwork Tue May 23 17:23:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonatan Schlag X-Patchwork-Id: 6913 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4QQh4j6dvwz3wlf for ; Tue, 23 May 2023 17:24:05 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4QQh4h2gsSz9W6; Tue, 23 May 2023 17:24:04 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4QQh4h0XMQz30L6; Tue, 23 May 2023 17:24:04 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4QQh4f5HYqz2yTC for ; Tue, 23 May 2023 17:24:02 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4QQh4f3fCPz1V2; Tue, 23 May 2023 17:24:02 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1684862642; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=GpZay52aJmT6A66LmV1OKZeoyFXUlY2BUpXd+Rh7Y4A=; b=Oa4XZ97q5/zcBQCtFb9IXSqq8KMzQsHF8sS6BD+qVUEw9phxR0184PnO1u4RT4ynp/FwNk fM0YBC6L1CYAUzAQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1684862642; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=GpZay52aJmT6A66LmV1OKZeoyFXUlY2BUpXd+Rh7Y4A=; b=eXLPqZO214V1IkhGPVdgREeRYFbDQiKWxI8OYlzS36wXBeXFIahnDGtoNVfQa0pGWWFBvC 6GeMWNyA9xDUQ24JAfbbMIPUpHxNrpnR8OjVhAXIT8I8o8VevS6qXnKjW4cl+yiwedC5mL i0ctnKlKFFj/Zr9PTb/k1SqI65r8Du12j9zdXoSU25/4T5v9/bDGzUpUTIQRuJxUcW4tw/ jDFqxzhOgAADTJWQHH7AI/mvjrBgOGSbGRAegQVonPUe9m0ByTkVKlpjqdL4qUTb4vRBmK GBZth+xUyh6/X+8XBi4eNhhyU/5fs5HalDorkAgMzyIDlHWU4a+B35aasQSpTg== From: Jonatan Schlag To: development@lists.ipfire.org Subject: [Patch RFC 14/15] network startup: Start local and uplink network independent Date: Tue, 23 May 2023 19:23:14 +0200 Message-Id: <20230523172314.7826-15-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 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" This allows us several things: 1. We can start apache and sshd earlier. This makes debugging and troubleshooting easier. When the startup hangs at red an admin can now at least login and search for what is wrong. 2. We can change the implementation of local and uplink network easier as both are a little bit more independent as before. Fixes: #11502 Signed-off-by: Jonatan Schlag --- config/rootfiles/common/aarch64/initscripts | 27 ++++++++++--------- config/rootfiles/common/riscv64/initscripts | 27 ++++++++++--------- config/rootfiles/common/x86_64/initscripts | 27 ++++++++++--------- lfs/initscripts | 29 ++++++++++++--------- 4 files changed, 61 insertions(+), 49 deletions(-) diff --git a/config/rootfiles/common/aarch64/initscripts b/config/rootfiles/common/aarch64/initscripts index 739503ae6..b3187fb45 100644 --- a/config/rootfiles/common/aarch64/initscripts +++ b/config/rootfiles/common/aarch64/initscripts @@ -110,8 +110,9 @@ etc/rc.d/rc0.d/K77conntrackd etc/rc.d/rc0.d/K78suricata etc/rc.d/rc0.d/K79depends-on-network etc/rc.d/rc0.d/K79leds -etc/rc.d/rc0.d/K80network -etc/rc.d/rc0.d/K82wlanclient +etc/rc.d/rc0.d/K80network-uplink +etc/rc.d/rc0.d/K81wlanclient +etc/rc.d/rc0.d/K82network-local #etc/rc.d/rc0.d/K85messagebus etc/rc.d/rc0.d/K86unbound etc/rc.d/rc0.d/K87acpid @@ -130,14 +131,15 @@ etc/rc.d/rc3.d/S15fireinfo #etc/rc.d/rc3.d/S15messagebus #etc/rc.d/rc3.d/S18cpufreq etc/rc.d/rc3.d/S19smartenabler -etc/rc.d/rc3.d/S19wlanclient -etc/rc.d/rc3.d/S20network -etc/rc.d/rc3.d/S21depends-on-network -etc/rc.d/rc3.d/S21leds -etc/rc.d/rc3.d/S22conntrackd -etc/rc.d/rc3.d/S24cyrus-sasl -etc/rc.d/rc3.d/S30sshd -etc/rc.d/rc3.d/S32apache +etc/rc.d/rc3.d/S20network-local +etc/rc.d/rc3.d/S21sshd +etc/rc.d/rc3.d/S22apache +etc/rc.d/rc3.d/S23wlanclient +etc/rc.d/rc3.d/S24network-uplink +etc/rc.d/rc3.d/S25depends-on-network +etc/rc.d/rc3.d/S25leds +etc/rc.d/rc3.d/S30conntrackd +etc/rc.d/rc3.d/S35cyrus-sasl etc/rc.d/rc3.d/S40fcron #etc/rc.d/rc3.d/S66client175 etc/rc.d/rc3.d/S98rc.local @@ -161,8 +163,9 @@ etc/rc.d/rc6.d/K77conntrackd etc/rc.d/rc6.d/K78suricata etc/rc.d/rc6.d/K79depends-on-network etc/rc.d/rc6.d/K79leds -etc/rc.d/rc6.d/K80network -etc/rc.d/rc6.d/K82wlanclient +etc/rc.d/rc6.d/K80network-uplink +etc/rc.d/rc6.d/K81wlanclient +etc/rc.d/rc6.d/K82network-local #etc/rc.d/rc6.d/K85messagebus etc/rc.d/rc6.d/K86unbound etc/rc.d/rc6.d/K87acpid diff --git a/config/rootfiles/common/riscv64/initscripts b/config/rootfiles/common/riscv64/initscripts index ed1eae904..cbb3f9118 100644 --- a/config/rootfiles/common/riscv64/initscripts +++ b/config/rootfiles/common/riscv64/initscripts @@ -109,8 +109,9 @@ etc/rc.d/rc0.d/K77conntrackd etc/rc.d/rc0.d/K78suricata etc/rc.d/rc0.d/K79depends-on-network etc/rc.d/rc0.d/K79leds -etc/rc.d/rc0.d/K80network -etc/rc.d/rc0.d/K82wlanclient +etc/rc.d/rc0.d/K80network-uplink +etc/rc.d/rc0.d/K81wlanclient +etc/rc.d/rc0.d/K82network-local #etc/rc.d/rc0.d/K85messagebus etc/rc.d/rc0.d/K86unbound etc/rc.d/rc0.d/K87acpid @@ -129,14 +130,15 @@ etc/rc.d/rc3.d/S15fireinfo #etc/rc.d/rc3.d/S15messagebus #etc/rc.d/rc3.d/S18cpufreq etc/rc.d/rc3.d/S19smartenabler -etc/rc.d/rc3.d/S19wlanclient -etc/rc.d/rc3.d/S20network -etc/rc.d/rc3.d/S21depends-on-network -etc/rc.d/rc3.d/S21leds -etc/rc.d/rc3.d/S22conntrackd -etc/rc.d/rc3.d/S24cyrus-sasl -etc/rc.d/rc3.d/S30sshd -etc/rc.d/rc3.d/S32apache +etc/rc.d/rc3.d/S20network-local +etc/rc.d/rc3.d/S21sshd +etc/rc.d/rc3.d/S22apache +etc/rc.d/rc3.d/S23wlanclient +etc/rc.d/rc3.d/S24network-uplink +etc/rc.d/rc3.d/S25depends-on-network +etc/rc.d/rc3.d/S25leds +etc/rc.d/rc3.d/S30conntrackd +etc/rc.d/rc3.d/S35cyrus-sasl etc/rc.d/rc3.d/S40fcron #etc/rc.d/rc3.d/S66client175 etc/rc.d/rc3.d/S98rc.local @@ -160,8 +162,9 @@ etc/rc.d/rc6.d/K77conntrackd etc/rc.d/rc6.d/K78suricata etc/rc.d/rc6.d/K79depends-on-network etc/rc.d/rc6.d/K79leds -etc/rc.d/rc6.d/K80network -etc/rc.d/rc6.d/K82wlanclient +etc/rc.d/rc6.d/K80network-uplink +etc/rc.d/rc6.d/K81wlanclient +etc/rc.d/rc6.d/K82network-local #etc/rc.d/rc6.d/K85messagebus etc/rc.d/rc6.d/K86unbound etc/rc.d/rc6.d/K87acpid diff --git a/config/rootfiles/common/x86_64/initscripts b/config/rootfiles/common/x86_64/initscripts index ed1eae904..cbb3f9118 100644 --- a/config/rootfiles/common/x86_64/initscripts +++ b/config/rootfiles/common/x86_64/initscripts @@ -109,8 +109,9 @@ etc/rc.d/rc0.d/K77conntrackd etc/rc.d/rc0.d/K78suricata etc/rc.d/rc0.d/K79depends-on-network etc/rc.d/rc0.d/K79leds -etc/rc.d/rc0.d/K80network -etc/rc.d/rc0.d/K82wlanclient +etc/rc.d/rc0.d/K80network-uplink +etc/rc.d/rc0.d/K81wlanclient +etc/rc.d/rc0.d/K82network-local #etc/rc.d/rc0.d/K85messagebus etc/rc.d/rc0.d/K86unbound etc/rc.d/rc0.d/K87acpid @@ -129,14 +130,15 @@ etc/rc.d/rc3.d/S15fireinfo #etc/rc.d/rc3.d/S15messagebus #etc/rc.d/rc3.d/S18cpufreq etc/rc.d/rc3.d/S19smartenabler -etc/rc.d/rc3.d/S19wlanclient -etc/rc.d/rc3.d/S20network -etc/rc.d/rc3.d/S21depends-on-network -etc/rc.d/rc3.d/S21leds -etc/rc.d/rc3.d/S22conntrackd -etc/rc.d/rc3.d/S24cyrus-sasl -etc/rc.d/rc3.d/S30sshd -etc/rc.d/rc3.d/S32apache +etc/rc.d/rc3.d/S20network-local +etc/rc.d/rc3.d/S21sshd +etc/rc.d/rc3.d/S22apache +etc/rc.d/rc3.d/S23wlanclient +etc/rc.d/rc3.d/S24network-uplink +etc/rc.d/rc3.d/S25depends-on-network +etc/rc.d/rc3.d/S25leds +etc/rc.d/rc3.d/S30conntrackd +etc/rc.d/rc3.d/S35cyrus-sasl etc/rc.d/rc3.d/S40fcron #etc/rc.d/rc3.d/S66client175 etc/rc.d/rc3.d/S98rc.local @@ -160,8 +162,9 @@ etc/rc.d/rc6.d/K77conntrackd etc/rc.d/rc6.d/K78suricata etc/rc.d/rc6.d/K79depends-on-network etc/rc.d/rc6.d/K79leds -etc/rc.d/rc6.d/K80network -etc/rc.d/rc6.d/K82wlanclient +etc/rc.d/rc6.d/K80network-uplink +etc/rc.d/rc6.d/K81wlanclient +etc/rc.d/rc6.d/K82network-local #etc/rc.d/rc6.d/K85messagebus etc/rc.d/rc6.d/K86unbound etc/rc.d/rc6.d/K87acpid diff --git a/lfs/initscripts b/lfs/initscripts index e8a2e4c6e..711f29632 100644 --- a/lfs/initscripts +++ b/lfs/initscripts @@ -104,9 +104,10 @@ $(TARGET) : ln -sf ../init.d/conntrackd /etc/rc.d/rc0.d/K77conntrackd ln -sf ../init.d/suricata /etc/rc.d/rc0.d/K78suricata ln -sf ../init.d/depends-on-network /etc/rc.d/rc0.d/K79depends-on-network - ln -sf ../init.d/leds /etc/rc.d/rc0.d/K79leds - ln -sf ../init.d/network /etc/rc.d/rc0.d/K80network - ln -sf ../init.d/wlanclient /etc/rc.d/rc0.d/K82wlanclient + ln -sf ../init.d/leds /etc/rc.d/rc0.d/K79leds + ln -sf ../init.d/network-uplink /etc/rc.d/rc0.d/K80network-uplink + ln -sf ../init.d/wlanclient /etc/rc.d/rc0.d/K81wlanclient + ln -sf ../init.d/network-local /etc/rc.d/rc0.d/K82network-local ln -sf ../init.d/messagebus /etc/rc.d/rc0.d/K85messagebus ln -sf ../init.d/unbound /etc/rc.d/rc0.d/K86unbound ln -sf ../init.d/sysklogd /etc/rc.d/rc0.d/K90sysklogd @@ -123,14 +124,15 @@ $(TARGET) : ln -sf ../init.d/messagebus /etc/rc.d/rc3.d/S15messagebus ln -sf ../init.d/cpufreq /etc/rc.d/rc3.d/S18cpufreq ln -sf ../init.d/smartenabler /etc/rc.d/rc3.d/S19smartenabler - ln -sf ../init.d/wlanclient /etc/rc.d/rc3.d/S19wlanclient - ln -sf ../init.d/network /etc/rc.d/rc3.d/S20network - ln -sf ../init.d/depends-on-network /etc/rc.d/rc3.d/S21depends-on-network - ln -sf ../init.d/leds /etc/rc.d/rc3.d/S21leds - ln -sf ../init.d/conntrackd /etc/rc.d/rc3.d/S22conntrackd - ln -sf ../init.d/cyrus-sasl /etc/rc.d/rc3.d/S24cyrus-sasl - ln -sf ../init.d/sshd /etc/rc.d/rc3.d/S30sshd - ln -sf ../init.d/apache /etc/rc.d/rc3.d/S32apache + ln -sf ../init.d/network-local /etc/rc.d/rc3.d/S20network-local + ln -sf ../init.d/sshd /etc/rc.d/rc3.d/S21sshd + ln -sf ../init.d/apache /etc/rc.d/rc3.d/S22apache + ln -sf ../init.d/wlanclient /etc/rc.d/rc3.d/S23wlanclient + ln -sf ../init.d/network-uplink /etc/rc.d/rc3.d/S24network-uplink + ln -sf ../init.d/depends-on-network /etc/rc.d/rc3.d/S25depends-on-network + ln -sf ../init.d/leds /etc/rc.d/rc3.d/S25leds + ln -sf ../init.d/conntrackd /etc/rc.d/rc3.d/S30conntrackd + ln -sf ../init.d/cyrus-sasl /etc/rc.d/rc3.d/S35cyrus-sasl ln -sf ../init.d/fcron /etc/rc.d/rc3.d/S40fcron ln -sf ../../sysconfig/rc.local /etc/rc.d/rc3.d/S98rc.local ln -sf ../init.d/sslh /etc/rc.d/rc3.d/S98sslh @@ -152,8 +154,9 @@ $(TARGET) : ln -sf ../init.d/suricata /etc/rc.d/rc6.d/K78suricata ln -sf ../init.d/depends-on-network /etc/rc.d/rc6.d/K79depends-on-network ln -sf ../init.d/leds /etc/rc.d/rc6.d/K79leds - ln -sf ../init.d/network /etc/rc.d/rc6.d/K80network - ln -sf ../init.d/wlanclient /etc/rc.d/rc6.d/K82wlanclient + ln -sf ../init.d/network-uplink /etc/rc.d/rc6.d/K80network-uplink + ln -sf ../init.d/wlanclient /etc/rc.d/rc6.d/K81wlanclient + ln -sf ../init.d/network-local /etc/rc.d/rc6.d/K82network-local ln -sf ../init.d/messagebus /etc/rc.d/rc6.d/K85messagebus ln -sf ../init.d/unbound /etc/rc.d/rc6.d/K86unbound ln -sf ../init.d/sysklogd /etc/rc.d/rc6.d/K90sysklogd