Hi,
before the patch (DESTDIR = "/tmp/shorewall-4.6.5"; INITDIR =
"/etc/init.d"),
> [...]
> SysV init script init.gentoo.sh installed in
> /tmp/shorewall-4.6.5//etc/init.d/shorewall-lite
after the patch
> [...]
> SysV init script init.gentoo.sh installed in
> /tmp/shorewall-4.6.5/etc/init.d/shorewall-lite
-Thomas
From e7a192397323bb6cb66d08a6f24e7edfee044f31 Mon Sep 17 00:00:00 2001
From: Thomas D <[email protected]>
Date: Sat, 15 Nov 2014 16:38:05 +0100
Subject: [PATCH] $INITDIR already starts with a "/", so no need for
"$DESTDIR/$INITDIR"
Before the patch (DESTDIR = "/tmp/shorewall-4.6.5"; INITDIR = "/etc/init.d"),
> [...]
> SysV init script init.gentoo.sh installed in
/tmp/shorewall-4.6.5//etc/init.d/shorewall-lite
after the patch
> [...]
> SysV init script init.gentoo.sh installed in
/tmp/shorewall-4.6.5/etc/init.d/shorewall-lite
---
Shorewall-lite/install.sh | 2 +-
Shorewall/install.sh | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Shorewall-lite/install.sh b/Shorewall-lite/install.sh
index 453a84a..0c6d8cc 100755
--- a/Shorewall-lite/install.sh
+++ b/Shorewall-lite/install.sh
@@ -381,7 +381,7 @@ fi
if [ -n "$INITFILE" ]; then
if [ -f "${INITSOURCE}" ]; then
- initfile="${DESTDIR}/${INITDIR}/${INITFILE}"
+ initfile="${DESTDIR}${INITDIR}/${INITFILE}"
install_file ${INITSOURCE} "$initfile" 0544
[ "${SHAREDIR}" = /usr/share ] || eval sed -i
\'s\|/usr/share/\|${SHAREDIR}/\|\' "$initfile"
diff --git a/Shorewall/install.sh b/Shorewall/install.sh
index c1176d6..f3ca8e9 100755
--- a/Shorewall/install.sh
+++ b/Shorewall/install.sh
@@ -396,7 +396,7 @@ echo "$PRODUCT control program installed in
${DESTDIR}${SBINDIR}/$PRODUCT"
#
if [ -n "$INITFILE" ]; then
if [ -f "${INITSOURCE}" ]; then
- initfile="${DESTDIR}/${INITDIR}/${INITFILE}"
+ initfile="${DESTDIR}${INITDIR}/${INITFILE}"
install_file $INITSOURCE "$initfile" 0544
[ "${SHAREDIR}" = /usr/share ] || eval sed -i
\'s\|/usr/share/\|${SHAREDIR}/\|\' "$initfile"
--
2.1.3
------------------------------------------------------------------------------
Comprehensive Server Monitoring with Site24x7.
Monitor 10 servers for $9/Month.
Get alerted through email, SMS, voice calls or mobile push notifications.
Take corrective actions from your mobile device.
http://pubads.g.doubleclick.net/gampad/clk?id=154624111&iu=/4140/ostg.clktrk
_______________________________________________
Shorewall-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/shorewall-devel
