Merge branch '4.5.4'

Shorewall-init/ifupdown.sh

@@ -109,6 +109,8 @@ if [ -f /etc/debian_version ]; then
 	    ;;
     esac
 elif [ -f /etc/SuSE-release ]; then
+    PHASE=''
+
     case $0 in
 	/etc/ppp*)
 	    #
@@ -140,6 +142,8 @@ else
     #
     # Assume RedHat/Fedora/CentOS/Foobar/...
     #
+    PHASE=''
+
     case $0 in
 	/etc/ppp*)
 	    INTERFACE="$1"

Shorewall-init/install.sh

@@ -372,9 +372,9 @@ fi
 
 case $HOST in
     debian)
-	rm -f ${DESTDIR}/etc/network/if-post-down.d/shorewall
 	install_file ifupdown ${DESTDIR}/etc/network/if-up.d/shorewall 0544
 	install_file ifupdown ${DESTDIR}/etc/network/if-down.d/shorewall 0544
+	install_file ifupdown ${DESTDIR}/etc/network/if-post-down.d/shorewall 0544
 	;;
     suse)
 	if [ -z "$RPM" ]; then

Shorewall/Perl/Shorewall/Providers.pm

@@ -1438,7 +1438,7 @@ sub compile_updown() {
 	      q(        COMMAND=enable) ,
 	      q(        detect_configuration),        
 	      q(        enable_provider $1),
-	      q(    else) ,
+	      q(    elif [ "$PHASE" != post-down ]; then # pre-down or not Debian) ,
 	      q(        progress_message3 "Attempting disable on interface $1") ,
 	      q(        COMMAND=disable) ,
 	      q(        detect_configuration),        
@@ -1478,22 +1478,30 @@ sub compile_updown() {
 
 	emit( '        progress_message3 "$g_product attempting $COMMAND"',
 	      '        detect_configuration',
-	      '        define_firewall' );
+	      '        define_firewall',
+	      '    elif [ "$PHASE" != pre-down ]; then # Not Debian pre-down phase'
+	    );
+
+	push_indent;
 
 	if ( $wildcard ) {
-	    emit( '    elif [ "$state" = started ]; then',
+
+	    emit( '    if [ "$state" = started ]; then',
 		  '        progress_message3 "$g_product attempting restart"',
 		  '        COMMAND=restart',
 		  '        detect_configuration',
-		  '        define_firewall' );
+		  '        define_firewall',
+		  '    fi' );
+
 	} else {
-	    emit( '    else',
-		  '        COMMAND=stop',
-		  '        progress_message3 "$g_product attempting stop"',
-		  '        detect_configuration',
-		  '        stop_firewall' );
+	    emit( '    COMMAND=stop',
+		  '    progress_message3 "$g_product attempting stop"',
+		  '    detect_configuration',
+		  '    stop_firewall' );
 	}
 
+	pop_indent;
+
 	emit( '    fi',
 	      '    ;;'
 	    );