From df3bded324d3f63a2eb078be7f9797b0d2ecf80c Mon Sep 17 00:00:00 2001
From: Tom Eastep <teastep@shorewall.net>
Date: Wed, 25 Jan 2012 20:41:08 -0800
Subject: [PATCH] Simply getparams as a result of the new lib.cli
 variable-setting

Signed-off-by: Tom Eastep <teastep@shorewall.net>
---
 Shorewall/Perl/getparams | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/Shorewall/Perl/getparams b/Shorewall/Perl/getparams
index 99471fcfc..3c9e7e315 100755
--- a/Shorewall/Perl/getparams
+++ b/Shorewall/Perl/getparams
@@ -28,23 +28,11 @@
 #      $3 = Address family (4 o4 6)
 #
 if [ "$3" = 6 ]; then
-    SHAREDIR=/usr/share/shorewall6
-    CONFDIR=/etc/shorewall6
-    g_product="Shorewall6"
-    g_family=6
-    g_tool=
-    g_basedir=/usr/share/shorewall
+    g_program=shorewall6
 else
     g_program=shorewall
-    SHAREDIR=/usr/share/shorewall
-    CONFDIR=/etc/shorewall
-    g_product="Shorewall"
-    g_family=4
-    g_tool=
-    g_basedir=/usr/share/shorewall
 fi
 
-. /usr/share/shorewall/lib.base
 . /usr/share/shorewall/lib.cli
 
 CONFIG_PATH="$2"