diff options
| author | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2017-09-07 11:46:06 +0000 |
|---|---|---|
| committer | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2017-09-11 07:02:39 +0000 |
| commit | 5e137343aa4866f263c03f99b2c45807d71eac9b (patch) | |
| tree | 292e684da4795f526cc438c3d2fd7c2c39de6b1f /start-container-qemu.sh | |
| parent | 6a369bb23f86652fe3b48ec2bb89f2d26833b8f6 (diff) | |
start-container-qemu.sh: Remove FIXME.
This is dependent on https://review.linaro.org/#/c/21279/ .
Change-Id: I81ba5106ad3ba6604eb1becc1fb5ee597ab5a21a
Diffstat (limited to 'start-container-qemu.sh')
| -rwxr-xr-x | start-container-qemu.sh | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/start-container-qemu.sh b/start-container-qemu.sh index 9695ddc4..bd7ef52e 100755 --- a/start-container-qemu.sh +++ b/start-container-qemu.sh @@ -49,10 +49,6 @@ container_exec () remote_exec "$host:$port:/" "$@" } -# FIXME: install qemu-system-arm into docker images. -container_exec sudo apt-get update -container_exec sudo apt-get install -y qemu-system-arm nfs-kernel-server - # /tmp is a scratch volume outside of / filesystem. nfsroot="/tmp/nfsroot" container_exec sudo mkdir "$nfsroot" @@ -78,10 +74,11 @@ done container_exec sudo /etc/init.d/rpcbind start container_exec sudo /etc/init.d/nfs-kernel-server start -# Add tcwg-buildslave to "kvm" group to avoid running QEMU as root -# FIXME: Remove when container images have this. -container_user=$(container_exec whoami) -container_exec sudo addgroup "$container_user" kvm +# /dev/kvm is chowned to root:kvm when qemu-system-arm package is installed. +# We have this packaged installed, but /dev/kvm owner and permissions are not +# preserved in container image. +container_exec sudo chown root:kvm /dev/kvm +container_exec sudo chmod g+rw /dev/kvm # CPU is limited (on contention) by docker container. ncpus=$(container_exec nproc --all) |