admin-mini: Merge MAC-Address detection from admin-full

diff --git a/modules/admin-mini/luasrc/model/cbi/mini/network.lua b/modules/admin-mini/luasrc/model/cbi/mini/network.lua
index e4dd2caec28692bd2ceaa96c6f5e5159b4483528..ccb5dac8987d490ed68bb351c5025e43c45da8a2 100644 (file)
--- a/modules/admin-mini/luasrc/model/cbi/mini/network.lua
+++ b/modules/admin-mini/luasrc/model/cbi/mini/network.lua
@@ -36,7 +36,9 @@ hwaddr = s:option(DummyValue, "_hwaddr",
  translate("network_interface_hwaddr"), translate("network_interface_hwaddr_desc"))
 function hwaddr.cfgvalue(self, section)
        local ix = self.map:get(section, "ifname") or ""
-       return luci.fs.readfile("/sys/class/net/" .. ix .. "/address") or "n/a"
+       return luci.fs.readfile("/sys/class/net/" .. ix .. "/address")
+               or luci.util.exec("ifconfig " .. ix):match(" ([A-F0-9:]+)%s*\n")
+               or "n/a"
 end