From 4d5fa3f13389a7322eb924f5330e85634bdd5ad4 Mon Sep 17 00:00:00 2001 From: TheSpad Date: Mon, 1 May 2023 17:45:34 +0100 Subject: [PATCH 1/4] Don't try and enable qemu, just notify/halt --- root/etc/s6-overlay/s6-rc.d/init-qemu/run | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/root/etc/s6-overlay/s6-rc.d/init-qemu/run b/root/etc/s6-overlay/s6-rc.d/init-qemu/run index f04b2ab..2b926cb 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-qemu/run +++ b/root/etc/s6-overlay/s6-rc.d/init-qemu/run @@ -1,6 +1,12 @@ #!/usr/bin/with-contenv bash -if [[ $(uname -m) = "x86_64" ]]; then - echo "**** Enabling QEMU ****" - exec docker run --rm --privileged multiarch/qemu-user-static --reset -p yes +if [[ $(uname -m) = "x86_64" ]] && [[ ! -d "/dev/kvm" ]]; then + echo "┌───────────────────────────────────────────────────────────────────────────────┐" + echo "│ You need to enable to enable QEMU. Run: │" + echo "│ │" + echo "│ docker run --rm --privileged multiarch/qemu-user-static --reset -p yes │" + echo "│ │" + echo "│ on the host │" + echo "└───────────────────────────────────────────────────────────────────────────────┘" + sleep infinity fi From 1995a48fa60aa6db62b6b06a4febeacfe1aa192a Mon Sep 17 00:00:00 2001 From: TheSpad Date: Mon, 1 May 2023 17:47:23 +0100 Subject: [PATCH 2/4] Add qemu setup to readme --- README.md | 2 ++ readme-vars.yml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/README.md b/README.md index d408bea..d0ca6e6 100644 --- a/README.md +++ b/README.md @@ -25,4 +25,6 @@ services: restart: unless-stopped ``` +For x86_64 machines, run `docker run --rm --privileged multiarch/qemu-user-static --reset -p yes` on the host to enable qemu before bringing any build agent containers up. + - { date: "30.04.23:", desc: "Initial Release." } diff --git a/readme-vars.yml b/readme-vars.yml index d049dca..e7db94f 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -28,5 +28,7 @@ full_custom_readme: | restart: unless-stopped ``` + For x86_64 machines, run `docker run --rm --privileged multiarch/qemu-user-static --reset -p yes` on the host to enable qemu before bringing any build agent containers up. + - { date: "30.04.23:", desc: "Initial Release." } {%- endraw %} From 844ff872da439872c3eea3de9bbb69a23bdfa298 Mon Sep 17 00:00:00 2001 From: TheSpad Date: Mon, 1 May 2023 18:15:37 +0100 Subject: [PATCH 3/4] Change check to -e --- root/etc/s6-overlay/s6-rc.d/init-qemu/run | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root/etc/s6-overlay/s6-rc.d/init-qemu/run b/root/etc/s6-overlay/s6-rc.d/init-qemu/run index 2b926cb..8ad5f26 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-qemu/run +++ b/root/etc/s6-overlay/s6-rc.d/init-qemu/run @@ -1,6 +1,6 @@ #!/usr/bin/with-contenv bash -if [[ $(uname -m) = "x86_64" ]] && [[ ! -d "/dev/kvm" ]]; then +if [[ $(uname -m) = "x86_64" ]] && [[ ! -e "/dev/kvm" ]]; then echo "┌───────────────────────────────────────────────────────────────────────────────┐" echo "│ You need to enable to enable QEMU. Run: │" echo "│ │" From ad2b3fc4c1f3f27018b1ddeb9245444868b2e706 Mon Sep 17 00:00:00 2001 From: TheSpad Date: Mon, 1 May 2023 18:34:59 +0100 Subject: [PATCH 4/4] Remove kvm check, just warn --- root/etc/s6-overlay/s6-rc.d/init-qemu/run | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/root/etc/s6-overlay/s6-rc.d/init-qemu/run b/root/etc/s6-overlay/s6-rc.d/init-qemu/run index 8ad5f26..c6652c2 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-qemu/run +++ b/root/etc/s6-overlay/s6-rc.d/init-qemu/run @@ -1,12 +1,11 @@ #!/usr/bin/with-contenv bash -if [[ $(uname -m) = "x86_64" ]] && [[ ! -e "/dev/kvm" ]]; then +if [[ $(uname -m) = "x86_64" ]]; then echo "┌───────────────────────────────────────────────────────────────────────────────┐" - echo "│ You need to enable to enable QEMU. Run: │" + echo "│ Make sure you enable you enable QEMU. Run: │" echo "│ │" echo "│ docker run --rm --privileged multiarch/qemu-user-static --reset -p yes │" echo "│ │" echo "│ on the host │" echo "└───────────────────────────────────────────────────────────────────────────────┘" - sleep infinity fi