holm/shorewall_code
1
0
Fork 0
forked from extern/shorewall_code
Code Pull Requests Activity

Correct safe-xxx commands (from 3.4)

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@6577 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2007-06-17 14:16:25 +00:00
parent 47f8eaa970
commit aee6fae91c
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Shorewall-common/diff-3.4-shorewall
View File

@ -1,6 +1,6 @@
--- /home/teastep/shorewall/branches/3.4/Shorewall/shorewall 2007-06-16 08:15:22.000000000 -0700
+++ Shorewall-common/shorewall 2007-06-16 08:37:06.000000000 -0700
@@ -1293,7 +1293,7 @@
--- /home/teastep/shorewall/branches/3.4/Shorewall/shorewall 2007-06-17 07:10:53.000000000 -0700
+++ shorewall 2007-06-17 07:15:13.000000000 -0700
@@ -1297,7 +1297,7 @@
echo " stop"
echo " status"
echo " try [ -C {shell|perl} ] <directory> [ <timeout> ]"
@ -9,7 +9,7 @@
echo " safe-start [ -C {shell|perl} ] [ <directory> ]"
echo " safe-restart [ -C {shell|perl} ] [ <directory> ]"
echo
@@ -1437,6 +1437,10 @@
@@ -1441,6 +1441,10 @@
echo $version
if [ -n "$all" ]; then

8
Shorewall-common/shorewall
View File

@ -323,7 +323,11 @@ compiler() {
[ -n "$DEBUG" ] && debugflags='-wd'
[ -n "$PROFILE" ] && debugflags='-wd:DProf'
shift # Perl compiler only takes the output file as a argument
# Perl compiler only takes the output file as a argument
[ "$1" = debug ] && shift;
[ "$1" = nolock ] && shift;
shift
options="--verbose $VERBOSE ";
[ -n "$EXPORT" ] && options="$options --export ";
@ -884,7 +888,7 @@ safe_commands() {
progress_message3 "Compiling..."
if ! compiler run $debugging nolock ${VARDIR}/.$command; then
if ! compiler run $debugging nolock compile ${VARDIR}/.$command; then
status=$?
[ -n "$nolock" ] || mutex_off
exit $status