diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-universal-docker-in-docker-add-package/run b/root/etc/s6-overlay/s6-rc.d/init-mod-universal-docker-in-docker-add-package/run index 9776bf7..74541ff 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-mod-universal-docker-in-docker-add-package/run +++ b/root/etc/s6-overlay/s6-rc.d/init-mod-universal-docker-in-docker-add-package/run @@ -1,5 +1,6 @@ #!/usr/bin/with-contenv bash +ARCH=$(uname -m) if [[ "${ARCH}" = "armv7l" ]]; then echo "**** The universal docker mod no longer supports arm32v7/armhf per https://info.linuxserver.io/issues/2023-07-01-armhf/ ****" exit 0 @@ -37,7 +38,6 @@ else xfsprogs \ xz" >> /mod-repo-packages-to-install.list fi -ARCH=$(uname -m) if [ -d "/docker-tgz" ] ; then echo "Copying over docker and docker-compose binaries" mkdir -p /usr/local/lib/docker/cli-plugins diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-universal-docker-in-docker-qemu/run b/root/etc/s6-overlay/s6-rc.d/init-mod-universal-docker-in-docker-qemu/run index d95d700..cb7e5a5 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-mod-universal-docker-in-docker-qemu/run +++ b/root/etc/s6-overlay/s6-rc.d/init-mod-universal-docker-in-docker-qemu/run @@ -1,6 +1,6 @@ #!/usr/bin/with-contenv bash -if [[ "${ARCH}" = "armv7l" ]]; then +if [[ $(uname -m) = "armv7l" ]]; then echo "**** The universal docker mod no longer supports arm32v7/armhf per https://info.linuxserver.io/issues/2023-07-01-armhf/ ****" exit 0 fi diff --git a/root/etc/s6-overlay/s6-rc.d/svc-mod-universal-docker-in-docker/run b/root/etc/s6-overlay/s6-rc.d/svc-mod-universal-docker-in-docker/run index 1c6abf4..a4d16f0 100755 --- a/root/etc/s6-overlay/s6-rc.d/svc-mod-universal-docker-in-docker/run +++ b/root/etc/s6-overlay/s6-rc.d/svc-mod-universal-docker-in-docker/run @@ -1,6 +1,6 @@ #!/usr/bin/with-contenv bash -if [[ "${ARCH}" = "armv7l" ]]; then +if [[ $(uname -m) = "armv7l" ]]; then echo "**** The universal docker mod no longer supports arm32v7/armhf per https://info.linuxserver.io/issues/2023-07-01-armhf/ ****" sleep infinity fi