Merge branch 'master' into master

2017-05-27 04:00:04 -07:00
parent d3b966d8d8 a08dbf99c5
commit f0cdd22f03
23 changed files with 962 additions and 270 deletions
--- a/py/Interface.py
+++ b/py/Interface.py
@@ -90,7 +90,7 @@ class Interface(object):

        output = Process(['ifconfig', iface]).stdout()
        mac_regex = ('[a-zA-Z0-9]{2}-' * 6)[:-1]
-        match = re.search('HWaddr (%s)' % mac_regex, output)
+        match = re.search(' (%s)' % mac_regex, output)
        if not match:
            match = re.search('unspec (%s)' % mac_regex, output)
            if not match: