]> code.ossystems Code Review - openembedded-core.git/commitdiff
runqemu: Handle device names like tapX@NONE
authorRichard Purdie <richard.purdie@linuxfoundation.org>
Sun, 9 Aug 2015 07:05:10 +0000 (00:05 -0700)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Fri, 18 Sep 2015 18:21:40 +0000 (19:21 +0100)
ip list can return devices in the form tapX@NONE. If it does so,
ensure we handle that case correctly. Newer distros appear to do
this in some cases.

[YOCTO #8129]

(From OE-Core master rev: 6459dde380febce24d2c355d441d9cb3b14409b9)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Joshua Lock <joshua.lock@collabora.co.uk>
scripts/runqemu-internal

index e346c64f51153a168a362b8c0df96c6baf25e5e7..2784d675ab029c8fa8bd384af50bb4e4d4defff6 100755 (executable)
@@ -179,7 +179,7 @@ else
                exit 1
         fi
 
-        POSSIBLE=`$IFCONFIG link | grep 'tap' | awk '{print $2}' | sed s/://`
+        POSSIBLE=`$IFCONFIG link | grep 'tap' | awk '{print $2}' | sed -e 's/://' -e 's/@.*//'`
         TAP=""
         LOCKFILE=""
         USE_PRECONF_TAP="no"