summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChen Qi <Qi.Chen@windriver.com>2015-01-29 13:44:18 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-02-03 14:53:42 +0000
commit039c57257c4180b0688fc2ec1b03948276009b04 (patch)
tree272e9c7e61c53b6c65ea0f39df16fc410a8b53c3
parentca641aedff5f6bd155796ead02cb2eb871f8c17a (diff)
downloadopenembedded-core-contrib-039c57257c4180b0688fc2ec1b03948276009b04.tar.gz
openembedded-core-contrib-039c57257c4180b0688fc2ec1b03948276009b04.tar.bz2
openembedded-core-contrib-039c57257c4180b0688fc2ec1b03948276009b04.zip
runqemu-internal: get rid of annoying but harmless error message
If tap0 interface has been created by other users on the system, we would get error messages when using runqemu. Error messages are like below. Acquiring lockfile for tap0... touch: cannot touch ‘/tmp/qemu-tap-locks/tap0.lock’: Permission denied /buildarea2/chenqi/poky/scripts/runqemu-internal: line 139: /tmp/qemu-tap-locks/tap0.lock: Permission denied flock: 8: Bad file descriptor The system can still boot up because runqemu would try to create a new tap interface. So the error message above is harmless, yet somewhat annoying. This patch fixes the above problem. With this patch, the output would be as follows. Acquiring lockfile for tap0... Acquiring lockfile for /tmp/qemu-tap-locks/tap0.lock failed Setting up tap interface under sudo Acquiring lockfile for tap1... Running qemu-system-arm... Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
-rwxr-xr-xscripts/runqemu-internal6
1 files changed, 5 insertions, 1 deletions
diff --git a/scripts/runqemu-internal b/scripts/runqemu-internal
index 5711bd3802..a0a1e96eb4 100755
--- a/scripts/runqemu-internal
+++ b/scripts/runqemu-internal
@@ -138,7 +138,11 @@ else
return 1
fi
- touch $lockfile.lock
+ touch $lockfile.lock 2>/dev/null
+ if [ $? -ne 0 ]; then
+ echo "Acquiring lockfile for $lockfile.lock failed"
+ return 1
+ fi
exec 8>$lockfile.lock
flock -n -x 8
if [ $? -ne 0 ]; then