From mboxrd@z Thu Jan  1 00:00:00 1970
From: Michael Tremer <michael.tremer@ipfire.org>
To: development@lists.ipfire.org
Subject:
 Re: [Patch RFC 05/15] network initscripts: Remove code for old zone scheme
Date: Wed, 24 May 2023 10:00:07 +0100
Message-ID: <B14E3605-F5F3-4C32-99D3-8D84B7D6BBA3@ipfire.org>
In-Reply-To: <20230523172314.7826-6-jonatan.schlag@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============4519371122726721750=="
List-Id: <development.lists.ipfire.org>

--===============4519371122726721750==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

I believe the intention here was to be more extensible for more zones. This o=
bviously never happened.

So I am happy with dropping the check.

We might only be left with some confusing behaviour if CONFIG_TYPE isn=E2=80=
=99t set at all. But that should break the system anyways.

> On 23 May 2023, at 18:23, Jonatan Schlag <jonatan.schlag(a)ipfire.org> wrot=
e:
>=20
> 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.
>=20
> Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
> ---
> src/initscripts/system/network | 8 +++-----
> 1 file changed, 3 insertions(+), 5 deletions(-)
>=20
> diff --git a/src/initscripts/system/network b/src/initscripts/system/network
> index fda16919d..146b3fda8 100644
> --- a/src/initscripts/system/network
> +++ b/src/initscripts/system/network
> @@ -61,11 +61,9 @@ case "${DO}" in
>=20
> # RED
> if [ "$red" =3D=3D "1" ]; then
> - if [ "$CONFIG_TYPE" =3D "1" -o "$CONFIG_TYPE" =3D "2" -o "$CONFIG_TYPE" =
=3D "3" -o "$CONFIG_TYPE" =3D "4" ]; then
> - # Remove possible leftover files
> - rm -f /var/ipfire/red/{active,device,dial-on-demand,dns1,dns2,local-ipadd=
ress,remote-ipaddress,resolv.conf}
> - [ "$AUTOCONNECT" =3D=3D "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-ipadd=
ress,remote-ipaddress,resolv.conf}
> + [ "$AUTOCONNECT" =3D=3D "off" ] || /etc/rc.d/init.d/networking/red start
> fi
>=20
> /etc/rc.d/init.d/static-routes start
> --=20
> 2.30.2
>=20


--===============4519371122726721750==--