From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jonatan Schlag To: development@lists.ipfire.org Subject: [Patch RFC 09/15] network startup: check for correct action at start Date: Tue, 23 May 2023 19:23:09 +0200 Message-ID: <20230523172314.7826-10-jonatan.schlag@ipfire.org> In-Reply-To: <20230523172314.7826-1-jonatan.schlag@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============8725538024710667725==" List-Id: --===============8725538024710667725== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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: /etc/init.d/network green stop This currently ends in an infinite loop, which gets fixed by this change. Signed-off-by: Jonatan Schlag --- src/initscripts/system/network | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) 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/settin= gs) 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 --===============8725538024710667725==--