From 99666848a1b97107322acfaf7415102e1c614d7c Mon Sep 17 00:00:00 2001 From: Ted Trask Date: Mon, 8 Dec 2008 20:58:45 +0000 Subject: Modified interfaces to allow any character but ':' or '@' in interface name when parsing 'ip addr'. This fixed problem with health/networkstats when unusual interface name exists. git-svn-id: svn://svn.alpinelinux.org/acf/alpine-baselayout/trunk@1629 ab2d0c66-481e-0410-8bed-d214d4d58bed --- interfaces-model.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/interfaces-model.lua b/interfaces-model.lua index bcc3288..5c10283 100644 --- a/interfaces-model.lua +++ b/interfaces-model.lua @@ -487,8 +487,8 @@ get_addresses = function() local retval = {} local interface for line in string.gmatch(ipaddr.value, "[^\n]*\n?") do - if string.find(line, "^%x+:%s+%w+:") then - interface=string.match(line, "^%x+:%s+(%w+):") + if string.find(line, "^%d+:%s+") then + interface=string.match(line, "^%d+:%s+([^:@]+)") elseif string.find(line, "^%s*inet%s") then table.insert(retval, {interface=interface, ipaddr=string.match(line, "^%s*inet%s+([%d%.]+)")}) end -- cgit v1.2.3