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 09/15] network startup: check for correct action at start
Date: Wed, 24 May 2023 10:00:29 +0100
Message-ID: <CDCD6ACB-7B57-4E7A-B4E1-FC82432CC842@ipfire.org>
In-Reply-To: <20230523172314.7826-10-jonatan.schlag@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============5560508796024751651=="
List-Id: <development.lists.ipfire.org>

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

How can calling =E2=80=9Cexit 1=E2=80=9D result in an infinite loop?

That rather suggests that we are never getting to that part of the code. Shou=
ld we not rather fix this?

Having a catchall at the end of a script is a standard pattern and keeps the =
script easier to extend if new options are being added because you cannot for=
get to add them to the top?

-Michael

> On 23 May 2023, at 18:23, Jonatan Schlag <jonatan.schlag(a)ipfire.org> wrot=
e:
>=20
> If we check this at the end, we already do some calculation in the next
> line. For example checking if the devices are correct. This is not
> necessary as we can already stop when we get an "stoop" or something
> like:
>=20
> /etc/init.d/network green stop
>=20
> This currently ends in an infinite loop, which gets fixed by this
> change.
>=20
> Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
> ---
> src/initscripts/system/network | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>=20
> diff --git a/src/initscripts/system/network b/src/initscripts/system/network
> index 9694165f2..06240f53c 100644
> --- a/src/initscripts/system/network
> +++ b/src/initscripts/system/network
> @@ -26,6 +26,11 @@ eval $(/usr/local/bin/readhash /var/ipfire/ethernet/sett=
ings)
> DO=3D"${1}"
> shift
>=20
> +if ! [[ "${DO}" =3D=3D "start" ||  "${DO}" =3D=3D "restart" || "${DO}" =3D=
=3D "stop" ]]; then
> + echo "Usage: ${0} {start|stop|restart} [device(s)]"
> + exit 1
> +fi
> +
> if [ -n "${1}" ]; then
> ALL=3D0
> for i in green red blue orange; do
> @@ -100,9 +105,4 @@ case "${DO}" in
> sleep 1
> ${0} start ${ARGS}
> ;;
> -
> - *)
> - echo "Usage: ${0} {start|stop|restart} [device(s)]"
> - exit 1
> - ;;
> esac
> --=20
> 2.30.2
>=20


--===============5560508796024751651==--