File systemd.patch of Package shorewall
Fixes #bnc798525
---
shorewall-4.5.11.2/install.sh | 2 +-
shorewall-lite-4.5.11.2/install.sh | 2 +-
shorewall6-4.5.11.2/install.sh | 2 +-
shorewall6-lite-4.5.11.2/install.sh | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
--- a/shorewall-4.5.11.2/install.sh
+++ b/shorewall-4.5.11.2/install.sh
@@ -395,7 +395,7 @@ fi
if [ -n "$SYSTEMD" ]; then
mkdir -p ${DESTDIR}${SYSTEMD}
run_install $OWNERSHIP -m 600 $PRODUCT.service ${DESTDIR}${SYSTEMD}/$PRODUCT.service
- [ ${SBINDIR} != /sbin ] && eval sed -i \'s\|/sbin/\|${SBINDIR}/\|\' ${DESTDIR}${SYSTEMD}/$PRODUCT.service
+ [ ${SBINDIR} != /sbin ] && eval sed -i \'s\|^/sbin/\|${SBINDIR}/\|\' ${DESTDIR}${SYSTEMD}/$PRODUCT.service
echo "Service file installed as ${DESTDIR}${SYSTEMD}/$PRODUCT.service"
fi
--- a/shorewall-lite-4.5.11.2/install.sh
+++ b/shorewall-lite-4.5.11.2/install.sh
@@ -355,7 +355,7 @@ fi
if [ -n "$SYSTEMD" ]; then
mkdir -p ${DESTDIR}${SYSTEMD}
run_install $OWNERSHIP -m 600 $PRODUCT.service ${DESTDIR}/${SYSTEMD}/$PRODUCT.service
- [ ${SBINDIR} != /sbin ] && eval sed -i \'s\|/sbin/\|${SBINDIR}/\|\' ${DESTDIR}${SYSTEMD}/$PRODUCT.service
+ [ ${SBINDIR} != /sbin ] && eval sed -i \'s\|/^sbin/\|${SBINDIR}/\|\' ${DESTDIR}${SYSTEMD}/$PRODUCT.service
echo "Service file installed as ${DESTDIR}/lib/systemd/system/$PRODUCT.service"
fi
--- a/shorewall6-4.5.11.2/install.sh
+++ b/shorewall6-4.5.11.2/install.sh
@@ -395,7 +395,7 @@ fi
if [ -n "$SYSTEMD" ]; then
mkdir -p ${DESTDIR}${SYSTEMD}
run_install $OWNERSHIP -m 600 $PRODUCT.service ${DESTDIR}${SYSTEMD}/$PRODUCT.service
- [ ${SBINDIR} != /sbin ] && eval sed -i \'s\|/sbin/\|${SBINDIR}/\|\' ${DESTDIR}${SYSTEMD}/$PRODUCT.service
+ [ ${SBINDIR} != /sbin ] && eval sed -i \'s\|^/sbin/\|${SBINDIR}/\|\' ${DESTDIR}${SYSTEMD}/$PRODUCT.service
echo "Service file installed as ${DESTDIR}${SYSTEMD}/$PRODUCT.service"
fi
--- a/shorewall6-lite-4.5.11.2/install.sh
+++ b/shorewall6-lite-4.5.11.2/install.sh
@@ -355,7 +355,7 @@ fi
if [ -n "$SYSTEMD" ]; then
mkdir -p ${DESTDIR}${SYSTEMD}
run_install $OWNERSHIP -m 600 $PRODUCT.service ${DESTDIR}/${SYSTEMD}/$PRODUCT.service
- [ ${SBINDIR} != /sbin ] && eval sed -i \'s\|/sbin/\|${SBINDIR}/\|\' ${DESTDIR}${SYSTEMD}/$PRODUCT.service
+ [ ${SBINDIR} != /sbin ] && eval sed -i \'s\|^/sbin/\|${SBINDIR}/\|\' ${DESTDIR}${SYSTEMD}/$PRODUCT.service
echo "Service file installed as ${DESTDIR}/lib/systemd/system/$PRODUCT.service"
fi