From b92f54b919e925cf27105c22f8ffdd7585937bb1 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Wed, 5 Aug 2020 09:25:41 +0200 Subject: [PATCH] openvpn: fix arguments passing to wrapped up and down scripts With the introduction of the generic OpenVPN hotplug mechanism, wrapped --up and --down scripts got the wrong amount and order of arguments passed, breaking existing configurations and functionality. Fix this issue by passing the same amount of arguments in the same expected order as if the scripts were executed by the OpenVPN daemon directly. Ref: https://github.com/openwrt/openwrt/pull/1596#issuecomment-668935156 Fixes: 8fe9940db6 ("openvpn: add generic hotplug mechanism") Signed-off-by: Jo-Philipp Wich --- package/network/services/openvpn/Makefile | 2 +- .../services/openvpn/files/etc/hotplug.d/openvpn/01-user | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/package/network/services/openvpn/Makefile b/package/network/services/openvpn/Makefile index 8126b3a7c7..9482e9ce39 100644 --- a/package/network/services/openvpn/Makefile +++ b/package/network/services/openvpn/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=openvpn PKG_VERSION:=2.4.9 -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_SOURCE_URL:=\ https://build.openvpn.net/downloads/releases/ \ diff --git a/package/network/services/openvpn/files/etc/hotplug.d/openvpn/01-user b/package/network/services/openvpn/files/etc/hotplug.d/openvpn/01-user index 86be69e805..f93823e5c5 100644 --- a/package/network/services/openvpn/files/etc/hotplug.d/openvpn/01-user +++ b/package/network/services/openvpn/files/etc/hotplug.d/openvpn/01-user @@ -13,7 +13,8 @@ case "$ACTION" in up|down) if get_openvpn_option "$config" command "$ACTION"; then - exec /bin/sh -c "$command $ACTION $INSTANCE $*" + shift + exec /bin/sh -c "$command $*" fi ;; esac