* luci/contrib/olsrd-luci: adept config generator to new uci api and fix ifname in...

diff --git a/contrib/package/olsrd-luci/files/lib/config/olsr.lua b/contrib/package/olsrd-luci/files/lib/config/olsr.lua
index a10837ff46ccc68b640f7203016800c25470fc8f..1afd9a068362acef3adcdd18131b45b657dc4e48 100644 (file)
--- a/contrib/package/olsrd-luci/files/lib/config/olsr.lua
+++ b/contrib/package/olsrd-luci/files/lib/config/olsr.lua
@@ -19,7 +19,8 @@ require("luci.fs")
 require("luci.util")
 require("luci.model.uci")
 
-local conf = luci.model.uci.get_all("olsr")
+local uci  = luci.model.uci.cursor()
+local conf = uci:get_all("olsr")
 
 local function _value(val)
        if val:match("^[0-9%. \t]+$") or val == "yes" or val == "no" then
@@ -34,7 +35,11 @@ local function _section(sect,sval,parstr)
        local pad = ""
 
        if sval then
-               rv  = string.format( '%s "%s"\n{\n', conf[sect][".type"], conf[sect][sval] )
+               if sval == "Interface" then
+                       rv = string.format( 'Interface "%s"\n{\n', uci:get("network",conf[sect][sval],"ifname") )
+               else
+                       rv  = string.format( '%s "%s"\n{\n', conf[sect][".type"], conf[sect][sval] )
+               end
                pad = "\t"
        end