extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2025-02-09 06:20:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix safe-start and safe-restart adding support for -q as well

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@3093 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2005-11-29 19:39:43 +00:00
parent f8083c5c03
commit 65eeafaba6
3 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Shorewall/changelog.txt
View File

@ -6,6 +6,8 @@ Changes in 3.0.3
3) Applied Tuomo Soini's patch to pretty up the tc4shorewall files. 3) Applied Tuomo Soini's patch to pretty up the tc4shorewall files.
4) Fix 'safe-start' and 'safe'restart' -- add support for -q in the process.
Changes in 3.0.2 Changes in 3.0.2
1) Typos in the Samples corrected. 1) Typos in the Samples corrected.

5
Shorewall/releasenotes.txt
View File

@ -9,11 +9,16 @@ Problems Corrected in 3.0.3
2) Thanks to Tuomo Soini, formatting of the comments in the tcdevices 2) Thanks to Tuomo Soini, formatting of the comments in the tcdevices
and tcclasses files has been cleaned up. and tcclasses files has been cleaned up.
3) Specifying 'trace' on the 'safe-start' and 'safe-restart' command no
longer fails.
New Features in 3.0.3 New Features in 3.0.3
1) A "shorewall show macros" command has been added. This command displays 1) A "shorewall show macros" command has been added. This command displays
a list of the standard macros along with a brief description of each. a list of the standard macros along with a brief description of each.
2) The '-q' option now works with 'safe-start' and 'safe-restart'.
Problems Corrected in 3.0.2 Problems Corrected in 3.0.2
1) A couple of typos in the one-interface sample configuration have 1) A couple of typos in the one-interface sample configuration have

12
Shorewall/shorewall
View File

@ -1288,6 +1288,8 @@ case "$1" in
exit 2 exit 2
fi fi
[ -n "$QUIET" ] && QUIET=-q
mutex_on mutex_on
if shorewall_is_started if shorewall_is_started
@ -1300,7 +1302,7 @@ case "$1" in
if [ "$1" = "safe-start" -a $running -eq 0 ] if [ "$1" = "safe-start" -a $running -eq 0 ]
then then
# the command is safe-start but the firewall is already running # the command is safe-start but the firewall is already running
$0 nolock $debugging start $0 $debugging nolock $QUIET start
ret=$? ret=$?
mutex_off mutex_off
exit 0 exit 0
@ -1318,10 +1320,10 @@ case "$1" in
if [ "$command" = "restart" ] if [ "$command" = "restart" ]
then then
# save previous configuration # save previous configuration
$0 nolock $debugging save "safe-start-restart" $0 $debugging nolock save "safe-start-restart"
fi fi
$0 nolock $debugging $command $0 $debugging nolock $QUIET $command
echo -n "Do you want to accept the new firewall configuration? [y/n] " echo -n "Do you want to accept the new firewall configuration? [y/n] "
read_yesno_with_timeout read_yesno_with_timeout
@ -1336,10 +1338,10 @@ case "$1" in
else else
if [ "$command" = "restart" ] if [ "$command" = "restart" ]
then then
$0 nolock $debugging restore "safe-start-restart" $0 $debugging nolock restore "safe-start-restart"
rm /var/lib/shorewall/safe-start-restart rm /var/lib/shorewall/safe-start-restart
else else
$0 nolock $debugging clear $0 $debugging nolock clear
fi fi
mutex_off mutex_off