diff options
author | Ted Trask <ttrask01@yahoo.com> | 2008-12-08 20:58:45 +0000 |
---|---|---|
committer | Ted Trask <ttrask01@yahoo.com> | 2008-12-08 20:58:45 +0000 |
commit | 99666848a1b97107322acfaf7415102e1c614d7c (patch) | |
tree | 968bde9762bf044c10cb74095025aa2fc84b2632 | |
parent | b65c422d033449658927949514605bd06e9838e7 (diff) | |
download | acf-alpine-baselayout-99666848a1b97107322acfaf7415102e1c614d7c.tar.bz2 acf-alpine-baselayout-99666848a1b97107322acfaf7415102e1c614d7c.tar.xz |
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
-rw-r--r-- | interfaces-model.lua | 4 |
1 files 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 |