summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYves-Alexis Perez <corsac@debian.org>2013-11-29 07:28:21 +0100
committerYves-Alexis Perez <corsac@debian.org>2013-11-29 07:28:21 +0100
commit2f5aa9d89df2fe081417131a25d43277657d9cbf (patch)
treebe8ef01ff874f553633b2bf9d9eb00764f8fbd37
parent09e104c97831c5cbe45013862dafd6e7403a62f7 (diff)
downloadvyos-strongswan-2f5aa9d89df2fe081417131a25d43277657d9cbf.tar.gz
vyos-strongswan-2f5aa9d89df2fe081417131a25d43277657d9cbf.zip
use daemon exe in start-stop-daemon test. closes: #730661
-rw-r--r--debian/changelog2
-rw-r--r--debian/strongswan-starter.ipsec.init2
2 files changed, 3 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index e2ebdfb9b..2fffe8059 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -32,6 +32,8 @@ strongswan (5.1.1-1) UNRELEASED; urgency=low
- pt.po updated, thanks Américo Monteiro. closes: #729823
* debian/patches:
- CVE-2013-6075 and CVE-2013-6076 dropped, included upstream.
+ * debian/strongswan-starter.ipsec.init:
+ - use daemon exe in start-stop-daemon test. closes: #730661
[ Romain Francoise ]
* debian/rules:
diff --git a/debian/strongswan-starter.ipsec.init b/debian/strongswan-starter.ipsec.init
index 0f4e153eb..e90f0e731 100644
--- a/debian/strongswan-starter.ipsec.init
+++ b/debian/strongswan-starter.ipsec.init
@@ -47,7 +47,7 @@ do_start()
# test if charon is currently running
if [ -e $CHARON ]; then
- start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $STARTER --test > /dev/null \
+ start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $CHARON --test > /dev/null \
|| return 1
fi