mirror of
https://gitlab.com/shorewall/code.git
synced 2025-04-11 12:58:21 +02:00
Synchronize global settings
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
parent
a32ce5c34a
commit
1462fcd351
@ -41,6 +41,7 @@ if [ -z "$g_readrc" ]; then
|
|||||||
g_libexec="$LIBEXECDIR"
|
g_libexec="$LIBEXECDIR"
|
||||||
g_sharedir="$SHAREDIR"/$g_program
|
g_sharedir="$SHAREDIR"/$g_program
|
||||||
g_sbindir="$SBINDIR"
|
g_sbindir="$SBINDIR"
|
||||||
|
g_perllib="$PERLLIBDIR"
|
||||||
g_vardir="$VARDIR"
|
g_vardir="$VARDIR"
|
||||||
g_confdir="$CONFDIR"/$g_program
|
g_confdir="$CONFDIR"/$g_program
|
||||||
g_readrc=1
|
g_readrc=1
|
||||||
|
@ -31,9 +31,11 @@ if [ -z "$g_readrc" ]; then
|
|||||||
. /usr/share/shorewall/shorewallrc
|
. /usr/share/shorewall/shorewallrc
|
||||||
|
|
||||||
g_libexec="$LIBEXECDIR"
|
g_libexec="$LIBEXECDIR"
|
||||||
g_sbindir="$SBINDIR"
|
|
||||||
g_confdir="$CONFDIR"/$g_program
|
|
||||||
g_sharedir="$SHAREDIR"/$g_program
|
g_sharedir="$SHAREDIR"/$g_program
|
||||||
|
g_sbindir="$SBINDIR"
|
||||||
|
g_perllib="$PERLLIBDIR"
|
||||||
|
g_vardir="$VARDIR"
|
||||||
|
g_confdir="$CONFDIR"/$g_program
|
||||||
g_readrc=1
|
g_readrc=1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
@ -249,6 +249,12 @@ OWNERSHIP="-o $OWNER -g $GROUP"
|
|||||||
#
|
#
|
||||||
|
|
||||||
if [ $PRODUCT = shorewall -a -z "${DESTDIR}" ]; then
|
if [ $PRODUCT = shorewall -a -z "${DESTDIR}" ]; then
|
||||||
|
#
|
||||||
|
# Fix up 'use Digest::' if SHA is installed
|
||||||
|
#
|
||||||
|
if perl -e 'use Digest::SHA;' 2> /dev/null ; then
|
||||||
|
sed -i 's/Digest::SHA1/Digest::SHA/' Perl/Shorewall/Chains.pm
|
||||||
|
fi
|
||||||
#
|
#
|
||||||
# Verify that Perl is installed
|
# Verify that Perl is installed
|
||||||
#
|
#
|
||||||
|
@ -36,6 +36,7 @@ g_libexec="$LIBEXECDIR"
|
|||||||
g_sharedir="$SHAREDIR"/shorewall
|
g_sharedir="$SHAREDIR"/shorewall
|
||||||
g_sbindir="$SBINDIR"
|
g_sbindir="$SBINDIR"
|
||||||
g_perllib="$PERLLIBDIR"
|
g_perllib="$PERLLIBDIR"
|
||||||
|
g_vardir="$VARDIR"
|
||||||
g_confdir="$CONFDIR"/shorewall
|
g_confdir="$CONFDIR"/shorewall
|
||||||
g_readrc=1
|
g_readrc=1
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user