Fix typo in firewall script (recalculate_interfacess)

Add PATH assignment to the install script
Correct 'functions' file handling in the install script


git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@288 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2002-10-09 15:05:53 +00:00
parent 02c3bcec6a
commit 9c0ad6d495
3 changed files with 10 additions and 3 deletions

View File

@ -480,7 +480,7 @@ determine_hosts() {
# Zone is defined in terms of hosts -- derive the interface list # Zone is defined in terms of hosts -- derive the interface list
# from the host list # from the host list
# #
recalculate_interfacess recalculate_interface
else else
#################################################################### ####################################################################
# If no hosts are defined for a zone then the zone consists of any # If no hosts are defined for a zone then the zone consists of any

View File

@ -166,6 +166,8 @@ while [ $# -gt 0 ] ; do
shift shift
ARGS="yes" ARGS="yes"
done done
PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/bin:/usr/local/sbin
# #
# Determine where to install the firewall script # Determine where to install the firewall script
@ -282,13 +284,18 @@ fi
# Install the functions file # Install the functions file
# #
if [ -f ${PREFIX}/etc/shorewall/functions ]; then if [ -f ${PREFIX}/etc/shorewall/functions ]; then
backup_file ${PREFIX}/etc/shorewall/functions
rm -f ${PREFIX}/etc/shorewall/functions
fi
if [ -f ${PREFIX}/var/lib/shorewall/functions ]; then
backup_file ${PREFIX}/var/lib/shorewall/functions backup_file ${PREFIX}/var/lib/shorewall/functions
rm -f ${PREFIX}/var/lib/shorewall/functions rm -f ${PREFIX}/var/lib/shorewall/functions
fi fi
install_file_with_backup functions ${PREFIX}/usr/lib/shorewall/functions 0444 install_file_with_backup functions ${PREFIX}/usr/lib/shorewall/functions 0444
echo -e "\nCommon functions installed in ${PREFIX}/var/lib/shorewall/functions" echo -e "\nCommon functions installed in ${PREFIX}/usr/lib/shorewall/functions"
# #
# Install the common.def file # Install the common.def file
# #

View File

@ -3,7 +3,7 @@
# #
# This file determines your network zones. Columns are: # This file determines your network zones. Columns are:
# #
# ZONE Short name of the zone # ZONE Short name of the zone
# DISPLAY Display name of the zone # DISPLAY Display name of the zone
# COMMENTS Comments about the zone # COMMENTS Comments about the zone
# #