From 3ec6185f7279e439f8bd33b9b525ae8777666e51 Mon Sep 17 00:00:00 2001
From: Tom Eastep <teastep@shorewall.net>
Date: Wed, 13 Oct 2010 08:42:35 -0700
Subject: [PATCH] Run update-rc.d on Debian

Signed-off-by: Tom Eastep <teastep@shorewall.net>
---
 Shorewall-init/install.sh  | 7 ++-----
 Shorewall-lite/install.sh  | 2 ++
 Shorewall/changelog.txt    | 2 ++
 Shorewall/install.sh       | 6 +-----
 Shorewall/releasenotes.txt | 3 +++
 Shorewall6-lite/install.sh | 6 +-----
 Shorewall6/install.sh      | 6 +-----
 7 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/Shorewall-init/install.sh b/Shorewall-init/install.sh
index 78f52d422..912936500 100755
--- a/Shorewall-init/install.sh
+++ b/Shorewall-init/install.sh
@@ -285,11 +285,8 @@ fi
 if [ -z "$DESTDIR" ]; then
     if [ -n "$first_install" ]; then
 	if [ -n "$DEBIAN" ]; then
-	    if [ -x /sbin/insserv ]; then
-		insserv /etc/init.d/shorewall-init
-	    else
-		ln -sf ../init.d/shorewall-init /etc/rcS.d/S38shorewall-init
-	    fi
+	    
+	    update-rc.d shorewall-init defaults
 
 	    echo "Shorewall Init will start automatically at boot"
 	else
diff --git a/Shorewall-lite/install.sh b/Shorewall-lite/install.sh
index b1cb2f64c..a22d7c661 100755
--- a/Shorewall-lite/install.sh
+++ b/Shorewall-lite/install.sh
@@ -355,6 +355,8 @@ if [ -z "$DESTDIR" ]; then
 	if [ -n "$DEBIAN" ]; then
 	    run_install $OWNERSHIP -m 0644 default.debian /etc/default/shorewall-lite
 
+	    update-rc.d shorewall-lite defaults
+
 	    if [ -x /sbin/insserv ]; then
 		insserv /etc/init.d/shorewall-lite
 	    else
diff --git a/Shorewall/changelog.txt b/Shorewall/changelog.txt
index 44af3715f..c4f03706c 100644
--- a/Shorewall/changelog.txt
+++ b/Shorewall/changelog.txt
@@ -21,6 +21,8 @@ Changes in Shorewall 4.4.14
 
 10) Change value of FORWARD_CLEAR_MARK in *.conf.
 
+11) Use update-rc.d to install init symlinks.
+
 Changes in Shorewall 4.4.13
 
 1)  Allow zone lists in rules SOURCE and DEST.
diff --git a/Shorewall/install.sh b/Shorewall/install.sh
index 7c305e1e1..bc63e068b 100755
--- a/Shorewall/install.sh
+++ b/Shorewall/install.sh
@@ -887,11 +887,7 @@ if [ -z "$DESTDIR" -a -n "$first_install" -a -z "${CYGWIN}${MAC}" ]; then
     if [ -n "$DEBIAN" ]; then
 	install_file default.debian /etc/default/shorewall 0644
 
-	if [ -x /sbin/insserv ]; then
-	    insserv /etc/init.d/shorewall
-	else
-	    ln -s ../init.d/shorewall /etc/rcS.d/S40shorewall
-	fi
+	update-rc.d shorewall defaults
 
 	echo "shorewall will start automatically at boot"
 	echo "Set startup=1 in /etc/default/shorewall to enable"
diff --git a/Shorewall/releasenotes.txt b/Shorewall/releasenotes.txt
index 1e78ef405..a609dce35 100644
--- a/Shorewall/releasenotes.txt
+++ b/Shorewall/releasenotes.txt
@@ -83,6 +83,9 @@ VI.   PROBLEMS CORRECTED AND NEW FEATURES IN PRIOR RELEASES
     install the sample configurations and FORWARD_CLEAR_MARK will
     default to Yes on systems with MARK support.
 
+10) The install scripts in the tarballs now correctly create init
+    symlinks on recent Ubuntu releases.
+
 ----------------------------------------------------------------------------
            I I.  K N O W N   P R O B L E M S   R E M A I N I N G
 ----------------------------------------------------------------------------
diff --git a/Shorewall6-lite/install.sh b/Shorewall6-lite/install.sh
index 564cc8c52..78e8690db 100755
--- a/Shorewall6-lite/install.sh
+++ b/Shorewall6-lite/install.sh
@@ -351,11 +351,7 @@ if [ -z "$DESTDIR" ]; then
 	if [ -n "$DEBIAN" ]; then
 	    run_install $OWNERSHIP -m 0644 default.debian /etc/default/shorewall6-lite
 
-	    if [ -x /sbin/insserv ]; then
-		insserv /etc/init.d/shorewall6-lite
-	    else
-		ln -s ../init.d/shorewall6-lite /etc/rcS.d/S40shorewall6-lite
-	    fi
+	    update-rc.d shorewall6-lite defaults
 
 	    echo "Shorewall6 Lite will start automatically at boot"
 	else
diff --git a/Shorewall6/install.sh b/Shorewall6/install.sh
index ff31c2410..0b757a23f 100755
--- a/Shorewall6/install.sh
+++ b/Shorewall6/install.sh
@@ -738,11 +738,7 @@ if [ -z "$DESTDIR" -a -n "$first_install" -a -z "${CYGWIN}${MAC}" ]; then
     if [ -n "$DEBIAN" ]; then
 	run_install $OWNERSHIP -m 0644 default.debian /etc/default/shorewall6
 
-	if [ -x /sbin/insserv ]; then
-	    insserv /etc/init.d/shorewall6
-	else
-	    ln -s ../init.d/shorewall6 /etc/rcS.d/S40shorewall6
-	fi
+	update-rc.d shorewall6 defaults
 
 	echo "shorewall6 will start automatically at boot"
 	echo "Set startup=1 in /etc/default/shorewall6 to enable"