diff --git a/Shorewall6-lite/shorecap b/Shorewall6-lite/shorecap index 4cefe6265..9a0115939 100755 --- a/Shorewall6-lite/shorecap +++ b/Shorewall6-lite/shorecap @@ -45,17 +45,17 @@ # used during firewall compilation, then the generated firewall program will likewise not # require Shorewall to be installed. -SHAREDIR=/usr/share/shorewall-lite -VARDIR=/var/lib/shorewall-lite -CONFDIR=/etc/shorewall-lite +SHAREDIR=/usr/share/shorewall6-lite +VARDIR=/var/lib/shorewall6-lite +CONFDIR=/etc/shorewall6-lite PRODUCT="Shorewall Lite" -. /usr/share/shorewall-lite/lib.base -. /usr/share/shorewall-lite/configpath +. /usr/share/shorewall6-lite/lib.base +. /usr/share/shorewall6-lite/configpath [ -n "$PATH" ] || PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/bin:/usr/local/sbin -VERSION=$(cat /usr/share/shorewall-lite/version) +VERSION=$(cat /usr/share/shorewall6-lite/version) [ -n "$IPTABLES" ] || IPTABLES=$(mywhich iptables) diff --git a/Shorewall6/lib.base b/Shorewall6/lib.base index 8e846624b..a507c92fa 100644 --- a/Shorewall6/lib.base +++ b/Shorewall6/lib.base @@ -696,8 +696,6 @@ set_state () # $1 = state # Determine which optional facilities are supported by iptables/netfilter # determine_capabilities() { - qt $IP6TABLES -t mangle -L -n && MANGLE_ENABLED=Yes || MANGLE_ENABLED= - CONNTRACK_MATCH= NEW_CONNTRACK_MATCH= OLD_CONNTRACK_MATCH= @@ -747,6 +745,8 @@ determine_capabilities() { exit 1 fi + qt $IP6TABLES -t mangle -L -n && MANGLE_ENABLED=Yes || MANGLE_ENABLED= + qt $IP6TABLES -F $chain qt $IP6TABLES -X $chain if ! $IP6TABLES -N $chain; then