Split lib.base into lib.base and lib.common

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@4532 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2006-09-06 23:07:29 +00:00
parent c94783ba2d
commit 09fa92af5b
5 changed files with 1704 additions and 1677 deletions

View File

@ -5325,16 +5325,18 @@ SHAREDIR=/usr/share/shorewall
VARDIR=/var/lib/shorewall
[ -z "$EXPORT" ] && CONFDIR=/etc/shorewall || CONFDIR=${SHAREDIR}/configfiles
FUNCTIONS=${SHAREDIR}/lib.base
[ -n "${VERBOSE:=2}" ]
if [ -f $FUNCTIONS ]; then
[ $VERBOSE -ge 2 ] && echo "Loading $FUNCTIONS..."
. $FUNCTIONS
else
fatal_error "$FUNCTIONS does not exist!"
fi
for library in lib.base lib.common; do
FUNCTIONS=${SHAREDIR}/${library}
if [ -f $FUNCTIONS ]; then
[ $VERBOSE -ge 2 ] && echo "Loading $FUNCTIONS..."
. $FUNCTIONS
else
fatal_error "$FUNCTIONS does not exist!"
fi
done
PROGRAM=compiler

View File

@ -545,14 +545,16 @@ SHAREDIR=/usr/share/shorewall
VARDIR=/var/lib/shorewall
CONFDIR=/etc/shorewall
FUNCTIONS=${SHAREDIR}/lib.base
for library in lib.base lib.common; do
FUNCTIONS=${SHAREDIR}/${library}
if [ -f $FUNCTIONS ]; then
[ $VERBOSE -ge 2 ] && echo "Loading $FUNCTIONS..."
. $FUNCTIONS
else
startup_error "$FUNCTIONS does not exist!"
fi
if [ -f $FUNCTIONS ]; then
[ $VERBOSE -ge 2 ] && echo "Loading $FUNCTIONS..."
. $FUNCTIONS
else
fatal_error "$FUNCTIONS does not exist!"
fi
done
PROGRAM=firewall

File diff suppressed because it is too large Load Diff

1628
Shorewall/lib.common Normal file

File diff suppressed because it is too large Load Diff

View File

@ -115,6 +115,7 @@ fi
%attr(0444,root,root) /usr/share/shorewall/lib.accounting
%attr(0444,root,root) /usr/share/shorewall/lib.actions
%attr(0444,root,root) /usr/share/shorewall/lib.base
%attr(0444,root,root) /usr/share/shorewall/lib.common
%attr(0444,root,root) /usr/share/shorewall/lib.dynamiczones
%attr(0444,root,root) /usr/share/shorewall/lib.maclist
%attr(0444,root,root) /usr/share/shorewall/lib.nat