diff options
author | Scott Garman <scott.a.garman@intel.com> | 2014-02-15 11:04:47 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-02-17 15:36:17 +0000 |
commit | 2e490f3b08176b20fe41c64cf17ecf3b5af61f39 (patch) | |
tree | 3ae07aaa1392f9ae536df4acd894ec5ab4d9f22f | |
parent | d9ee01e4043b8b321d7c374797492ef3c4c2e0de (diff) | |
download | openembedded-core-2e490f3b08176b20fe41c64cf17ecf3b5af61f39.tar.gz openembedded-core-2e490f3b08176b20fe41c64cf17ecf3b5af61f39.tar.bz2 openembedded-core-2e490f3b08176b20fe41c64cf17ecf3b5af61f39.zip |
runqemu: add ability to skip using an existing tap device
Support the sitauation where a user could have another VM running
which uses tap devices. To prevent runqemu from trying to use the
same tap device, runqemu will skip using a tap device if it finds
a filename tapX.skip within its lock directory.
This fixes [YOCTO #5815]
Signed-off-by: Scott Garman <scott.a.garman@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rwxr-xr-x | scripts/runqemu-internal | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/scripts/runqemu-internal b/scripts/runqemu-internal index f9ca380f26..d317dfd242 100755 --- a/scripts/runqemu-internal +++ b/scripts/runqemu-internal @@ -178,6 +178,10 @@ else USE_PRECONF_TAP="no" for tap in $POSSIBLE; do LOCKFILE="$LOCKDIR/$tap" + if [ -e "$LOCKFILE.skip" ]; then + echo "Found $LOCKFILE.skip, skipping $tap" + continue + fi echo "Acquiring lockfile for $tap..." acquire_lock $LOCKFILE if [ $? -eq 0 ]; then @@ -214,7 +218,7 @@ else fi else echo "Using preconfigured tap device '$TAP'" - echo "If this is not intended, use flock on $LOCKFILE.lock to make runqemu skip $TAP." + echo "If this is not intended, touch $LOCKFILE.skip to make runqemu skip $TAP." fi cleanup() { |