From a0ea84a8c6c6968dcaec4c3c181fb9d821f4d74f Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Thu, 4 Mar 2010 14:05:31 -0800 Subject: [PATCH] Make the -lite command line tools compatible with lib.common Signed-off-by: Tom Eastep --- Shorewall-lite/shorewall-lite | 9 +++++++++ Shorewall6-lite/shorewall6-lite | 10 +++++++++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/Shorewall-lite/shorewall-lite b/Shorewall-lite/shorewall-lite index 0d8a09a62..72c48320f 100755 --- a/Shorewall-lite/shorewall-lite +++ b/Shorewall-lite/shorewall-lite @@ -147,6 +147,15 @@ get_config() { g_hostname=$(hostname 2> /dev/null) + IP=$(mywhich ip 2> /dev/null) + if [ -z "$IP" ] ; then + echo " ERROR: Can't find ip executable" >&2 + exit 2 + fi + + IPSET=ipset + TC=tc + } # diff --git a/Shorewall6-lite/shorewall6-lite b/Shorewall6-lite/shorewall6-lite index ae4efea1f..ee039ef5a 100755 --- a/Shorewall6-lite/shorewall6-lite +++ b/Shorewall6-lite/shorewall6-lite @@ -125,7 +125,7 @@ get_config() { else IP6TABLES=$(mywhich ip6tables 2> /dev/null) if [ -z "$IP6TABLES" ] ; then - echo " ERROR: Can't find iptables executable" >&2 + echo " ERROR: Can't find ip6tables executable" >&2 exit 2 fi fi @@ -147,6 +147,14 @@ get_config() { g_hostname=$(hostname 2> /dev/null) + IP=$(mywhich ip 2> /dev/null) + if [ -z "$IP" ] ; then + echo " ERROR: Can't find ip executable" >&2 + exit 2 + fi + + IPSET=ipset + TC=tc } #