* Temporarily disabled fastindex-support due to a bug where controllers containing...

diff --git a/libs/web/luasrc/dispatcher.lua b/libs/web/luasrc/dispatcher.lua
index d1fcdcd0fc017105eadf7ce859c0e3a70d1a2a0f..e769fd7b1b4aa315263d69b57c716b855c98e604 100644 (file)
--- a/libs/web/luasrc/dispatcher.lua
+++ b/libs/web/luasrc/dispatcher.lua
@@ -154,11 +154,13 @@ function createindex()
        local path = luci.sys.libpath() .. "/controller/"
        local suff = ".lua"
        
-       if pcall(require, "fastindex") then
+       --[[if pcall(require, "fastindex") then
                createindex_fastindex(path, suff)
        else
                createindex_plain(path, suff)
-       end
+       end]]--
+       
+       createindex_plain(path, suff)
        
        built_index = true
 end

diff --git a/modules/admin-core/luasrc/controller/admin/system.lua b/modules/admin-core/luasrc/controller/admin/system.lua
index 304f1eee8380a573f5b6bc1c8bdcacb362d795a4..a7c65872afcc580588d5b2995eda9cf12252341b 100644 (file)
--- a/modules/admin-core/luasrc/controller/admin/system.lua
+++ b/modules/admin-core/luasrc/controller/admin/system.lua
@@ -8,49 +8,15 @@ require("luci.model.ipkg")
 require("luci.model.uci")
 
 function index()
-       local page  = node("admin", "system")
-       page.target = template("admin_system/index")
-       page.title  = "System"  
-       page.order  = 30
-       
-       local page  = node("admin", "system", "packages")
-       page.target = call("action_packages")
-       page.title  = "Paketverwaltung"
-       page.order  = 10
-       
-       local page  = node("admin", "system", "packages", "ipkg")
-       page.target = call("action_ipkg")
-       page.title  = "IPKG-Konfiguration"
-       
-       local page  = node("admin", "system", "passwd")
-       page.target = call("action_passwd")
-       page.title  = "Passwort ändern"
-       page.order  = 20
-       
-       local page  = node("admin", "system", "sshkeys")
-       page.target = call("action_sshkeys")
-       page.title  = "SSH-Schlüssel"
-       page.order  = 30
-       
-       local page  = node("admin", "system", "hostname")
-       page.target = cbi("admin_system/hostname")
-       page.title  = "Hostname"
-       page.order  = 40
-       
-       local page  = node("admin", "system", "fstab")
-       page.target = cbi("admin_system/fstab")
-       page.title  = "Einhängepunkte"
-       page.order  = 50
-       
-       local page  = node("admin", "system", "upgrade")
-       page.target = call("action_upgrade")
-       page.title  = "Firmwareupgrade"
-       page.order  = 60
-       
-       local page  = node("admin", "system", "reboot")
-       page.target = call("action_reboot")
-       page.title  = "Neu starten"
-       page.order  = 70
+       entry({"admin", "system"}, template("admin_system/index"), "System", 30)
+       entry({"admin", "system", "packages"}, call("action_packages"), "Paketverwaltung", 10)
+       entry({"admin", "system", "packages", "ipkg"}, call("action_ipkg"), "IPKG-Konfiguration")
+       entry({"admin", "system", "passwd"}, call("action_passwd"), "Passwort ändern", 20)
+       entry({"admin", "system", "sshkeys"}, call("action_sshkeys"), "SSH-Schlüssel", 30)
+       entry({"admin", "system", "hostname"}, cbi("admin_system/hostname"), "Hostname", 40)
+       entry({"admin", "system", "fstab"}, cbi("admin_system/fstab"), "Einhängepunkte", 50)
+       entry({"admin", "system", "upgrade"}, call("action_upgrade"), "Firmwareupgrade", 60)
+       entry({"admin", "system", "reboot"}, call("action_reboot"), "Neu starten", 70)
 end
 
 function action_editor()