Another fix for init.sh

Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2012-03-26 07:49:49 -07:00
parent 2518c653af
commit fd82877312
4 changed files with 16 additions and 16 deletions

View File

@ -65,7 +65,7 @@ OPTIONS=
if [ ~/.shorewallrc ]; then if [ ~/.shorewallrc ]; then
. ~/.shorewallrc || exit 1 . ~/.shorewallrc || exit 1
else else
SBIN=/sbin SBINDIR=/sbin
SYSCONFDIR=/etc/sysconfig SYSCONFDIR=/etc/sysconfig
fi fi
@ -82,13 +82,13 @@ command="$1"
case "$command" in case "$command" in
start) start)
exec ${SBIN}/shorewall-lite $OPTIONS start $STARTOPTIONS exec ${SBINDIR}/shorewall-lite $OPTIONS start $STARTOPTIONS
;; ;;
restart|reload) restart|reload)
exec ${SBIN}/shorewall-lite $OPTIONS restart $RESTARTOPTIONS exec ${SBINDIR}/shorewall-lite $OPTIONS restart $RESTARTOPTIONS
;; ;;
status|stop) status|stop)
exec ${SBIN}/shorewall-lite $OPTIONS $command $@ exec ${SBINDIR}/shorewall-lite $OPTIONS $command $@
;; ;;
*) *)
usage usage

View File

@ -66,7 +66,7 @@ OPTIONS="-v0"
if [ ~/.shorewallrc ]; then if [ ~/.shorewallrc ]; then
. ~/.shorewallrc || exit 1 . ~/.shorewallrc || exit 1
else else
SBIN=/sbin SBINDIR=/sbin
SYSCONFDIR=/etc/sysconfig SYSCONFDIR=/etc/sysconfig
fi fi
@ -84,13 +84,13 @@ shift
case "$command" in case "$command" in
start) start)
exec $SBIN/shorewall $OPTIONS start $STARTOPTIONS exec $SBINDIR/shorewall $OPTIONS start $STARTOPTIONS
;; ;;
restart|reload) restart|reload)
exec $SBIN/shorewall $OPTIONS restart $RESTARTOPTIONS exec $SBINDIR/shorewall $OPTIONS restart $RESTARTOPTIONS
;; ;;
status|stop) status|stop)
exec $SBIN/shorewall $OPTIONS $command exec $SBINDIR/shorewall $OPTIONS $command
;; ;;
*) *)
usage usage

View File

@ -65,7 +65,7 @@ OPTIONS=
if [ ~/.shorewallrc ]; then if [ ~/.shorewallrc ]; then
. ~/.shorewallrc || exit 1 . ~/.shorewallrc || exit 1
else else
SBIN=/sbin SBINDIR=/sbin
SYSCONFDIR=/etc/sysconfig SYSCONFDIR=/etc/sysconfig
fi fi
@ -82,13 +82,13 @@ command="$1"
case "$command" in case "$command" in
start) start)
exec ${SBIN}/shorewall6-lite $OPTIONS start $STARTOPTIONS exec ${SBINDIR}/shorewall6-lite $OPTIONS start $STARTOPTIONS
;; ;;
restart|reload) restart|reload)
exec ${SBIN}/shorewall6-lite $OPTIONS restart $RESTARTOPTIONS exec ${SBINDIR}/shorewall6-lite $OPTIONS restart $RESTARTOPTIONS
;; ;;
status|stop) status|stop)
exec ${SBIN}/shorewall6-lite $OPTIONS $command $@ exec ${SBINDIR}/shorewall6-lite $OPTIONS $command $@
;; ;;
*) *)
usage usage

View File

@ -66,7 +66,7 @@ OPTIONS="-v0"
if [ ~/.shorewallrc ]; then if [ ~/.shorewallrc ]; then
. ~/.shorewallrc || exit 1 . ~/.shorewallrc || exit 1
else else
SBIN=/sbin SBINDIR=/sbin
SYSCONFDIR=/etc/sysconfig SYSCONFDIR=/etc/sysconfig
fi fi
@ -85,13 +85,13 @@ command="$1"
case "$command" in case "$command" in
start) start)
exec ${SBIN}/shorewall6 $OPTIONS start $STARTOPTIONS exec ${SBINDIR}/shorewall6 $OPTIONS start $STARTOPTIONS
;; ;;
restart|reload) restart|reload)
exec ${SBIN}/shorewall6 $OPTIONS restart $RESTARTOPTIONS exec ${SBINDIR}/shorewall6 $OPTIONS restart $RESTARTOPTIONS
;; ;;
status|stop) status|stop)
exec ${SBIN}/shorewall6 $OPTIONS $command $@ exec ${SBINDIR}/shorewall6 $OPTIONS $command $@
;; ;;
*) *)
usage usage