From 691a9bf793331eae0ae3392c235125f5ddb71b27 Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Sat, 14 Jul 2012 14:38:30 -0700 Subject: [PATCH] Correct installation on systems with systemd Signed-off-by: Tom Eastep --- Shorewall-init/install.sh | 2 +- Shorewall-lite/install.sh | 2 +- Shorewall/install.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Shorewall-init/install.sh b/Shorewall-init/install.sh index 2ccb74894..69387aa32 100755 --- a/Shorewall-init/install.sh +++ b/Shorewall-init/install.sh @@ -401,7 +401,7 @@ if [ -z "$DESTDIR" ]; then echo "Shorewall Init will start automatically at boot" else if [ -n "$SYSTEMD" ]; then - if systemctl enable shorewall-init; then + if systemctl enable shorewall-init.service; then echo "Shorewall Init will start automatically at boot" fi elif [ -x ${SBINDIR}/insserv -o -x /usr${SBINDIR}/insserv ]; then diff --git a/Shorewall-lite/install.sh b/Shorewall-lite/install.sh index e3a9ec2a5..e973bf19b 100755 --- a/Shorewall-lite/install.sh +++ b/Shorewall-lite/install.sh @@ -499,7 +499,7 @@ if [ -z "$DESTDIR" -a -n "$first_install" -a -z "${cygwin}${mac}" ]; then perl -p -w -i -e 's/^STARTUP_ENABLED=No/STARTUP_ENABLED=Yes/;s/^IP_FORWARDING=On/IP_FORWARDING=Keep/;s/^SUBSYSLOCK=.*/SUBSYSLOCK=/;' ${CONFDIR}/${PRODUCT}/${PRODUCT}.conf update-rc.d $PRODUCT enable defaults elif [ -n "$SYSTEMD" ]; then - if systemctl enable $PRODUCT; then + if systemctl enable ${PRODUCT}.service; then echo "$Product will start automatically at boot" fi elif mywhich insserv; then diff --git a/Shorewall/install.sh b/Shorewall/install.sh index 7ea52a82c..292a4b799 100755 --- a/Shorewall/install.sh +++ b/Shorewall/install.sh @@ -1131,7 +1131,7 @@ if [ -z "$DESTDIR" -a -n "$first_install" -a -z "${cygwin}${mac}" ]; then perl -p -w -i -e 's/^STARTUP_ENABLED=No/STARTUP_ENABLED=Yes/;s/^IP_FORWARDING=On/IP_FORWARDING=Keep/;s/^SUBSYSLOCK=.*/SUBSYSLOCK=/;' ${CONFDIR}/$PRODUCT/$PRODUCT.conf update-rc.d $PRODUCT enable elif [ -n "$SYSTEMD" ]; then - if systemctl enable $PRODUCT; then + if systemctl enable ${PRODUCT}.service; then echo "$Product will start automatically at boot" fi elif mywhich insserv; then