xl2tpd: fix xl2tpd options

The previous commit left an unwanted string in the options passed
to xl2tpd-control. Remove that as well.
Also set procd respawn parameter now that I'm at it.

Signed-off-by: Daniel Golle <redacted>

diff --git a/net/xl2tpd/Makefile b/net/xl2tpd/Makefile
index cba7bf03f2cb824599c0c96378b4f1e350643c18..13d510fb5890b059b3793a889491202d4b6f7e55 100644 (file)
--- a/net/xl2tpd/Makefile
+++ b/net/xl2tpd/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=xl2tpd
 PKG_VERSION:=1.3.7pre20150524
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org>
 PKG_LICENSE:=GPL-2.0
 PKG_LICENSE_FILES:=LICENSE

diff --git a/net/xl2tpd/files/l2tp.sh b/net/xl2tpd/files/l2tp.sh
index d4a6505b96bb64d4212e769a2c1bd1ed919252d1..afb3a51c12120301d4a720a0e3bccffafc69def7 100644 (file)
--- a/net/xl2tpd/files/l2tp.sh
+++ b/net/xl2tpd/files/l2tp.sh
@@ -86,7 +86,7 @@ proto_l2tp_setup() {
        echo "${ipv6:++ipv6} ${pppd_options}" >> "${optfile}"
        echo "${mtu:+mtu $mtu mru $mtu}" >> "${optfile}"
 
-       xl2tpd-control add l2tp-${interface} pppoptfile=${optfile} lns=${server} timeout=20 || {
+       xl2tpd-control add l2tp-${interface} pppoptfile=${optfile} lns=${server} || {
                echo "xl2tpd-control: Add l2tp-$interface failed" >&2
                proto_setup_failed "$interface"
                exit 1

diff --git a/net/xl2tpd/files/xl2tpd.init b/net/xl2tpd/files/xl2tpd.init
index 86098603e2158119b9c329d1c271653271109559..7d2e9ea30c17bb1c09c191be7750dc8b50d044d4 100644 (file)
--- a/net/xl2tpd/files/xl2tpd.init
+++ b/net/xl2tpd/files/xl2tpd.init
@@ -14,6 +14,7 @@ start_service() {
 
        procd_open_instance
        procd_set_param command $BIN -D -l -p "$PID_F"
+       procd_set_param respawn
        procd_close_instance
 }