From 2e9342aef06d2b5fbb1d480d59991da5989c234b Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Tue, 11 Feb 2014 09:04:18 -0800 Subject: [PATCH] Make the CLI used dependent on the product installed. Signed-off-by: Tom Eastep --- docs/MultiISP.xml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/docs/MultiISP.xml b/docs/MultiISP.xml index e1f6683f5..8d1693265 100644 --- a/docs/MultiISP.xml +++ b/docs/MultiISP.xml @@ -2216,9 +2216,11 @@ AVG_RTT=${13} if [ -f /usr/share/shorewall-lite/lib.base ]; then VARDIR=/var/lib/shorewall-lite STATEDIR=/etc/shorewall-lite + TOOL=/sbin/shorewall-lite else VARDIR=/var/lib/shorewall STATEDIR=/etc/shorewall + TOOL=/sbin/shorewall fi [ -f ${STATEDIR}/vardir ] && . ${STATEDIR}/vardir @@ -2255,9 +2257,9 @@ EOM # [ ${STATE} = up ] && state=0 || state=1 # echo $state > ${VARDIR}/${DEVICE}.status -/sbin/shorewall restart -f >> /var/log/lsm 2>&1 +$TOOL restart -f >> /var/log/lsm 2>&1 -/sbin/shorewall show routing >> /var/log/lsm +$TOOL show routing >> /var/log/lsm exit 0 @@ -2289,9 +2291,11 @@ AVG_RTT=${13} if [ -f /usr/share/shorewall-lite/lib.base ]; then VARDIR=/var/lib/shorewall-lite STATEDIR=/etc/shorewall-lite + TOOL=/sbin/shorewall-lite else VARDIR=/var/lib/shorewall STATEDIR=/etc/shorewall + TOOL=/sbin/shorewall fi [ -f ${STATEDIR}/vardir ] && . ${STATEDIR}/vardir @@ -2331,7 +2335,7 @@ else ${VARDIR}/firewall disable ${DEVICE} fi -/sbin/shorewall show routing >> /var/log/lsm +$TOOL show routing >> /var/log/lsm exit 0