From 66b976a934eaccf7cee664d66fa9e47fa5bda2e5 Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Sat, 21 Jan 2012 05:49:51 -0800 Subject: [PATCH] Eliminate g_base variable Signed-off-by: Tom Eastep --- Shorewall-core/lib.base | 2 -- Shorewall-core/lib.cli | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/Shorewall-core/lib.base b/Shorewall-core/lib.base index 691064631..6974662c5 100644 --- a/Shorewall-core/lib.base +++ b/Shorewall-core/lib.base @@ -56,7 +56,6 @@ case $g_program in CONFDIR=/etc/shorewall-lite g_product="Shorewall Lite" g_family=4 - g_base=shorewall g_tool=iptables g_basedir=/usr/share/shorewall-lite g_lite=Yes @@ -66,7 +65,6 @@ case $g_program in CONFDIR=/etc/shorewall6-lite g_product="Shorewall6 Lite" g_family=6 - g_base=shorewall6 g_tool=ip6tables g_basedir=/usr/share/shorewall6-lite g_lite=Yes diff --git a/Shorewall-core/lib.cli b/Shorewall-core/lib.cli index 790c4cd50..8d46d6e21 100644 --- a/Shorewall-core/lib.cli +++ b/Shorewall-core/lib.cli @@ -2568,7 +2568,7 @@ get_config() { ensure_config_path - config=$(find_file ${g_base}-lite.conf) + config=$(find_file ${g_program.conf) if [ -f $config ]; then if [ -r $config ]; then