From 02006288b0af490e40c9bb388924383d2c06579c Mon Sep 17 00:00:00 2001
From: Tom Eastep <teastep@shorewall.net>
Date: Thu, 31 May 2012 19:15:23 -0700
Subject: [PATCH] Fixes for Shorewall-init

- Enable at boot on debian
- Clear environment for each product
---
 Shorewall-init/ifupdown.sh | 13 ++++++++-----
 Shorewall-init/install.sh  |  2 +-
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/Shorewall-init/ifupdown.sh b/Shorewall-init/ifupdown.sh
index 51ae9012b..4975fd781 100644
--- a/Shorewall-init/ifupdown.sh
+++ b/Shorewall-init/ifupdown.sh
@@ -193,11 +193,14 @@ for PRODUCT in $PRODUCTS; do
     #
     save_vardir=${VARDIR}
     if [ -x $VARDIR/$PRODUCT/firewall ]; then
-	  ( . ${SHAREDIR}/shorewall/lib.base
-	    mutex_on
-	    ${VARDIR}/firewall -V0 $COMMAND $INTERFACE || echo_notdone
-	    mutex_off
-	  )
+	( g_program=$PRODUCT
+	  g_readrc=
+
+	  . ${SHAREDIR}/shorewall/lib.base
+	  mutex_on
+	  ${VARDIR}/firewall -V0 $COMMAND $INTERFACE || echo_notdone
+	  mutex_off
+	)
     fi
     VARDIR=${save_vardir}
 done
diff --git a/Shorewall-init/install.sh b/Shorewall-init/install.sh
index 1b12f0a2f..ecf58dd44 100755
--- a/Shorewall-init/install.sh
+++ b/Shorewall-init/install.sh
@@ -382,7 +382,7 @@ if [ -z "$DESTDIR" ]; then
     if [ -n "$first_install" ]; then
 	if [ $HOST = debian ]; then
 	    
-	    update-rc.d shorewall-init defaults
+	    update-rc.d shorewall-init enable
 
 	    echo "Shorewall Init will start automatically at boot"
 	else