From 4ecd333fbddf43ab45f957b46b88cd2592991b58 Mon Sep 17 00:00:00 2001
From: Kyle Harding <kyle@balena.io>
Date: Tue, 12 Dec 2023 09:21:53 -0500
Subject: [PATCH] Test setting compat_uts_machine=armv6l

Signed-off-by: Kyle Harding <kyle@balena.io>
---
 Dockerfile              |  2 +-
 docker-compose.test.yml |  9 +++------
 test/healthcheck.sh     | 30 +++++++++++++++++++++++++-----
 3 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index b1ba47d..1910332 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -37,7 +37,7 @@ FROM linux.git AS vmlinux
 
 COPY vmlinux/*.patch ./
 
-RUN git apply ./*.patch
+RUN git apply -v ./*.patch
 
 COPY vmlinux/*.config ./
 
diff --git a/docker-compose.test.yml b/docker-compose.test.yml
index f56d634..f566e9e 100644
--- a/docker-compose.test.yml
+++ b/docker-compose.test.yml
@@ -61,8 +61,7 @@ services:
         - sut:latest
     hostname: alpine-test
     environment:
-      - DOCKERHUB_USERNAME=${DOCKERHUB_USERNAME:-}
-      - DOCKERHUB_PASSWORD=${DOCKERHUB_PASSWORD:-}
+      EXTRA_KERNEL_BOOT_ARGS: compat_uts_machine=armv6l
 
   debian-test:
     extends:
@@ -76,8 +75,7 @@ services:
         - sut:latest
     hostname: debian-test
     environment:
-      - DOCKERHUB_USERNAME=${DOCKERHUB_USERNAME:-}
-      - DOCKERHUB_PASSWORD=${DOCKERHUB_PASSWORD:-}
+      EXTRA_KERNEL_BOOT_ARGS: compat_uts_machine=armv6l
 
   ubuntu-test:
     extends:
@@ -91,5 +89,4 @@ services:
         - sut:latest
     hostname: ubuntu-test
     environment:
-      - DOCKERHUB_USERNAME=${DOCKERHUB_USERNAME:-}
-      - DOCKERHUB_PASSWORD=${DOCKERHUB_PASSWORD:-}
+      EXTRA_KERNEL_BOOT_ARGS: compat_uts_machine=armv6l
diff --git a/test/healthcheck.sh b/test/healthcheck.sh
index 2866744..9834329 100644
--- a/test/healthcheck.sh
+++ b/test/healthcheck.sh
@@ -17,7 +17,22 @@ id
 
 date
 
-uname -a
+dpkg --print-architecture || apk --print-arch
+
+case $(dpkg --print-architecture || apk --print-arch) in
+x86_64)
+    uname -a | grep x86_64
+    setarch --32bit uname -a | tee /dev/stderr | grep x86_64
+    ;;
+aarch64)
+    uname -a | grep aarch64
+    setarch --32bit uname -a | tee /dev/stderr | grep armv6l
+    ;;
+*)
+    echo "Unsupported architecture!"
+    exit 1
+    ;;
+esac
 
 df -h
 
@@ -51,15 +66,20 @@ if command -v ip >/dev/null 2>&1; then
     ip route
 fi
 
-# nested virtualization is not available on aarch64
-if [ -r /dev/kvm ]; then
+case $(dpkg --print-architecture || apk --print-arch) in
+x86_64)
     ls -l /dev/kvm
     test -w /dev/kvm
-
     if which kvm-ok >/dev/null; then
         kvm-ok
     fi
-fi
+    ;;
+*)
+    # https://github.com/balena-io-experimental/container-jail/issues/44
+    # https://github.com/firecracker-microvm/firecracker/issues/1721
+    echo "Nested KVM unavailable on this architecture!"
+    ;;
+esac
 
 if command -v npm >/dev/null 2>&1; then
     npm ping