Changeset 5949

Timestamp:

03/27/10 15:56:35 (3 years ago)

Author:

jow

Message:

luci-0.9: merge r5948

Location:

luci/branches/luci-0.9/modules

Files:

• admin-full/luasrc/model/cbi/admin_network/network.lua (modified) (1 diff)
• admin-mini/luasrc/model/cbi/mini/network.lua (modified) (1 diff)

luci/branches/luci-0.9/modules/admin-full/luasrc/model/cbi/admin_network/network.lua

@@ -92 +92 @@
 function hwaddr.cfgvalue(self, section)
     local ix = utl.trim(self.map:get(section, "ifname") or "")
-    if #ix > 0 then
-        local mac = fs.readfile("/sys/class/net/" .. ix .. "/address")
-            or luci.util.exec("ifconfig " .. ix):match(" ([A-F0-9:]+)%s*\n")
+    local mac = fs.readfile("/sys/class/net/" .. ix .. "/address")
 
-        if mac and #mac > 0 then
-            return mac:upper()
-        end
+    if not mac then
+        mac = luci.util.exec("ifconfig " .. ix)
+        mac = mac and mac:match(" ([A-F0-9:]+)%s*\n")
     end
+
+    if mac and #mac > 0 then
+        return mac:upper()
+    end
+
     return "?"
 end

luci/branches/luci-0.9/modules/admin-mini/luasrc/model/cbi/mini/network.lua

@@ -42 +42 @@
 function hwaddr.cfgvalue(self, section)
     local ix = self.map:get(section, "ifname") or ""
-    return fs.readfile("/sys/class/net/" .. ix .. "/address")
-        or luci.util.exec("ifconfig " .. ix):match(" ([A-F0-9:]+)%s*\n")
-        or "n/a"
+    local mac = fs.readfile("/sys/class/net/" .. ix .. "/address")
+
+    if not mac then
+        mac = luci.util.exec("ifconfig " .. ix)
+        mac = mac and mac:match(" ([A-F0-9:]+)%s*\n")
+    end
+
+    if mac and #mac > 0 then
+        return mac:upper()
+    end
+
+    return "?"
 end