From b7f2d1b22e42a67f75de475b28ad04d9dca81bf8 Mon Sep 17 00:00:00 2001 From: Jeremy Sowden Date: Sun, 11 Apr 2021 16:12:20 +0100 Subject: [PATCH] Move '-6' and '-l' options from SRWL to SRWL_OPTS in Debian init-scripts. Changing the definitions of SRWL from /sbin/shorewall6 to '/sbin/shorewall -6' and so on broke the init-scripts since the scripts test whether `$SRWL` is executable: test -x $SRWL || exit 0 which now fails: sh: test: /sbin/shorewall: binary operator expected Signed-off-by: Jeremy Sowden --- Shorewall-lite/init.debian.sh | 4 ++-- Shorewall6-lite/init.debian.sh | 4 ++-- Shorewall6/init.debian.sh | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Shorewall-lite/init.debian.sh b/Shorewall-lite/init.debian.sh index b218a6540..59c1559cc 100755 --- a/Shorewall-lite/init.debian.sh +++ b/Shorewall-lite/init.debian.sh @@ -13,8 +13,8 @@ . /lib/lsb/init-functions -SRWL='/sbin/shorewall -l' -SRWL_OPTS="-tvv" +SRWL=/sbin/shorewall +SRWL_OPTS="-ltvv" test -n ${INITLOG:=/var/log/shorewall-lite-init.log} [ "$INITLOG" = "/dev/null" ] && SHOREWALL_INIT_SCRIPT=1 || SHOREWALL_INIT_SCRIPT=0 diff --git a/Shorewall6-lite/init.debian.sh b/Shorewall6-lite/init.debian.sh index 8ca807ca5..f40ae787a 100755 --- a/Shorewall6-lite/init.debian.sh +++ b/Shorewall6-lite/init.debian.sh @@ -13,8 +13,8 @@ . /lib/lsb/init-functions -SRWL='/sbin/shorewall6-lite -6' -SRWL_OPTS="-tvv" +SRWL=/sbin/shorewall +SRWL_OPTS="-6ltvv" test -n ${INITLOG:=/var/log/shorewall6-lite-init.log} [ "$INITLOG" = "/dev/null" ] && SHOREWALL_INIT_SCRIPT=1 || SHOREWALL_INIT_SCRIPT=0 diff --git a/Shorewall6/init.debian.sh b/Shorewall6/init.debian.sh index a9c0a585f..2396dd6ab 100755 --- a/Shorewall6/init.debian.sh +++ b/Shorewall6/init.debian.sh @@ -12,8 +12,8 @@ . /lib/lsb/init-functions -SRWL='/sbin/shorewall -6' -SRWL_OPTS="-tvv" +SRWL=/sbin/shorewall +SRWL_OPTS="-6tvv" WAIT_FOR_IFUP=/usr/share/shorewall/wait4ifup test -n ${INITLOG:=/var/log/shorewall6-init.log}