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

Make install.sh re-runnable

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@6809 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2007-07-08 17:46:38 +00:00
parent d0aac9ff2e
commit 2b9cb739b3
4 changed files with 4 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Shorewall-common/configpath
View File

@ -11,18 +11,3 @@
# from trying to use configuration information from /etc/shorewall.
CONFIG_PATH=${CONFDIR}:/usr/share/shorewall
#
# SHOREWALL LITE'S FIREWALL SCRIPT DIRECTORY
#
# There is lack of agreement about where exactly in the file hierarchy the
# firewall script in Shorewall Lite systems should be stored. To allow
# everyone's opinion to prevail (and to prevent the Shorewall author from
# going crazy), the LITEDIR option allows you to decide where the file will
# be stored on Shorewall Lite systems under your distribution.
#
# a) You *must* set a value for this option
# b) The same value must be configured in
# /usr/share/shorewall-lite/configpath in your Shorewall Lite package.
LITEDIR=/var/lib/shorewall-lite

6
Shorewall-common/install.sh
View File

@ -683,16 +683,14 @@ fi
cd manpages
rm -f *.gz
for f in *.5; do
gzip $f
gzip -c $f > $f.gz
run_install -D -m 0644 $f.gz ${PREFIX}/usr/share/man/man5/$f.gz
echo "Man page $f.gz installed to /usr/share/man/man5/$f.gz"
done
for f in *.8; do
gzip $f
gzip -c $f > $f.gz
run_install -D -m 0644 $f.gz ${PREFIX}/usr/share/man/man8/$f.gz
echo "Man page $f.gz installed to /usr/share/man/man8/$f.gz"
done

2
Shorewall-common/lib.cli
View File

@ -541,7 +541,7 @@ show_command() {
config)
. ${SHAREDIR}/configpath
echo "Default CONFIG_PATH is $CONFIG_PATH"
echo "LITEDIR is $LITEDIR"
[ -n "$LITEDIR" ] && echo "LITEDIR is $LITEDIR"
;;
chain)
shift

2
Shorewall-common/shorewall
View File

@ -1102,7 +1102,7 @@ reload_command() # $* = original arguments less the command.
{
local verbose=$(make_verbose) file= capabilities= finished=0 saveit= result directory system getcaps= root=root compiler=
[ -n "$LITEDIR" ] || fatal_error "ERROR: LITEDIR not defined in ${SHAREDIR}/configpath"
LITEDIR=/var/lib/shorewall-lite
while [ $finished -eq 0 -a $# -gt 0 ]; do
option=$1