From 76982655fa433edd885bbb80bbe74e82fca527e2 Mon Sep 17 00:00:00 2001 From: Steven Barth Date: Wed, 6 Aug 2008 20:11:15 +0000 Subject: Moved luci.sys.exec, luci.sys.execl and luci.sys.bigendian to luci.util --- modules/admin-full/luasrc/controller/admin/system.lua | 2 +- modules/admin-full/luasrc/controller/admin/uci.lua | 2 +- modules/admin-full/luasrc/model/cbi/admin_network/dhcp.lua | 3 ++- modules/admin-full/luasrc/model/cbi/admin_wifi/devices.lua | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) (limited to 'modules/admin-full/luasrc') diff --git a/modules/admin-full/luasrc/controller/admin/system.lua b/modules/admin-full/luasrc/controller/admin/system.lua index 8e3a3d7999..9abdb2abab 100644 --- a/modules/admin-full/luasrc/controller/admin/system.lua +++ b/modules/admin-full/luasrc/controller/admin/system.lua @@ -189,7 +189,7 @@ function action_backup() luci.ltn12.pump.all(luci.ltn12.source.file(backup_fpi), luci.http.write) elseif reset then luci.template.render("admin_system/applyreboot") - luci.sys.exec("mtd -r erase rootfs_data") + luci.util.exec("mtd -r erase rootfs_data") else luci.template.render("admin_system/backup", {reset_avail = reset_avail}) end diff --git a/modules/admin-full/luasrc/controller/admin/uci.lua b/modules/admin-full/luasrc/controller/admin/uci.lua index d2acdeca13..215889f85f 100644 --- a/modules/admin-full/luasrc/controller/admin/uci.lua +++ b/modules/admin-full/luasrc/controller/admin/uci.lua @@ -77,7 +77,7 @@ function action_apply() -- Search for post-commit commands for cmd, i in pairs(run) do - output = output .. cmd .. ":" .. luci.sys.exec(cmd) .. "\n" + output = output .. cmd .. ":" .. luci.util.exec(cmd) .. "\n" end end diff --git a/modules/admin-full/luasrc/model/cbi/admin_network/dhcp.lua b/modules/admin-full/luasrc/model/cbi/admin_network/dhcp.lua index 20adcdf100..f85eb52198 100644 --- a/modules/admin-full/luasrc/model/cbi/admin_network/dhcp.lua +++ b/modules/admin-full/luasrc/model/cbi/admin_network/dhcp.lua @@ -13,6 +13,7 @@ $Id$ ]]-- require("luci.model.uci") require("luci.sys") +require("luci.util") m = Map("dhcp", "DHCP") @@ -46,7 +47,7 @@ s:option(Value, "netmask", translate("netmask")).optional = true s:option(Flag, "force").optional = true -for i, line in pairs(luci.sys.execl("dnsmasq --help dhcp")) do +for i, line in pairs(luci.util.execl("dnsmasq --help dhcp")) do k, v = line:match("([^ ]+) +([^ ]+)") s:option(Value, "dhcp"..k, v).optional = true end diff --git a/modules/admin-full/luasrc/model/cbi/admin_wifi/devices.lua b/modules/admin-full/luasrc/model/cbi/admin_wifi/devices.lua index d463157d19..de22619192 100644 --- a/modules/admin-full/luasrc/model/cbi/admin_wifi/devices.lua +++ b/modules/admin-full/luasrc/model/cbi/admin_wifi/devices.lua @@ -33,7 +33,7 @@ t:value("prism2") --[[ require("luci.sys") local c = ". /etc/functions.sh;for i in /lib/wifi/*;do . $i;done;echo $DRIVERS" -for driver in luci.sys.execl(c)[1]:gmatch("[^ ]+") do +for driver in luci.util.execl(c)[1]:gmatch("[^ ]+") do t:value(driver) end ]]-- -- cgit v1.2.3