luci-0.10: merge r6750

diff --git a/applications/luci-initmgr/luasrc/model/cbi/init/startup.lua b/applications/luci-initmgr/luasrc/model/cbi/init/startup.lua
new file mode 100644 (file)
index 0000000..f304706
--- /dev/null
+++ b/applications/luci-initmgr/luasrc/model/cbi/init/startup.lua
@@ -0,0 +1,36 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+Copyright 2010 Manuel Munz <freifunk at somakoma dot de>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+]]--
+
+local fs = require "nixio.fs"
+local rc = "/etc/rc.local" 
+
+f = SimpleForm("rc", translate("Local Startup"), translate("This is the content of /etc/rc.local. Insert your own commands here (in front of 'exit 0') to execute them at the end of the boot process."))
+
+t = f:field(TextValue, "rcs")
+t.rmempty = true
+t.rows = 20
+function t.cfgvalue()
+       return fs.readfile(rc) or ""
+end
+
+function f.handle(self, state, data)
+       if state == FORM_VALID then
+               if data.rcs then
+                       fs.writefile(rc, data.rcs:gsub("\r\n", "\n"))
+               end
+       end
+       return true
+end
+
+return f

diff --git a/applications/luci-initmgr/luasrc/model/cbi/startup.lua b/applications/luci-initmgr/luasrc/model/cbi/startup.lua
deleted file mode 100644 (file)
index f304706..0000000
--- a/applications/luci-initmgr/luasrc/model/cbi/startup.lua
+++ /dev/null
@@ -1,36 +0,0 @@
---[[
-LuCI - Lua Configuration Interface
-
-Copyright 2008 Steven Barth <steven@midlink.org>
-Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
-Copyright 2010 Manuel Munz <freifunk at somakoma dot de>
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-]]--
-
-local fs = require "nixio.fs"
-local rc = "/etc/rc.local" 
-
-f = SimpleForm("rc", translate("Local Startup"), translate("This is the content of /etc/rc.local. Insert your own commands here (in front of 'exit 0') to execute them at the end of the boot process."))
-
-t = f:field(TextValue, "rcs")
-t.rmempty = true
-t.rows = 20
-function t.cfgvalue()
-       return fs.readfile(rc) or ""
-end
-
-function f.handle(self, state, data)
-       if state == FORM_VALID then
-               if data.rcs then
-                       fs.writefile(rc, data.rcs:gsub("\r\n", "\n"))
-               end
-       end
-       return true
-end
-
-return f