From: Jo-Philipp Wich <jow@openwrt.org>
Date: Wed, 23 May 2012 22:22:22 +0000 (+0000)
Subject: modules/admin-full: check /etc/ethers and /var/dhcp.leases for existence before tryin... 
X-Git-Tag: 0.11.0~671
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=b3e5467ec6d9782bd2c2fa64869bfab8c54dd8aa;p=oweals%2Fluci.git

modules/admin-full: check /etc/ethers and /var/dhcp.leases for existence before trying to read them
---

diff --git a/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua b/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua
index 334d9f20f..c502ea802 100644
--- a/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua
+++ b/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua
@@ -113,14 +113,18 @@ local function arplist(opt)
 		arp[e["HW address"]:upper()] = { e["IP address"] }
 	end
 
-	for e in io.lines("/etc/ethers") do
-		mac, ip = e:match("^([a-f0-9]%S+) (%S+)")
-		if mac and ip then arp[mac:upper()] = { ip } end
+	if fs.access("/etc/ethers") then
+		for e in io.lines("/etc/ethers") do
+			mac, ip = e:match("^([a-f0-9]%S+) (%S+)")
+			if mac and ip then arp[mac:upper()] = { ip } end
+		end
 	end
 
-	for e in io.lines("/var/dhcp.leases") do
-		mac, ip, name = e:match("^%d+ (%S+) (%S+) (%S+)")
-		if mac and ip then arp[mac:upper()] = { ip, name ~= "*" and name } end
+	if fs.access("/var/dhcp.leases") then
+		for e in io.lines("/var/dhcp.leases") do
+			mac, ip, name = e:match("^%d+ (%S+) (%S+) (%S+)")
+			if mac and ip then arp[mac:upper()] = { ip, name ~= "*" and name } end
+		end
 	end
 
 	for mac, e in luci.util.kspairs(arp) do