From 9f535b670d0185fc898ff1b04a533098ffa68cfc Mon Sep 17 00:00:00 2001
From: Tom Eastep <teastep@shorewall.net>
Date: Mon, 17 May 2010 16:26:59 -0700
Subject: [PATCH] Rename the ifupdown script.

Signed-off-by: Tom Eastep <teastep@shorewall.net>
---
 Shorewall-init/{ifupdown.debian.sh => ifupdown.sh} | 0
 Shorewall-init/install.sh                          | 8 ++++----
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename Shorewall-init/{ifupdown.debian.sh => ifupdown.sh} (100%)

diff --git a/Shorewall-init/ifupdown.debian.sh b/Shorewall-init/ifupdown.sh
similarity index 100%
rename from Shorewall-init/ifupdown.debian.sh
rename to Shorewall-init/ifupdown.sh
diff --git a/Shorewall-init/install.sh b/Shorewall-init/install.sh
index a1ed76b0b..6cdd3b55b 100755
--- a/Shorewall-init/install.sh
+++ b/Shorewall-init/install.sh
@@ -210,14 +210,14 @@ fi
 #
 # Install the ifupdown script
 #
-if [ -n "$DEBIAN" ]; then
-    run_install $OWNERSHIP -m 744 ifupdown.debian.sh ${PREFIX}/usr/share/shorewall-init/ifupdown
-else
+run_install $OWNERSHIP -m 744 ifupdown.sh ${PREFIX}/usr/share/shorewall-init/ifupdown
+
+if [ -z "$DEBIAN" ]; then
     if [ -n "$PREFIX" ]; then
 	mkdir -p ${PREFIX}/etc/sysconfig
     fi
 
-    if [ -d ${PREFIX}/etc/sysconfig ]; then
+    if [ -d ${PREFIX}/etc/sysconfig -a ! -f ${PREFIX}/etcsysconfig/shorewall-init ]; then
 	run_install $OWNERSHIP -m 0644 sysconfig /etc/default/shorewall-init
     fi 
 fi