From a146360f584abdd0c2658d2e53438cf7a57d9cd8 Mon Sep 17 00:00:00 2001 From: teastep Date: Sun, 24 Dec 2006 00:53:12 +0000 Subject: [PATCH] Revert bad install change git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@5158 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb --- Shorewall-lite/install.sh | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/Shorewall-lite/install.sh b/Shorewall-lite/install.sh index 2a202d247..b1201cde7 100755 --- a/Shorewall-lite/install.sh +++ b/Shorewall-lite/install.sh @@ -187,17 +187,6 @@ DEBIAN= OWNERSHIP="-o $OWNER -g $GROUP" -if [ -d /etc/apt -a -e /usr/bin/dpkg ]; then - DEBIAN=yes -elif [ -f /etc/slackware-version ] ; then - DEST="/etc/rc.d" - INIT="rc.firewall" -elif [ -f /etc/arch-release ] ; then - DEST="/etc/rc.d" - INIT="shorewall-lite" - ARCHLINUX=yes -fi - if [ -n "$PREFIX" ]; then if [ `id -u` != 0 ] ; then echo "Not setting file owner/group permissions, not running as root." @@ -206,6 +195,15 @@ if [ -n "$PREFIX" ]; then install -d $OWNERSHIP -m 755 ${PREFIX}/sbin install -d $OWNERSHIP -m 755 ${PREFIX}${DEST} +elif [ -d /etc/apt -a -e /usr/bin/dpkg ]; then + DEBIAN=yes +elif [ -f /etc/slackware-version ] ; then + DEST="/etc/rc.d" + INIT="rc.firewall" +elif [ -f /etc/arch-release ] ; then + DEST="/etc/rc.d" + INIT="shorewall-lite" + ARCHLINUX=yes fi #