On 8/18/2013 8:24 AM, Tom Eastep wrote:
> On 8/18/2013 8:11 AM, Thomas D. wrote:
>> Hi,
>>
>> while adding SYSCONFFILE support for Gentoo I noticed that install.sh
>> will always install default.debian.
>>
>> Seems like default.debian is hardcoded in the run_install line, the if
>> statement before and the message after uses the variable.
> 
> run_install line?
> 

Nevermind -- I see what you mean. Patch attached.

-Tom
-- 
Tom Eastep        \ When I die, I want to go like my Grandfather who
Shoreline,         \ died peacefully in his sleep. Not screaming like
Washington, USA     \ all of the passengers in his car
http://shorewall.net \________________________________________________
diff --git a/Shorewall/install.sh b/Shorewall/install.sh
index b9c5895..cb79767 100755
--- a/Shorewall/install.sh
+++ b/Shorewall/install.sh
@@ -1148,7 +1148,7 @@ if [ -n "$SYSCONFFILE" -a ! -f 
${DESTDIR}${SYSCONFDIR}/${PRODUCT} ]; then
        chmod 755 ${DESTDIR}${SYSCONFDIR}
     fi
 
-    run_install $OWNERSHIP -m 0644 default.debian 
${DESTDIR}${SYSCONFDIR}/$PRODUCT
+    run_install $OWNERSHIP -m 0644 ${SYSCONFFILE} 
${DESTDIR}${SYSCONFDIR}/$PRODUCT
     echo "$SYSCONFFILE installed in ${DESTDIR}${SYSCONFDIR}/${PRODUCT}"
 fi
 

Attachment: signature.asc
Description: OpenPGP digital signature

------------------------------------------------------------------------------
Get 100% visibility into Java/.NET code with AppDynamics Lite!
It's a free troubleshooting tool designed for production.
Get down to code-level detail for bottlenecks, with <2% overhead. 
Download for free and get started troubleshooting in minutes. 
http://pubads.g.doubleclick.net/gampad/clk?id=48897031&iu=/4140/ostg.clktrk
_______________________________________________
Shorewall-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/shorewall-devel

Reply via email to