diff --git a/Shorewall-core/lib.base b/Shorewall-core/lib.base index 23bd48db7..b28397554 100644 --- a/Shorewall-core/lib.base +++ b/Shorewall-core/lib.base @@ -39,7 +39,6 @@ if [ -z "$g_readrc" ]; then . /usr/share/shorewall/shorewallrc g_sharedir="$SHAREDIR"/$g_program - g_sbindir="$SBINDIR" g_perllib="$PERLLIBDIR" g_confdir="$CONFDIR"/$g_program g_readrc=1 diff --git a/Shorewall-core/lib.cli b/Shorewall-core/lib.cli index 43796cc91..26332dee6 100644 --- a/Shorewall-core/lib.cli +++ b/Shorewall-core/lib.cli @@ -31,7 +31,6 @@ if [ -z "$g_readrc" ]; then . /usr/share/shorewall/shorewallrc g_sharedir="$SHAREDIR"/$g_program - g_sbindir="$SBINDIR" g_perllib="$PERLLIBDIR" g_confdir="$CONFDIR"/$g_program g_readrc=1 @@ -886,14 +885,14 @@ show_command() { echo "CONFIG_PATH=$CONFIG_PATH" echo "VARDIR=$VARDIR" echo "LIBEXEC=${LIBEXECDIR}" - echo "SBINDIR=$g_sbindir" + echo "SBINDIR=${SBINDIR}" echo "CONFDIR=${CONFDIR}" [ -n "$g_lite" ] && [ ${VARDIR} != /var/lib/$g_program ] && echo "LITEDIR=${VARDIR}" else echo "Default CONFIG_PATH is $CONFIG_PATH" echo "Default VARDIR is /var/lib/$g_program" echo "LIBEXEC is ${LIBEXECDIR}" - echo "SBINDIR is $g_sbindir" + echo "SBINDIR is ${SBINDIR}" echo "CONFDIR is ${CONFDIR}" [ -n "$g_lite" ] && [ ${VARDIR} != /var/lib/$g_program ] && echo "LITEDIR is ${VARDIR}" fi diff --git a/Shorewall-lite/shorecap b/Shorewall-lite/shorecap index dc1899078..bf49049d2 100755 --- a/Shorewall-lite/shorecap +++ b/Shorewall-lite/shorecap @@ -54,7 +54,6 @@ g_program=shorewall-lite . /usr/share/shorewall/shorewallrc g_sharedir="$SHAREDIR"/shorewall-lite -g_sbindir="$SBINDIR" g_confdir="$CONFDIR"/shorewall-lite g_readrc=1 diff --git a/Shorewall-lite/shorewall-lite b/Shorewall-lite/shorewall-lite index 28d9f0fcd..95f29fabd 100755 --- a/Shorewall-lite/shorewall-lite +++ b/Shorewall-lite/shorewall-lite @@ -34,7 +34,6 @@ PRODUCT=shorewall-lite g_program=$PRODUCT g_sharedir="$SHAREDIR"/shorewall-lite -g_sbindir="$SBINDIR" g_confdir="$CONFDIR"/shorewall-lite g_readrc=1 diff --git a/Shorewall/Perl/getparams b/Shorewall/Perl/getparams index 6c0f39d05..7a276e037 100755 --- a/Shorewall/Perl/getparams +++ b/Shorewall/Perl/getparams @@ -40,7 +40,6 @@ fi g_program=$PRODUCT g_sharedir="$SHAREDIR/shorewall" -g_sbindir="$SBINDIR" g_perllib="$PERLLIBDIR" g_confdir="$CONFDIR/$PRODUCT" g_readrc=1 diff --git a/Shorewall/shorewall b/Shorewall/shorewall index f06b7d8ea..bbd666eb6 100755 --- a/Shorewall/shorewall +++ b/Shorewall/shorewall @@ -34,7 +34,6 @@ PRODUCT=shorewall g_program=$PRODUCT g_sharedir="$SHAREDIR"/shorewall -g_sbindir="$SBINDIR" g_perllib="$PERLLIBDIR" g_confdir="$CONFDIR"/shorewall g_readrc=1 diff --git a/Shorewall6-lite/shorecap b/Shorewall6-lite/shorecap index 6b3656f57..aec70be6c 100755 --- a/Shorewall6-lite/shorecap +++ b/Shorewall6-lite/shorecap @@ -53,7 +53,6 @@ g_program=shorewall6-lite . /usr/share/shorewall/shorewallrc g_sharedir="$SHAREDIR"/shorewall6-lite -g_sbindir="$SBINDIR" g_confdir="$CONFDIR"/shorewall6-lite g_readrc=1 diff --git a/Shorewall6-lite/shorewall6-lite b/Shorewall6-lite/shorewall6-lite index 5e9bfd895..6ed59526f 100755 --- a/Shorewall6-lite/shorewall6-lite +++ b/Shorewall6-lite/shorewall6-lite @@ -34,7 +34,6 @@ PRODUCT=shorewall6-lite g_program=$PRODUCT g_sharedir="$SHAREDIR"/shorewall6-lite -g_sbindir="$SBINDIR" g_confdir="$CONFDIR"/shorewall6-lite g_readrc=1 diff --git a/Shorewall6/shorewall6 b/Shorewall6/shorewall6 index 7cdd271f5..8f3078661 100755 --- a/Shorewall6/shorewall6 +++ b/Shorewall6/shorewall6 @@ -34,7 +34,6 @@ PRODUCT=shorewall6 g_program=$PRODUCT g_sharedir="$SHAREDIR"/shorewall6 -g_sbindir="$SBINDIR" g_perllib="$PERLLIBDIR" g_confdir="$CONFDIR"/shorewall6 g_readrc=1