From 96d833780e4a9da7f7952f1f6ed47ba20ec5df73 Mon Sep 17 00:00:00 2001
From: Tom Eastep <teastep@shorewall.net>
Date: Mon, 9 Sep 2013 06:47:40 -0700
Subject: [PATCH] Apply Thomas D's fix for SYSCONFFILE in Shorewall-init

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

diff --git a/Shorewall-init/install.sh b/Shorewall-init/install.sh
index fd1531f33..1658faa31 100755
--- a/Shorewall-init/install.sh
+++ b/Shorewall-init/install.sh
@@ -377,9 +377,10 @@ else
 	fi
     fi
 
-    if [ -d ${DESTDIR}${SYSCONFDIR} -a ! -f ${DESTDIR}${SYSCONFDIR}/shorewall-init ]; then
-	install_file sysconfig ${DESTDIR}${SYSCONFDIR}/shorewall-init 0644
-    fi
+	if [ -n "$SYSCONFFILE" -a ! -f ${DESTDIR}${SYSCONFDIR}/${PRODUCT} ]; then
+		run_install $OWNERSHIP -m 0644 ${SYSCONFFILE} ${DESTDIR}${SYSCONFDIR}/$PRODUCT
+		echo "$SYSCONFFILE installed in ${DESTDIR}${SYSCONFDIR}/${PRODUCT}"
+	fi
 
     [ $HOST = suse ] && IFUPDOWN=ifupdown.suse.sh || IFUPDOWN=ifupdown.fedora.sh
 fi