diff options
author | Scott Garman <scott.a.garman@intel.com> | 2012-09-21 15:06:02 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-09-24 11:30:36 +0100 |
commit | e46be72a8e5d064b4b46d5b0c37d67bbb2ccae55 (patch) | |
tree | 80d8bb86ecb6dad6446a330fe440b7f0acbf7333 | |
parent | 2f0a82b8a9d27760a80c4a60f3705ca85b81f120 (diff) | |
download | openembedded-core-contrib-e46be72a8e5d064b4b46d5b0c37d67bbb2ccae55.tar.gz |
runqemu: work with tap device names that end with a colon
On Fedora systems (and likely others), ifconfig returns interface
names that end with a colon. Make sure we strip the colon off the
tap device name before using it.
This fixes [YOCTO #3028]
(From OE-Core rev: 85ed217b603a86113dda11d952850e8ceed30795)
Signed-off-by: Scott Garman <scott.a.garman@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rwxr-xr-x | scripts/runqemu-gen-tapdevs | 2 | ||||
-rwxr-xr-x | scripts/runqemu-internal | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/scripts/runqemu-gen-tapdevs b/scripts/runqemu-gen-tapdevs index 2c1ff0eefb..f5be30ac32 100755 --- a/scripts/runqemu-gen-tapdevs +++ b/scripts/runqemu-gen-tapdevs @@ -70,7 +70,7 @@ if [ ! -x "$IFCONFIG" ]; then fi # Ensure we start with a clean slate -for tap in `$IFCONFIG | grep ^tap | awk '{ print \$1 }'`; do +for tap in `$IFCONFIG | grep ^tap | awk '{ print \$1 }' | sed s/://`; do echo "Note: Destroying pre-existing tap interface $tap..." $TUNCTL -d $tap done diff --git a/scripts/runqemu-internal b/scripts/runqemu-internal index 6e20dd7512..6b8bb6520e 100755 --- a/scripts/runqemu-internal +++ b/scripts/runqemu-internal @@ -154,7 +154,7 @@ if [ ! -x "$IFCONFIG" ]; then exit 1 fi -POSSIBLE=`$IFCONFIG -a | grep '^tap' | awk '{print $1}'` +POSSIBLE=`$IFCONFIG -a | grep '^tap' | awk '{print $1}' | sed s/://` TAP="" LOCKFILE="" for tap in $POSSIBLE; do |