shorewall_code/Shorewall-common/diff-3.4-lib.base
2007-06-18 20:22:57 +00:00

28 lines
764 B
Plaintext

--- /home/teastep/shorewall/branches/3.4/Shorewall/lib.base 2007-06-17 14:36:04.000000000 -0700
+++ lib.base 2007-06-18 13:22:05.000000000 -0700
@@ -28,13 +28,13 @@
# and /usr/share/shorewall-lite/shorecap.
#
-SHOREWALL_LIBVERSION=30404
+SHOREWALL_LIBVERSION=40000
SHOREWALL_CAPVERSION=30405
[ -n "${VARDIR:=/var/lib/shorewall}" ]
[ -n "${SHAREDIR:=/usr/share/shorewall}" ]
[ -n "${CONFDIR:=/etc/shorewall}" ]
-SHELLSHAREDIR=/usr/share/shorewall
+SHELLSHAREDIR=/usr/share/shorewall-shell
PERLSHAREDIR=/usr/share/shorewall-perl
#
@@ -360,6 +360,8 @@
eval loaded=\$LIB_${1}_LOADED
if [ -z "$loaded" ]; then
+ [ -f $lib ] || lib=${SHELLSHAREDIR}/lib.$1
+
if [ -f $lib ]; then
progress_message "Loading library $lib..."
. $lib