From 1a762c20da4af5ecf10ba6a7e04524d9b72452f6 Mon Sep 17 00:00:00 2001
From: Tom Eastep <teastep@shorewall.net>
Date: Sun, 27 Dec 2015 16:35:22 -0800
Subject: [PATCH] Supply sysconfig file for additional distributions

- Also, add OpenWRT support to the Shorewall-init installer

Signed-off-by: Tom Eastep <teastep@shorewall.net>
---
 Shorewall-core/shorewallrc.openwrt            |  2 +-
 Shorewall-init/install.sh                     | 12 +++++++++
 Shorewall-lite/{default.openwrt => sysconfig} |  0
 .../default.openwrt => Shorewall/sysconfig    |  0
 Shorewall6-lite/sysconfig                     | 25 +++++++++++++++++++
 Shorewall6/sysconfig                          | 25 +++++++++++++++++++
 6 files changed, 63 insertions(+), 1 deletion(-)
 rename Shorewall-lite/{default.openwrt => sysconfig} (100%)
 rename Shorewall6-lite/default.openwrt => Shorewall/sysconfig (100%)
 create mode 100644 Shorewall6-lite/sysconfig
 create mode 100644 Shorewall6/sysconfig

diff --git a/Shorewall-core/shorewallrc.openwrt b/Shorewall-core/shorewallrc.openwrt
index 1f227eb62..0cfd3c6f8 100644
--- a/Shorewall-core/shorewallrc.openwrt
+++ b/Shorewall-core/shorewallrc.openwrt
@@ -18,7 +18,7 @@ AUXINITSOURCE=
 AUXINITFILE=
 SERVICEDIR=                             
 SERVICEFILE=                            
-SYSCONFFILE=default.openwrt
+SYSCONFFILE=sysconfig
 SYSCONFDIR=${CONFDIR}/sysconfig
 SPARSE=                                 
 ANNOTATED=                              
diff --git a/Shorewall-init/install.sh b/Shorewall-init/install.sh
index b334b83a1..9acbaa883 100755
--- a/Shorewall-init/install.sh
+++ b/Shorewall-init/install.sh
@@ -230,6 +230,8 @@ if [ -z "$BUILD" ]; then
 		BUILD=slackware
 	    elif [ -f /etc/arch-release ] ; then
 		BUILD=archlinux
+	    elif [ -f ${CONFDIR}/openwrt_release ]; then
+		BUILD=openwrt
 	    else
 		BUILD=linux
 	    fi
@@ -277,6 +279,9 @@ case "$HOST" in
     suse)
 	echo "Installing SuSE-specific configuration..."
 	;;
+    openwrt)
+	echo "Installing OpenWRT-specific configuration..."
+	;;
     linux)
 	echo "ERROR: Shorewall-init is not supported on this system" >&2
 	exit 1
@@ -539,6 +544,13 @@ if [ -z "$DESTDIR" ]; then
 		else
 		    cant_autostart
 		fi
+	    elif [ $HOST = openwrt -a -f ${CONFDIR}/rc.common ]; then
+		/etc/init.d/shorewall-inir enable
+		if /etc/init.d/shorewall-init enabled; then
+		    echo "Shorrewall Init will start automatically at boot"
+		else
+		    cant_autostart
+		fi
 	    else
 		cant_autostart
 	    fi
diff --git a/Shorewall-lite/default.openwrt b/Shorewall-lite/sysconfig
similarity index 100%
rename from Shorewall-lite/default.openwrt
rename to Shorewall-lite/sysconfig
diff --git a/Shorewall6-lite/default.openwrt b/Shorewall/sysconfig
similarity index 100%
rename from Shorewall6-lite/default.openwrt
rename to Shorewall/sysconfig
diff --git a/Shorewall6-lite/sysconfig b/Shorewall6-lite/sysconfig
new file mode 100644
index 000000000..df4440bf9
--- /dev/null
+++ b/Shorewall6-lite/sysconfig
@@ -0,0 +1,25 @@
+# sysV init file script configuration(/etc/sysconfdir/shorewall-lite)
+
+# startup option(default "-vvv")
+OPTIONS=
+
+# change default start run level(if none empty; /etc/init.d/shorewall-lite enable)
+START=50
+
+# change default stop run level(if none empty; /etc/init.d/shorewall-lite enable)
+STOP=
+
+# option to pass when shorewall start is executed
+STARTOPTIONS=
+
+# option to pass when shorewall restart is executed
+RESTARTOPTIONS=
+
+# option to pass when shorewall reload is executed
+RELOADOPTIONS=
+
+# option to pass when shorewall stop is executed
+STOPOPTIONS=
+
+# option to pass when shorewall status is executed
+STATUSOPTIONS=
diff --git a/Shorewall6/sysconfig b/Shorewall6/sysconfig
new file mode 100644
index 000000000..df4440bf9
--- /dev/null
+++ b/Shorewall6/sysconfig
@@ -0,0 +1,25 @@
+# sysV init file script configuration(/etc/sysconfdir/shorewall-lite)
+
+# startup option(default "-vvv")
+OPTIONS=
+
+# change default start run level(if none empty; /etc/init.d/shorewall-lite enable)
+START=50
+
+# change default stop run level(if none empty; /etc/init.d/shorewall-lite enable)
+STOP=
+
+# option to pass when shorewall start is executed
+STARTOPTIONS=
+
+# option to pass when shorewall restart is executed
+RESTARTOPTIONS=
+
+# option to pass when shorewall reload is executed
+RELOADOPTIONS=
+
+# option to pass when shorewall stop is executed
+STOPOPTIONS=
+
+# option to pass when shorewall status is executed
+STATUSOPTIONS=