From 0dde75d3450a2962841bb559422b82bb738bc0d9 Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Mon, 19 Apr 2010 13:08:03 -0700 Subject: [PATCH] Fix install scripts (again) Signed-off-by: Tom Eastep --- Shorewall/install.sh | 2 +- Shorewall6/install.sh | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/Shorewall/install.sh b/Shorewall/install.sh index 4683569fd..89456d9db 100755 --- a/Shorewall/install.sh +++ b/Shorewall/install.sh @@ -273,7 +273,7 @@ if [ ! -f ${PREFIX}/etc/shorewall/shorewall.conf ]; then # # Make a Debian-like shorewall.conf # - perl -p -w -i -e 's|^STARTUP_ENABLED=.*|STARTUP_ENABLED=Yes|;' ${PREFIX}/etc/shorewall.conf + perl -p -w -i -e 's|^STARTUP_ENABLED=.*|STARTUP_ENABLED=Yes|;' ${PREFIX}/etc/shorewall/shorewall.conf fi echo "Config file installed as ${PREFIX}/etc/shorewall/shorewall.conf" diff --git a/Shorewall6/install.sh b/Shorewall6/install.sh index 3847f0cfc..64527132e 100755 --- a/Shorewall6/install.sh +++ b/Shorewall6/install.sh @@ -257,10 +257,18 @@ fi run_install $OWNERSHIP -m 0644 shorewall6.conf ${PREFIX}/usr/share/shorewall6/configfiles/shorewall6.conf perl -p -w -i -e 's|^CONFIG_PATH=.*|CONFIG_PATH=/usr/share/shorewall6/configfiles:/usr/share/shorewall6|;' ${PREFIX}/usr/share/shorewall6/configfiles/shorewall6.conf -perl -p -w -i -e 's|^STARTUP_LOG=.*|STARTUP_LOG=/var/log/shorewall6-lite-init.log|;' ${PREFIX}/usr/share/shorewall/configfiles/shorewall.conf +perl -p -w -i -e 's|^STARTUP_LOG=.*|STARTUP_LOG=/var/log/shorewall6-lite-init.log|;' ${PREFIX}/usr/share/shorewall6/configfiles/shorewall6.conf if [ ! -f ${PREFIX}/etc/shorewall6/shorewall6.conf ]; then run_install $OWNERSHIP -m 0644 shorewall6.conf ${PREFIX}/etc/shorewall6/shorewall6.conf + + if [ -n "$DEBIAN" ] && mywhich perl; then + # + # Make a Debian-like shorewall6.conf + # + perl -p -w -i -e 's|^STARTUP_ENABLED=.*|STARTUP_ENABLED=Yes|;' ${PREFIX}/etc/shorewall6/shorewall6.conf + fi + echo "Config file installed as ${PREFIX}/etc/shorewall6/shorewall6.conf" fi