More Shorewall-init fixes

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

Shorewall-init/ifupdown.sh

@@ -106,12 +106,6 @@ if [ -f /etc/debian_version ]; then
 	    else
 		exit 0
 	    fi
-
-	    case "$PHASE" in
-		post-*)
-		    exit 0
-		    ;;
-	    esac
 	    ;;
     esac
 elif [ -f /etc/SuSE-release ]; then

Shorewall/Perl/Shorewall/Providers.pm

@@ -1539,7 +1539,12 @@ sub compile_updown() {
 	}
     }
 
-    emit( "*)",
+    if ( my @plain_interfaces = all_plain_interfaces ) {
+	my $interfaces = join ( '|', map get_physical( $_ ), @plain_interfaces );
+
+	$interfaces =~ s/\+/*/g;
+	
+	emit( "$interfaces)",
 	      '    case $state in',
 	      '        started)',
 	      '            COMMAND=restart',
@@ -1552,6 +1557,7 @@ sub compile_updown() {
 	      '            ;;',
 	      '    esac',
 	    );
+    }
 
     pop_indent;
 

Shorewall/Perl/Shorewall/Zones.pm

@@ -62,6 +62,7 @@ our @EXPORT = qw( NOTHING
 		  validate_interfaces_file
 		  all_interfaces
 		  all_real_interfaces
+		  all_plain_interfaces
 		  all_bridges
 		  interface_number
 		  find_interface
@@ -72,6 +73,7 @@ our @EXPORT = qw( NOTHING
 		  port_to_bridge
 		  source_port_to_bridge
 		  interface_is_optional
+		  interface_is_required
 		  find_interfaces_by_option
 		  find_interfaces_by_option1
 		  get_interface_option
@@ -1417,6 +1419,21 @@ sub interface_is_optional($) {
     $optionsref && $optionsref->{optional};
 }
 
+#
+# Return the 'required' setting of the passed interface
+#
+sub interface_is_required($) {
+    my $optionsref = $interfaces{$_[0]}{options};
+    $optionsref && $optionsref->{required};
+}
+
+#
+# Return a list of real interfaces that are neither 
+#
+sub all_plain_interfaces() {
+    grep ! ( $_ eq '%vserver%' || interface_is_optional($_) || interface_is_required($_) ), @interfaces;
+}
+
 #
 # Returns reference to array of interfaces with the passed option
 #