Merge pull request #263 from adferguson/clean-fix

adjust regex for finding mininet's links during cleanup
2014-01-29 17:03:37 -08:00
parent 29988c8b1d 07e3da08d0
commit 7450cfc627
1 changed files with 1 additions and 1 deletions
@@ -59,7 +59,7 @@ def cleanup():
            sh( 'ovs-vsctl del-br ' + dp )

    info( "*** Removing all links of the pattern foo-ethX\n" )
-    links = sh( r"ip link show | egrep -o '(\w+-eth\w+)'" ).split( '\n' )
+    links = sh( r"ip link show | egrep -o '([-_[:alnum:]]+-eth[[:digit:]]+)'" ).split( '\n' )
    for link in links:
        if link != '':
            sh( "ip link del " + link )