extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2025-01-24 14:39:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

More cleanup

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@3308 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2006-01-17 17:34:34 +00:00
parent 78a9d450bd
commit 51d7faf7c3
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Shorewall/firewall
View File

@ -48,7 +48,7 @@
# not specify "nolock" on the runline. # not specify "nolock" on the runline.
# #
my_mutex_on() { my_mutex_on() {
[ -n "$nolock" ] || { mutex_on; HAVE_MUTEX=Yes; } [ -n "$NOLOCK" ] || { mutex_on; HAVE_MUTEX=Yes; }
} }
my_mutex_off() { my_mutex_off() {
@ -10199,9 +10199,9 @@ usage() {
# #
[ $# -gt 1 ] && [ "$1" = "debug" ] && { set -x ; shift ; } [ $# -gt 1 ] && [ "$1" = "debug" ] && { set -x ; shift ; }
nolock= NOLOCK=
[ $# -gt 1 ] && [ "$1" = "nolock" ] && { nolock=Yes; shift ; } [ $# -gt 1 ] && [ "$1" = "nolock" ] && { NOLOCK=Yes; shift ; }
trap "my_mutex_off; exit 2" 1 2 3 4 5 6 9 trap "my_mutex_off; exit 2" 1 2 3 4 5 6 9

4
Shorewall/shorewall
View File

@ -980,7 +980,7 @@ case "$1" in
[ -n "$nolock" ] || mutex_on [ -n "$nolock" ] || mutex_on
if $SHOREWALL_SHELL $FIREWALL $debugging $nolock compile /var/lib/shorewall/.reload; then if $SHOREWALL_SHELL $FIREWALL $debugging $nolock compile /var/lib/shorewall/.reload; then
$0 nolock $(make_quiet) restore .reload $0 nolock $(make_quiet) restore .reload
fi fi
[ -n "$nolock" ] || mutex_off [ -n "$nolock" ] || mutex_off
@ -1105,7 +1105,7 @@ case "$1" in
if [ -f /var/lib/shorewall/state ]; then if [ -f /var/lib/shorewall/state ]; then
state="$(cat /var/lib/shorewall/state)" state="$(cat /var/lib/shorewall/state)"
case \$state in case $state in
Stopped*|Clear*) Stopped*|Clear*)
status=3 status=3
;; ;;