Changed the way startstop works in core to add a list of allowed actions. Modified all ACFs that don't use the standard functions to work with new library method.

1 files changed, 1 insertions, 15 deletions

diff --git a/iptables-model.lua b/iptables-model.lua
index 0447e41..d893f60 100644
--- a/iptables-model.lua
+++ b/iptables-model.lua
@@ -555,20 +555,6 @@ function updaterulesfile(filedetails)
 	return modelfunctions.setfiledetails(filedetails, {rulesfile})
 end
 
--- local implementation to add save, reload, and panic actions
 function startstop_service(action)
-	local cmdresult = cfe({ label="Start/Stop result" })
-	
-	if (string.lower(action) == "start") or (string.lower(action) == "stop") or (string.lower(action) == "restart") or (string.lower(action) == "save") or (string.lower(action) == "reload") or (string.lower(action) == "panic") then
-		local file = io.popen( "PATH=/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin /etc/init.d/" .. 
-			servicename .. " " .. string.lower(action) .. " 2>&1" )
-		if file ~= nil then
-			cmdresult.value = file:read( "*a" )
-			file:close()
-		end
-		posix.sleep(2)	-- Wait for the process to start|stop
-	else
-		cmdresult.errtxt = "Unknown command!"
-	end
-	return cmdresult
+	return modelfunctions.startstop_service(servicename, action, {"start", "stop", "restart", "save", "reload", "panic"})
 end