From 84909de8b9eb5f026b21be44237a0097a6312dd8 Mon Sep 17 00:00:00 2001
From: Tom Eastep <teastep@shorewall.net>
Date: Tue, 25 May 2010 16:02:57 -0700
Subject: [PATCH] Fixes for Debian

Signed-off-by: Tom Eastep <teastep@shorewall.net>
---
 Shorewall-init/init.debian.sh | 4 +++-
 Shorewall-init/install.sh     | 6 +++---
 Shorewall/changelog.txt       | 2 ++
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/Shorewall-init/init.debian.sh b/Shorewall-init/init.debian.sh
index 55e76a588..64ead70cc 100755
--- a/Shorewall-init/init.debian.sh
+++ b/Shorewall-init/init.debian.sh
@@ -25,7 +25,7 @@
 #
 ### BEGIN INIT INFO
 # Provides:          shorewall-init
-# Required-Start:
+# Required-Start:    $local_fs
 # Required-Stop:     $network
 # Default-Start:     S
 # Default-Stop:      0 6
@@ -34,6 +34,8 @@
 #                    bringing up the network
 ### END INIT INFO
 
+export VERBOSITY=0
+
 if [ "$(id -u)" != "0" ]
 then
   echo "You must be root to start, stop or restart \"Shorewall \"."
diff --git a/Shorewall-init/install.sh b/Shorewall-init/install.sh
index 3e97eec15..d88e1572d 100755
--- a/Shorewall-init/install.sh
+++ b/Shorewall-init/install.sh
@@ -224,7 +224,7 @@ fi
 if [ -n "$DEBIAN" ]; then
     if [ -n "${PREFIX}" ]; then
 	mkdir -p ${PREFIX}/etc/network/if-up.d/
-	mkdir -p ${PREFIX}/etc/network/if-down.d/
+	mkdir -p ${PREFIX}/etc/network/if-post-down.d/
     fi
 
     if [ ! -f ${PREFIX}/etc/default/shorewall-init ]; then
@@ -266,7 +266,7 @@ fi
 
 if [ -n "$DEBIAN" ]; then
     ln -sf /sbin/shorewall-ifupdown ${PREFIX}/etc/network/if-up.d/shorewall
-    ln -sf /sbin/shorewall-ifupdown ${PREFIX}/etc/network/if-down.d/shorewall
+    ln -sf /sbin/shorewall-ifupdown ${PREFIX}/etc/network/if-post-down.d/shorewall
 elif [ -n "$SUSE" ]; then
     ln -sf /sbin/shorewall-ifupdown ${PREFIX}/etc/sysconfig/network/if-up.d/shorewall
     ln -sf /sbin/shorewall-ifupdown ${PREFIX}/etc/sysconfig/network/if-down.d/shorewall
@@ -282,7 +282,7 @@ fi
 if [ -z "$PREFIX" ]; then
     if [ -n "$first_install" ]; then
 	if [ -n "$DEBIAN" ]; then
-	    ln -sf ../init.d/shorewall-init /etc/rcS.d/S09shorewall-init
+	    ln -sf ../init.d/shorewall-init /etc/rcS.d/S38shorewall-init
 	    echo "Shorewall Init will start automatically at boot"
 	else
 	    if [ -x /sbin/insserv -o -x /usr/sbin/insserv ]; then
diff --git a/Shorewall/changelog.txt b/Shorewall/changelog.txt
index 3037a4d5e..88157e9a6 100644
--- a/Shorewall/changelog.txt
+++ b/Shorewall/changelog.txt
@@ -6,6 +6,8 @@ Changes in Shorewall 4.4.10
 
 3)  Implement Shorewall-init.
 
+4)  Add SAFESTOP option to /etc/default/shorewall*
+
 Changes in Shorewall 4.4.9
 
 1)  Auto-detection of bridges.