Remove debugging code from Shorewall-init installer

Signed-off-by: Tom Eastep <teastep@shorewall.net>

Shorewall-core/lib.cli

@@ -367,6 +367,17 @@ resolve_arptables() {
     esac
 }
 
+#
+# Try to run the 'savesets' command
+#
+savesets() {
+    local supported
+
+    supported=$(run_it ${VARDIR}/firewall help | fgrep savesets )
+
+    [ -n "$supported" ] && run_it ${VARDIR}/firewall savesets ${g_restorepath}-ipsets
+}
+
 #
 # Save currently running configuration
 #
@@ -428,7 +439,7 @@ do_save() {
 	    ;;
     esac
 
-    if ! run_it ${VARDIR}/firewall savesets ${g_restorepath}-ipsets; then
+    if ! savesets;  then
 	case ${SAVE_IPSETS:=No} in
 	    [Yy]es)
 		case ${IPSET:=ipset} in

Shorewall-init/install.sh

@@ -336,7 +336,7 @@ if [ -n "$SYSTEMD" ]; then
     run_install $OWNERSHIP -m 644 $SERVICEFILE ${DESTDIR}${SYSTEMD}/$PRODUCT.service
     [ ${SBINDIR} != /sbin ] && eval sed -i \'s\|/sbin/\|${SBINDIR}/\|\' ${DESTDIR}${SYSTEMD}/$PRODUCT.service
     echo "Service file $SERVICEFILE installed as ${DESTDIR}${SYSTEMD}/$PRODUCT.service"
-    if [ -n "$DESTDIR" ]; then
+    if [ -n "$DESTDIR" -o $configure -eq 0 ]; then
 	mkdir -p ${DESTDIR}${SBINDIR}
         chmod 755 ${DESTDIR}${SBINDIR}
     fi
@@ -368,8 +368,6 @@ chmod 644 ${DESTDIR}${SHAREDIR}/shorewall-init/version
 #
 # Remove and create the symbolic link to the init script
 #
-echo CONFDIR is $CONFDIR
-
 if [ -z "$DESTDIR" ]; then
     rm -f ${SHAREDIR}/shorewall-init/init
     ln -s ${INITDIR}/${INITFILE} ${SHAREDIR}/shorewall-init/init

Shorewall-init/shorewall-init.service

@@ -5,8 +5,7 @@
 #
 [Unit]
 Description=Shorewall IPv4 firewall (bootup security)
-Before=network-pre.target
+Before=network.target
-Wants=network-pre.target
 Conflicts=iptables.service firewalld.service
 
 [Service]

Shorewall-lite/shorewall-lite.service

@@ -5,7 +5,7 @@
 #
 [Unit]
 Description=Shorewall IPv4 firewall (lite)
-After=network-online.target
+After=network.target
 Conflicts=iptables.service firewalld.service
 
 [Service]

Shorewall/Samples/Universal/interfaces

@@ -11,4 +11,4 @@
 ###############################################################################
 #ZONE	INTERFACE	OPTIONS
 -	lo		ignore
-net	all		dhcp,physical=+,routeback,optional
+net	all		dhcp,physical=+,routeback

Shorewall/helpers

@@ -58,8 +58,12 @@ loadmodule nf_nat_sip
 loadmodule nf_nat_snmp_basic
 loadmodule nf_nat_tftp
 #
-# While not actually helpers, these are handy to have
+# While not actually helpers, these are handy to have. Not
+# all of these will be found on any given system, since
+# some are aliases on later kernels.
 #
+loadmodule ipt_LOG
+loadmodule xt_LOG
 loadmodule xt_NFLOG
-loadmodule xt_ULOG
+loadmodule ipt_ULOG
 loadmodule nfnetlink_log

Shorewall/shorewall.service

@@ -5,7 +5,7 @@
 #
 [Unit]
 Description=Shorewall IPv4 firewall
-After=network-online.target
+After=network.target
 Conflicts=iptables.service firewalld.service
 
 [Service]

Shorewall6-lite/shorewall6-lite.service

@@ -5,7 +5,7 @@
 #
 [Unit]
 Description=Shorewall IPv6 firewall (lite)
-After=network-online.target
+After=network.target
 Conflicts=ip6tables.service firewalld.service
 
 [Service]

Shorewall6/actions.std

@@ -25,6 +25,7 @@ AutoBLL      noinline           # Helper for AutoBL
 Broadcast    noinline      	# Handles Broadcast/Multicast/Anycast
 Drop		        	# Default Action for DROP policy
 dropInvalid  inline		# Drops packets in the INVALID conntrack state
+DropSmurfs   noinline     	# Handles packets with a broadcast source address
 Established  inline		# Handles packets in the ESTABLISHED state
 IfEvent      noinline           # Perform an action based on an event
 Invalid	     inline		# Handles packets in the INVALID conntrack state

Shorewall6/helpers

@@ -35,7 +35,11 @@ loadmodule nf_conntrack_sip
 loadmodule nf_conntrack_tftp
 loadmodule nf_conntrack_sane
 #
-# While not actually helpers, these are handy to have
+# While not actually helpers, these are handy to have. Not
+# all of these will be found on any given system, since
+# some are aliases on later kernels.
 #
+loadmodule ip6t_LOG
+loadmodule xt_LOG
 loadmodule xt_NFLOG
 loadmodule nfnetlink_log

Shorewall6/shorewall6.service

@@ -5,7 +5,7 @@
 #
 [Unit]
 Description=Shorewall IPv6 firewall
-After=network-online.target
+After=network.target
 Conflicts=ip6tables.service firewalld.service
 
 [Service]