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

Fix LOGFILE (again)

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@6448 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2007-05-28 20:34:48 +00:00
parent 2e2f1e2977
commit 3572b6513a
1 changed files with 28 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
Shorewall-common/shorewall
View File

@ -152,15 +152,17 @@ get_config() {
#
export CONFIG_PATH
[ -z "$LOGFILE" ] && LOGFILE=/var/log/messages
if [ "$2" = Yes ]; then
[ -z "$LOGFILE" ] && LOGFILE=/var/log/messages
if [ -n "$(syslog_circular_buffer)" ]; then
LOGREAD="logread"
elif [ -f $LOGFILE ]; then
LOGREAD="cat $LOGFILE"
else
echo "LOGFILE ($LOGFILE) does not exist!" >&2
exit 2
if [ -n "$(syslog_circular_buffer)" ]; then
LOGREAD="logread"
elif [ -f $LOGFILE ]; then
LOGREAD="cat $LOGFILE"
else
echo "LOGFILE ($LOGFILE) does not exist!" >&2
exit 2
fi
fi
if [ -n "$IPTABLES" ]; then
@ -196,20 +198,22 @@ get_config() {
export RESTOREFILE
case $STARTUP_ENABLED in
No|no|NO)
echo " WARNING: Shorewall startup is disabled. To enable startup, set STARTUP_ENABLED=Yes in ${CONFDIR}/shorewall.conf" >&2
STARTUP_ENABLED=
;;
Yes|yes|YES)
;;
*)
if [ -n "$STARTUP_ENABLED" ]; then
echo " ERROR: Invalid Value for STARTUP_ENABLE: $STARTUP_ENABLED" >&2
if [ "$2" = Yes ]; then
case $STARTUP_ENABLED in
No|no|NO)
echo " ERROR: Shorewall startup is disabled. To enable startup, set STARTUP_ENABLED=Yes in ${CONFDIR}/shorewall.conf" >&2
exit 2
fi
;;
esac
;;
Yes|yes|YES)
;;
*)
if [ -n "$STARTUP_ENABLED" ]; then
echo " ERROR: Invalid Value for STARTUP_ENABLE: $STARTUP_ENABLED" >&2
exit 2
fi
;;
esac
fi
case ${TC_ENABLED:=Internal} in
No|NO|no)
@ -1461,7 +1465,7 @@ COMMAND=$1
case "$COMMAND" in
start)
get_config
get_config No Yes
shift
start_command $@
;;
@ -1477,12 +1481,12 @@ case "$COMMAND" in
compile_command $@
;;
restart)
get_config
get_config No Yes
shift
restart_command $@
;;
refresh)
get_config
get_config No Yes
shift
refresh_command $@
;;