From patchwork Tue Aug 29 08:52:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonatan Schlag X-Patchwork-Id: 7127 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 (secp384r1) client-signature ECDSA (secp384r1)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4RZh5n4jT6z3wtG for ; Tue, 29 Aug 2023 08:53:01 +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 (secp384r1) client-signature ECDSA (secp384r1)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4RZh5m6kP6z2jW; Tue, 29 Aug 2023 08:53:00 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4RZh5m6HGTz2ylN; Tue, 29 Aug 2023 08:53:00 +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 4RZh5l1J4Xz2xc7 for ; Tue, 29 Aug 2023 08:52:59 +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 (secp384r1) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4RZh5k6n6wz3cS; Tue, 29 Aug 2023 08:52:58 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1693299179; 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=AMgx6ON5itIieIU3bqdKxa6YHX6HuBUk2OR6gSgdXAA=; b=ZHoi/AOuetJHax5v+h30CDabQNS+50Jk7M7FVZShItJao/642cZAGMqxs1R3eGpswC/LeU xnjQp9sP2lWykADg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1693299179; 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=AMgx6ON5itIieIU3bqdKxa6YHX6HuBUk2OR6gSgdXAA=; b=qm8jNu7Sg+sm+Tlo9OWRObasI0dkPNhduLXC0d+jtBfjf9Ad0oSenjuy0MpdSQ+shqIBQu PbX0Sg2W7CqhTbzpdvb8pfE38G3sz1w9unbBzpK7qoO6mwZsRzdXR5EK5G/ZnjhQYrDuCv NylgbT1YUdK3SFHOdf/dXwS0opT01LMKsgJf2uwdy0j5zB7f+7BFKnYdvfWN0B0UNK79Jk P+haVRYYwu7leG1WL3zG5mekQbON5OUw+qlio3j3n6PxiPTK6tex1V3bSdh8LaOgV8+9kb ZOFNgOscFgVIuJa4fNybz6eL2URmL0MVieNZZVF82EpAZHVfQFW/HojC892OxQ== From: Jonatan Schlag To: development@lists.ipfire.org Subject: [PATCH 3/5] network initscripts: Remove code for old zone scheme Date: Tue, 29 Aug 2023 10:52:39 +0200 Message-Id: <20230829085241.6985-3-jonatan.schlag@ipfire.org> In-Reply-To: <20230829085241.6985-1-jonatan.schlag@ipfire.org> References: <20230829085241.6985-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" A long time ago (2007) there were more config types possible then 1, 2, 3 and 4. As our installer currently only accepts config type out of the set 1, 2, 3 and 4 we do not need to check if our CONFIG_TYPE is in this set. Signed-off-by: Jonatan Schlag --- src/initscripts/system/network | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/initscripts/system/network b/src/initscripts/system/network index 16609175a..ecc007a47 100644 --- a/src/initscripts/system/network +++ b/src/initscripts/system/network @@ -63,11 +63,9 @@ case "${DO}" in # RED if [ "$red" == "1" ]; then - if [ "$CONFIG_TYPE" = "1" -o "$CONFIG_TYPE" = "2" -o "$CONFIG_TYPE" = "3" -o "$CONFIG_TYPE" = "4" ]; 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 - fi + # 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 fi # Create IPsec interfaces