Restore SUBSYSLOCK functionality

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@3550 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb

Shorewall/changelog.txt

@@ -89,3 +89,5 @@ Changes in 3.1.x.
 38)  Remove compile-time running of extension scripts.
 
 39)  Correctly handle interfaces named 'inet'.
+
+40)  SUBSYSLOCK functionality restored.

Shorewall/compiler

@@ -8540,6 +8540,7 @@ __EOF__
     RESTOREFILE="$RESTOREFILE"
     VERSION="$VERSION"
     CONFIG_PATH="$CONFIG_PATH"
+    SUBSYSLOCK="$SUBSYSLOCK"
     TERMINATOR=fatal_error
 
 __EOF__

Shorewall/prog.footer

@@ -62,6 +62,7 @@ case "$COMMAND" in
 	    progress_message3 "Starting Shorewall...."
 	    define_firewall
 	    status=$?
+	    [ $status = 0 -a -n "$SUBSYSLOCK" ] && touch $SUBSYSLOCK
 	    progress_message3 "done."
 	fi
 	;;
@@ -69,6 +70,7 @@ case "$COMMAND" in
 	progress_message3 "Stopping Shorewall...."
 	stop_firewall
 	status=0
+	[ -n "$SUBSYSLOCK" ] && rm -f $SUBSYSLOCK
 	progress_message3 "done."
 	;;
     restart)
@@ -86,11 +88,13 @@ case "$COMMAND" in
     restore)
 	restore_firewall
 	status=$?
+	[ $status = 0 -a -n "$SUBSYSLOCK" ] && touch $SUBSYSLOCK
 	;;
     clear)
 	progress_message3 "Clearing Shorewall...."
 	clear_firewall
 	status=0
+	[ -n "$SUBSYSLOCK" ] && rm -f $SUBSYSLOCK
 	progress_message3 "done."
 	;;
     status)

Shorewall/releasenotes.txt

@@ -32,6 +32,8 @@ Problems Corrected in 3.1.8
 1)  Previously, startup errors occurred if the user had configured a network
     interface named 'inet'.
 
+2)  SUBSYSLOCK functionality has been restored.
+
 Other changes in 3.1.8
 
 1)  The sillyness having to do with running certain extension scripts at