diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-universal-cloudflared-setup/run b/root/etc/s6-overlay/s6-rc.d/init-mod-universal-cloudflared-setup/run index dea854c..91aadc4 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-mod-universal-cloudflared-setup/run +++ b/root/etc/s6-overlay/s6-rc.d/init-mod-universal-cloudflared-setup/run @@ -4,13 +4,10 @@ echo "**** Cloudflared setup script init... ****" echo "**** Checking cloudflared setup script requirements... ****" ARCH="$(command arch)" -if [ "${ARCH}" = "x86_64" ]; then +if [ "${ARCH}" = "x86_64" ]; then ARCH="amd64" -elif [ "${ARCH}" = "aarch64" ]; then - ARCH="arm64" -elif [ "${ARCH}" = "armv7l" ]; then - echo "**** The universal cloudflared mod no longer supports arm32v7/armhf per https://info.linuxserver.io/issues/2023-07-01-armhf/ ****" - exit 0 +elif [ "${ARCH}" = "aarch64" ]; then + ARCH="arm64" else echo "**** Unsupported Linux architecture ${ARCH} found, exiting... ****" exit 1 diff --git a/root/etc/s6-overlay/s6-rc.d/svc-mod-universal-cloudflared/run b/root/etc/s6-overlay/s6-rc.d/svc-mod-universal-cloudflared/run index 3b890db..ae7d10a 100755 --- a/root/etc/s6-overlay/s6-rc.d/svc-mod-universal-cloudflared/run +++ b/root/etc/s6-overlay/s6-rc.d/svc-mod-universal-cloudflared/run @@ -1,10 +1,5 @@ #!/usr/bin/with-contenv bash -if [[ $(uname -m) = "armv7l" ]]; then - echo "**** The universal cloudflared mod no longer supports arm32v7/armhf per https://info.linuxserver.io/issues/2023-07-01-armhf/ ****" - sleep infinity -fi - if [[ -n "${CF_REMOTE_MANAGE_TOKEN}" ]]; then exec s6-setuidgid abc cloudflared tunnel --no-autoupdate run --token ${CF_REMOTE_MANAGE_TOKEN} elif [[ ${#CF_ZONE_ID} -gt 0 ]] && [[ ${#CF_ACCOUNT_ID} -gt 0 ]] && [[ ${#CF_API_TOKEN} -gt 0 ]] && [[ ${#CF_TUNNEL_NAME} -gt 0 ]] && [[ ${#CF_TUNNEL_CONFIG} -gt 0 ]] && [[ ${#CF_TUNNEL_PASSWORD} -gt 31 ]]; then