diff --git a/Shorewall-lite/init.fedora.sh b/Shorewall-lite/init.fedora.sh index 13320c886..3d909efb3 100755 --- a/Shorewall-lite/init.fedora.sh +++ b/Shorewall-lite/init.fedora.sh @@ -39,7 +39,7 @@ fi start() { echo -n $"Starting Shorewall: " - $shorewall $OPTIONS start 2>&1 | $logger + $shorewall $OPTIONS start $STARTOPTIONS 2>&1 | $logger retval=${PIPESTATUS[0]} if [[ $retval == 0 ]]; then touch $lockfile @@ -69,7 +69,7 @@ restart() { # Note that we don't simply stop and start since shorewall has a built in # restart which stops the firewall if running and then starts it. echo -n $"Restarting Shorewall: " - $shorewall $OPTIONS restart 2>&1 | $logger + $shorewall $OPTIONS restart $RESTARTOPTIONS 2>&1 | $logger retval=${PIPESTATUS[0]} if [[ $retval == 0 ]]; then touch $lockfile diff --git a/Shorewall-lite/shorewall-lite.service b/Shorewall-lite/shorewall-lite.service index 9073b05bc..42dd729ee 100644 --- a/Shorewall-lite/shorewall-lite.service +++ b/Shorewall-lite/shorewall-lite.service @@ -13,7 +13,7 @@ Type=oneshot RemainAfterExit=yes EnvironmentFile=-/etc/sysconfig/shorewall-lite StandardOutput=syslog -ExecStart=/sbin/shorewall-lite $OPTIONS start +ExecStart=/sbin/shorewall-lite $OPTIONS start $STARTOPTIONS ExecStop=/sbin/shorewall-lite $OPTIONS stop [Install] diff --git a/Shorewall-lite/shorewall-lite.service.214 b/Shorewall-lite/shorewall-lite.service.214 index ac4c5cc3d..76490236a 100644 --- a/Shorewall-lite/shorewall-lite.service.214 +++ b/Shorewall-lite/shorewall-lite.service.214 @@ -13,7 +13,7 @@ Type=oneshot RemainAfterExit=yes EnvironmentFile=-/etc/sysconfig/shorewall-lite StandardOutput=syslog -ExecStart=/sbin/shorewall-lite $OPTIONS start +ExecStart=/sbin/shorewall-lite $OPTIONS start $STARTOPTIONS ExecStop=/sbin/shorewall-lite $OPTIONS stop [Install] diff --git a/Shorewall/init.fedora.sh b/Shorewall/init.fedora.sh index 33b457cdb..9ab64f689 100755 --- a/Shorewall/init.fedora.sh +++ b/Shorewall/init.fedora.sh @@ -39,7 +39,7 @@ fi start() { echo -n $"Starting Shorewall: " - $shorewall $OPTIONS start 2>&1 | $logger + $shorewall $OPTIONS start $STARTOPTIONS 2>&1 | $logger retval=${PIPESTATUS[0]} if [[ $retval == 0 ]]; then touch $lockfile @@ -69,7 +69,7 @@ restart() { # Note that we don't simply stop and start since shorewall has a built in # restart which stops the firewall if running and then starts it. echo -n $"Restarting Shorewall: " - $shorewall $OPTIONS restart 2>&1 | $logger + $shorewall $OPTIONS restart $RESTARTOPTIONS 2>&1 | $logger retval=${PIPESTATUS[0]} if [[ $retval == 0 ]]; then touch $lockfile diff --git a/Shorewall/init.slackware.shorewall.sh b/Shorewall/init.slackware.shorewall.sh index ebbe6da87..bc5e2ef7d 100755 --- a/Shorewall/init.slackware.shorewall.sh +++ b/Shorewall/init.slackware.shorewall.sh @@ -10,15 +10,16 @@ OPTIONS="" -# Use /etc/default shorewall to specify $OPTIONS to run at startup, however this -# this might prevent shorewall from starting. use at your own risk +# Use /etc/default shorewall to specify $OPTIONS and STARTOPTIONS to +# run at startup, however this this might prevent shorewall from +# starting. use at your own risk if [ -f /etc/default/shorewall ] ; then . /etc/default/shorewall fi start() { echo "Starting IPv4 shorewall rules..." - exec /sbin/shorewall $OPTIONS start + exec /sbin/shorewall $OPTIONS start $STARTOPTIONS } stop() { @@ -28,7 +29,7 @@ stop() { restart() { echo "Restarting IPv4 shorewall rules..." - exec /sbin/shorewall restart + exec /sbin/shorewall restart $RESTARTOPTIONS } status() { diff --git a/Shorewall/shorewall.service b/Shorewall/shorewall.service index 7124175cf..41223714e 100644 --- a/Shorewall/shorewall.service +++ b/Shorewall/shorewall.service @@ -13,7 +13,7 @@ Type=oneshot RemainAfterExit=yes EnvironmentFile=-/etc/sysconfig/shorewall StandardOutput=syslog -ExecStart=/sbin/shorewall $OPTIONS start +ExecStart=/sbin/shorewall $OPTIONS start $STARTOPTIONS ExecStop=/sbin/shorewall $OPTIONS stop [Install] diff --git a/Shorewall/shorewall.service.214 b/Shorewall/shorewall.service.214 index 7124175cf..41223714e 100644 --- a/Shorewall/shorewall.service.214 +++ b/Shorewall/shorewall.service.214 @@ -13,7 +13,7 @@ Type=oneshot RemainAfterExit=yes EnvironmentFile=-/etc/sysconfig/shorewall StandardOutput=syslog -ExecStart=/sbin/shorewall $OPTIONS start +ExecStart=/sbin/shorewall $OPTIONS start $STARTOPTIONS ExecStop=/sbin/shorewall $OPTIONS stop [Install] diff --git a/Shorewall6-lite/init.fedora.sh b/Shorewall6-lite/init.fedora.sh index 8a617262f..0ba303a04 100755 --- a/Shorewall6-lite/init.fedora.sh +++ b/Shorewall6-lite/init.fedora.sh @@ -39,7 +39,7 @@ fi start() { echo -n $"Starting Shorewall: " - $shorewall $OPTIONS start 2>&1 | $logger + $shorewall $OPTIONS start $STARTOPTIONS 2>&1 | $logger retval=${PIPESTATUS[0]} if [[ $retval == 0 ]]; then touch $lockfile @@ -69,7 +69,7 @@ restart() { # Note that we don't simply stop and start since shorewall has a built in # restart which stops the firewall if running and then starts it. echo -n $"Restarting Shorewall: " - $shorewall $OPTIONS restart 2>&1 | $logger + $shorewall $OPTIONS restart $RESTARTOPTIONS 2>&1 | $logger retval=${PIPESTATUS[0]} if [[ $retval == 0 ]]; then touch $lockfile diff --git a/Shorewall6/init.fedora.sh b/Shorewall6/init.fedora.sh index afb73d6f0..c19a214fe 100755 --- a/Shorewall6/init.fedora.sh +++ b/Shorewall6/init.fedora.sh @@ -39,7 +39,7 @@ fi start() { echo -n $"Starting Shorewall: " - $shorewall $OPTIONS start 2>&1 | $logger + $shorewall $OPTIONS start $STARTOPTIONS 2>&1 | $logger retval=${PIPESTATUS[0]} if [[ $retval == 0 ]]; then touch $lockfile @@ -69,7 +69,7 @@ restart() { # Note that we don't simply stop and start since shorewall has a built in # restart which stops the firewall if running and then starts it. echo -n $"Restarting Shorewall: " - $shorewall $OPTIONS restart 2>&1 | $logger + $shorewall $OPTIONS restart $RESTARTOPTIONS 2>&1 | $logger retval=${PIPESTATUS[0]} if [[ $retval == 0 ]]; then touch $lockfile diff --git a/Shorewall6/init.slackware.shorewall6.sh b/Shorewall6/init.slackware.shorewall6.sh index d04118ec1..8ea9eeb44 100755 --- a/Shorewall6/init.slackware.shorewall6.sh +++ b/Shorewall6/init.slackware.shorewall6.sh @@ -10,8 +10,9 @@ OPTIONS="" -# Use /etc/default shorewall6 to specify $OPTIONS to run at startup, however this -# this might prevent shorewall6 from starting. use at your own risk +# Use /etc/default shorewall6 to specify $OPTIONS and STARTOPTIONS to +# run at startup, however this this might prevent shorewall6 from +# starting. use at your own risk if [ -f /etc/default/shorewall6 ] ; then . /etc/default/shorewall6 fi @@ -19,7 +20,7 @@ fi start() { echo "Starting IPv6 shorewall rules..." - exec /sbin/shorewall6 $OPTIONS start + exec /sbin/shorewall6 $OPTIONS start $STARTOPTIONS } stop() { @@ -29,7 +30,7 @@ stop() { restart() { echo "Restarting IPv6 shorewall rules..." - exec /sbin/shorewall6 restart + exec /sbin/shorewall6 restart $RESTARTOPTIONS } status() { diff --git a/Shorewall6/shorewall6.service b/Shorewall6/shorewall6.service index 6a4a449a6..0d79c28c3 100644 --- a/Shorewall6/shorewall6.service +++ b/Shorewall6/shorewall6.service @@ -13,7 +13,7 @@ Type=oneshot RemainAfterExit=yes EnvironmentFile=-/etc/sysconfig/shorewall6 StandardOutput=syslog -ExecStart=/sbin/shorewall6 $OPTIONS start +ExecStart=/sbin/shorewall6 $OPTIONS start $STARTOPTIONS ExecStop=/sbin/shorewall6 $OPTIONS stop [Install] diff --git a/Shorewall6/shorewall6.service.214 b/Shorewall6/shorewall6.service.214 index 6a4a449a6..0d79c28c3 100644 --- a/Shorewall6/shorewall6.service.214 +++ b/Shorewall6/shorewall6.service.214 @@ -13,7 +13,7 @@ Type=oneshot RemainAfterExit=yes EnvironmentFile=-/etc/sysconfig/shorewall6 StandardOutput=syslog -ExecStart=/sbin/shorewall6 $OPTIONS start +ExecStart=/sbin/shorewall6 $OPTIONS start $STARTOPTIONS ExecStop=/sbin/shorewall6 $OPTIONS stop [Install]