summaryrefslogtreecommitdiffstats
path: root/scripts/runqemu-internal
diff options
context:
space:
mode:
authorJason Wessel <jason.wessel@windriver.com>2012-05-02 11:30:46 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-05-03 14:48:09 (GMT)
commit76551e02edb51a0638762a8b0e6cea0976b5d85e (patch)
tree204a0b02b62600e2bac0e9701f1e12ffc816d014 /scripts/runqemu-internal
parente8005eb9360070aef131c74e17bc7ca3f070053d (diff)
downloadpoky-76551e02edb51a0638762a8b0e6cea0976b5d85e.tar.gz
runqemu: Fix TAP='TUNSETGROUP: Invalid argument' by falling back to tunctl -u
By default the runqemu script tries to set the group permissions on any tap device it creates. The TUNSETGROUP ioctl is not implemented on some popular host enterprise linux distributions. Internally the script will exit as follows: ++ /opt/qemux86/bitbake_build/tmp/sysroots/x86_64-linux/usr/bin/tunctl -b -g 100 + TAP='TUNSETGROUP: Invalid argument' + STATUS=1 + '[' 1 -ne 0 ']' + echo 'tunctl failed:' tunctl failed: + echo TUNSETGROUP: Invalid argument This patch implements a fallback to using the userid as the owner of the tap device which is supported by all 2.6 kernels, the default remains to try and use the groupid first. (From OE-Core rev: 3af2bc59776fb738bd795160512a2f3f49ce6d32) Signed-off-by: Jason Wessel <jason.wessel@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/runqemu-internal')
-rwxr-xr-xscripts/runqemu-internal5
1 files changed, 3 insertions, 2 deletions
diff --git a/scripts/runqemu-internal b/scripts/runqemu-internal
index 1831a09..fb0d806 100755
--- a/scripts/runqemu-internal
+++ b/scripts/runqemu-internal
@@ -173,13 +173,14 @@ if [ "$TAP" = "" ]; then
173 fi 173 fi
174 174
175 GROUPID=`id -g` 175 GROUPID=`id -g`
176 USERID=`id -u`
176 echo "Setting up tap interface under sudo" 177 echo "Setting up tap interface under sudo"
177 # Redirect stderr since we could see a LD_PRELOAD warning here if pseudo is loaded 178 # Redirect stderr since we could see a LD_PRELOAD warning here if pseudo is loaded
178 # but inactive. This looks scary but is harmless 179 # but inactive. This looks scary but is harmless
179 tap=`sudo $QEMUIFUP $GROUPID $OECORE_NATIVE_SYSROOT 2> /dev/null` 180 tap=`sudo $QEMUIFUP $USERID $GROUPID $OECORE_NATIVE_SYSROOT 2> /dev/null`
180 if [ $? -ne 0 ]; then 181 if [ $? -ne 0 ]; then
181 # Re-run standalone to see verbose errors 182 # Re-run standalone to see verbose errors
182 sudo $QEMUIFUP $GROUPID $OECORE_NATIVE_SYSROOT 183 sudo $QEMUIFUP $USERID $GROUPID $OECORE_NATIVE_SYSROOT
183 return 184 return
184 fi 185 fi
185 LOCKFILE="$LOCKDIR/$tap" 186 LOCKFILE="$LOCKDIR/$tap"