From 36d4fff7b22051b8dd1009f82d2e8f04308c81bb Mon Sep 17 00:00:00 2001
From: Tom Eastep <teastep@shorewall.net>
Date: Thu, 1 Mar 2012 07:21:17 -0800
Subject: [PATCH] Shorewall-init tweaks

1) Remove root check
2) Fix/add progress messages in the installer.

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

diff --git a/Shorewall-init/install.sh b/Shorewall-init/install.sh
index 1a142bb5e..4e688900d 100755
--- a/Shorewall-init/install.sh
+++ b/Shorewall-init/install.sh
@@ -252,7 +252,7 @@ if [ -n "$INITFILE" ]; then
 	    ;;
     esac
 
-    echo  "$Product script installed in ${DESTDIR}${INITDIR}/${INITFILE}"
+    echo  "Shorewall-init script installed in ${DESTDIR}${INITDIR}/${INITFILE}"
 fi
 #
 # Install the .service file
@@ -265,6 +265,7 @@ if [ -n "$SYSTEMD" ]; then
         chmod 755 ${DESTDIR}/sbin
     fi
     run_install $OWNERSHIP -m 700 shorewall-init ${DESTDIR}/sbin/shorewall-init
+    echo "CLI installed as ${DESTDIR}/sbin/shorewall-init"
 fi
 
 #
diff --git a/Shorewall-init/shorewall-init b/Shorewall-init/shorewall-init
index 1d41dd349..501e3b67d 100644
--- a/Shorewall-init/shorewall-init
+++ b/Shorewall-init/shorewall-init
@@ -23,12 +23,6 @@
 #       Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 #########################################################################################
-if [ "$(id -u)" != "0" ]
-then
-  echo "You must be root to start, stop or restart \"Shorewall \"."
-  exit 1
-fi
-
 # check if shorewall-init is configured or not
 if [ -f "/etc/sysconfig/shorewall-init" ]; then
     . /etc/sysconfig/shorewall-init