1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
|
Description: fix `-x` test in init-script
SRWL is defined as `/sbin/shorewall -6` which causes a syntax error
when the init-script tests it for executability.
Bug-Debian: http://bugs.debian.org/932473
Forwarded: https://gitlab.com/shorewall/code/-/merge_requests/12
Author: Jeremy Sowden <jeremy@azazel.net>
Last-Update: 2023-02-01
Applied-Upstream: https://gitlab.com/shorewall/code/-/commit/b8ef488f64ff37c6923a06bad4168dc2ab7fc634
--- 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="-6 -tvv"
WAIT_FOR_IFUP=/usr/share/shorewall/wait4ifup
test -n ${INITLOG:=/var/log/shorewall6-init.log}
--- 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
--- 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
|
