mirror of
https://github.com/novatiq/packages.git
synced 2026-04-30 15:38:40 +01:00
vpnbypass: bugfix: PROCD command not found on stop
Signed-off-by: Stan Grishin <stangri@melmac.net>
This commit is contained in:
+12
-21
@@ -1,11 +1,11 @@
|
||||
# Copyright (c) 2017 Stan Grishin (stangri@melmac.net)
|
||||
# Copyright 2017-2018 Stan Grishin (stangri@melmac.net)
|
||||
# This is free software, licensed under the GNU General Public License v3.
|
||||
|
||||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=vpnbypass
|
||||
PKG_VERSION:=1.3.1
|
||||
PKG_RELEASE:=2
|
||||
PKG_RELEASE:=4
|
||||
PKG_LICENSE:=GPL-3.0-or-later
|
||||
PKG_MAINTAINER:=Stan Grishin <stangri@melmac.net>
|
||||
|
||||
@@ -54,43 +54,34 @@ define Package/vpnbypass/install
|
||||
endef
|
||||
|
||||
|
||||
define Package/$(PKG_NAME)/postinst
|
||||
define Package/vpnbypass/postinst
|
||||
#!/bin/sh
|
||||
# check if we are on real system
|
||||
if [ -z "$${IPKG_INSTROOT}" ]; then
|
||||
while [ ! -z "$(uci -q get ucitrack.@vpnbypass[-1] 2>/dev/null)" ] ; do
|
||||
uci -q delete ucitrack.@vpnbypass[-1]
|
||||
done
|
||||
/etc/init.d/vpnbypass enable
|
||||
|
||||
while [ ! -z "$(uci -q get ucitrack.@firewall[-1].affects 2>/dev/null | awk '/vpnbypass/')" ] ; do
|
||||
uci -q del_list ucitrack.@firewall[-1].affects='vpnbypass'
|
||||
done
|
||||
while uci -q del ucitrack.@vpnbypass[-1]; do :; done
|
||||
|
||||
uci -q batch <<-EOF >/dev/null
|
||||
add ucitrack vpnbypass
|
||||
set ucitrack.@vpnbypass[-1].init='vpnbypass'
|
||||
add_list ucitrack.@firewall[-1].affects='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
|
||||
|
||||
define Package/$(PKG_NAME)/prerm
|
||||
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
|
||||
|
||||
while [ ! -z "$(uci -q get ucitrack.@vpnbypass[-1] 2>/dev/null)" ] ; do
|
||||
uci -q delete ucitrack.@vpnbypass[-1]
|
||||
done
|
||||
|
||||
while [ ! -z "$(uci -q get ucitrack.@firewall[-1].affects 2>/dev/null | awk '/vpnbypass/')" ] ; do
|
||||
uci -q del_list ucitrack.@firewall[-1].affects='vpnbypass'
|
||||
done
|
||||
/etc/init.d/vpnbypass disable || true
|
||||
fi
|
||||
exit 0
|
||||
endef
|
||||
|
||||
Reference in New Issue
Block a user