From f15e1845e88435e8a3d982667f1128b4a7b0b2dc Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Thu, 10 Sep 2020 21:02:09 +0200 Subject: [PATCH] Update mlvpn and fix init script --- mlvpn/Makefile | 4 ++-- mlvpn/files/etc/init.d/mlvpn | 13 ++++++------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/mlvpn/Makefile b/mlvpn/Makefile index b81a2dc6a..6e0cb5e81 100644 --- a/mlvpn/Makefile +++ b/mlvpn/Makefile @@ -13,8 +13,8 @@ PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/zehome/MLVPN.git -PKG_SOURCE_VERSION:=67f9f31ddd6dba9514e51b36e855a2a5e973ee93 -PKG_SOURCE_DATE:=2020-03-29 +PKG_SOURCE_VERSION:=58418fd847fe833d1e626d4b7d08f0e623756c5c +PKG_SOURCE_DATE:=2020-09-01 #PKG_SOURCE_URL:=https://github.com/markfoodyburton/MLVPN.git #PKG_SOURCE_VERSION:=8f9720978b28c1954f9f229525333547283316d2 #PKG_SOURCE_DATE:=2018-09-03 diff --git a/mlvpn/files/etc/init.d/mlvpn b/mlvpn/files/etc/init.d/mlvpn index 831a5e61e..f71cb3928 100755 --- a/mlvpn/files/etc/init.d/mlvpn +++ b/mlvpn/files/etc/init.d/mlvpn @@ -40,7 +40,7 @@ interface_multipath_settings() { EOF } -start_service() { +start() { local enable timeout mode password reorder_buffer_size interface_name host firstport loss_tolerence validate_section "general" || { _err "validation failed" @@ -72,12 +72,11 @@ start_service() { config_foreach interface_multipath_settings interface chmod 0600 "/tmp/etc/${interface_name}.conf" - procd_open_instance - procd_set_param command /usr/sbin/mlvpn --config "/tmp/etc/${interface_name}.conf" --user nobody - procd_set_param file "/tmp/etc/${interface_name}.conf" - #procd_set_param reload_signal SIGHUP - procd_set_param respawn 0 30 5 - procd_close_instance + service_start /usr/sbin/mlvpn --config "/tmp/etc/${interface_name}.conf" --user nobody +} + +stop() { + killall mlvpn } service_triggers() {