From: Stan Grishin <stangri@melmac.net>
Date: Fri, 18 Oct 2019 14:14:40 +0000 (-0700)
Subject: luci-app-vpnbypass: bugfix: properly restart dnsmasq
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=11421536cd81529fe8e6d3b50090fc6d8c49f8ac;p=oweals%2Fluci.git

luci-app-vpnbypass: bugfix: properly restart dnsmasq

Signed-off-by: Stan Grishin <stangri@melmac.net>
---

diff --git a/applications/luci-app-vpnbypass/Makefile b/applications/luci-app-vpnbypass/Makefile
index 51c3dafa7..7c8909007 100644
--- a/applications/luci-app-vpnbypass/Makefile
+++ b/applications/luci-app-vpnbypass/Makefile
@@ -10,7 +10,7 @@ LUCI_TITLE:=VPN Bypass Web UI
 LUCI_DESCRIPTION:=Provides Web UI for VPNBypass service.
 LUCI_DEPENDS:=+luci-mod-admin-full +vpnbypass
 LUCI_PKGARCH:=all
-PKG_RELEASE:=10
+PKG_RELEASE:=11
 
 include ../../luci.mk
 
diff --git a/applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua b/applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua
index 75c681ec4..e3c5753f4 100644
--- a/applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua
+++ b/applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua
@@ -8,6 +8,7 @@ local uci = require "luci.model.uci".cursor()
 local sys = require "luci.sys"
 local http = require "luci.http"
 local dispatcher = require "luci.dispatcher"
+local util = require "luci.util"
 en = h:option(Button, "__toggle")
 if enabledFlag ~= "1" then
 	en.title      = translate("Service is disabled/stopped")
@@ -31,9 +32,9 @@ function en.write()
 		sys.init.start(packageName)
 	end
 	if dispatcher.lookup("admin/vpn") then
-		http.redirect(dispatcher.build_url("admin/vpn/" .. packageName))
+		http.redirect(dispatcher.build_url("admin", "vpn", packageName))
 	else
-		http.redirect(dispatcher.build_url("admin/services/" .. packageName))
+		http.redirect(dispatcher.build_url("admin", "services", packageName))
 	end
 end
 
@@ -76,7 +77,7 @@ di = s4:option(DynamicList, "ipset", translate("Domains to Bypass"),
 		.. [[<a href="]] .. readmeURL .. [[#bypass-domains-formatsyntax" target="_blank">]]
     .. translate("README") .. [[</a> ]] .. translate("for syntax"))
 function d.on_after_commit(map)
-    sys.init.restart("dnsmasq")
+	util.exec("/etc/init.d/dnsmasq restart >/dev/null 2>&1")
 end
 
 return m, d