From 0e9d6d88d375f3ef9226ee053db819d671582e24 Mon Sep 17 00:00:00 2001 From: Ted Trask Date: Mon, 28 Dec 2015 16:09:52 +0000 Subject: Modify update_device to also validate device params (this causes update_device_params.lua to be called before update_device.lua) --- config/update_device.lua | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) (limited to 'config/update_device.lua') diff --git a/config/update_device.lua b/config/update_device.lua index b4334cd..cd5dda5 100644 --- a/config/update_device.lua +++ b/config/update_device.lua @@ -3,18 +3,4 @@ local functions, device, olddevice, params, oldparams = ... --functions.logevent("got to update_device script") --- We'll handle the changing of the device by handling the resulting changing of the params -local f -local env = {} -setmetatable (env, {__index = _G}) -local IS_52_LOAD = pcall(load, '') -if IS_52_LOAD then - f = loadfile("/etc/provisioning/update_device_params.lua", "bt", env) -else - -- loadfile loads into the global environment - -- so we set env 0, not env 1 - setfenv (0, env) - f = loadfile("/etc/provisioning/update_device_params.lua") - setfenv (0, _G) -end -if (f) then f(functions, params, oldparams) end +-- The resulting changing of the params has already been handled, so nothing to do here -- cgit v1.2.3