mirror
/
openwrt-packages
mirror of https://git.openwrt.org/feed/packages.git
1
0
Fork 0
Code Releases Activity

vpnbypass: add procd reload trigger for vpnbypass config 

Signed-off-by: Richard Yu <yurichard3839@gmail.com>
This commit is contained in:
Richard Yu 2019-12-09 20:25:50 +08:00
parent f524a0a6ef
commit d279181756
No known key found for this signature in database
GPG Key ID: D16286AFD4E1FFF3
2 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
net/vpnbypass/Makefile
View File

@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=vpnbypass
PKG_VERSION:=1.3.1
PKG_RELEASE:=4
PKG_RELEASE:=5
PKG_LICENSE:=GPL-3.0-or-later
PKG_MAINTAINER:=Stan Grishin <stangri@melmac.net>
@ -59,16 +59,6 @@ define Package/vpnbypass/postinst
# check if we are on real system
if [ -z "$${IPKG_INSTROOT}" ]; then
/etc/init.d/vpnbypass enable
while uci -q del ucitrack.@vpnbypass[-1]; do :; done
uci -q batch <<-EOF >/dev/null
add ucitrack vpnbypass
set ucitrack.@vpnbypass[0].init='vpnbypass'
del_list ucitrack.@firewall[0].affects='vpnbypass'
add_list ucitrack.@firewall[0].affects='vpnbypass'
commit ucitrack
EOF
fi
exit 0
endef
@ -77,8 +67,6 @@ define Package/vpnbypass/prerm
#!/bin/sh
# check if we are on real system
if [ -z "$${IPKG_INSTROOT}" ]; then
while uci -q delete ucitrack.@vpnbypass[-1]; do :; done
uci -q del_list ucitrack.@firewall[0].affects='vpnbypass'
echo "Stopping service and removing rc.d symlink for vpnbypass"
/etc/init.d/vpnbypass stop || true
/etc/init.d/vpnbypass disable || true

3
net/vpnbypass/files/vpnbypass.init
View File

@ -115,8 +115,7 @@ service_triggers_load_interface() { is_supported_interface "$1" && ifaces="${ifa
service_triggers() {
local ifaces n
config_load network; config_foreach service_triggers_load_interface 'interface';
procd_add_reload_trigger 'firewall'
procd_add_reload_trigger 'openvpn'
procd_add_reload_trigger 'firewall' 'openvpn' 'vpnbypass'
procd_open_trigger
for n in $ifaces; do procd_add_reload_interface_trigger "$n"; procd_add_interface_trigger "interface.*" "$n" /etc/init.d/vpnbypass reload; done;
output "$serviceName monitoring interfaces: $ifaces $_OK_\\n"