Restore SUBSYSLOCK functionality

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@3550 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2006-02-23 15:50:53 +00:00
parent 2260ea9ffe
commit 3e6eaa38b3
4 changed files with 9 additions and 0 deletions

View File

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

View File

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

View File

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

View File

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