Skip to content

Commit 60bd8e5

Browse files
committed
remove obsolete armhf checks
1 parent 0e000bc commit 60bd8e5

File tree

2 files changed

+3
-11
lines changed
  • root/etc/s6-overlay/s6-rc.d
    • init-mod-universal-cloudflared-setup
    • svc-mod-universal-cloudflared

2 files changed

+3
-11
lines changed

root/etc/s6-overlay/s6-rc.d/init-mod-universal-cloudflared-setup/run

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,10 @@ echo "**** Cloudflared setup script init... ****"
44

55
echo "**** Checking cloudflared setup script requirements... ****"
66
ARCH="$(command arch)"
7-
if [ "${ARCH}" = "x86_64" ]; then
7+
if [ "${ARCH}" = "x86_64" ]; then
88
ARCH="amd64"
9-
elif [ "${ARCH}" = "aarch64" ]; then
10-
ARCH="arm64"
11-
elif [ "${ARCH}" = "armv7l" ]; then
12-
echo "**** The universal cloudflared mod no longer supports arm32v7/armhf per https://info.linuxserver.io/issues/2023-07-01-armhf/ ****"
13-
exit 0
9+
elif [ "${ARCH}" = "aarch64" ]; then
10+
ARCH="arm64"
1411
else
1512
echo "**** Unsupported Linux architecture ${ARCH} found, exiting... ****"
1613
exit 1

root/etc/s6-overlay/s6-rc.d/svc-mod-universal-cloudflared/run

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
11
#!/usr/bin/with-contenv bash
22

3-
if [[ $(uname -m) = "armv7l" ]]; then
4-
echo "**** The universal cloudflared mod no longer supports arm32v7/armhf per https://info.linuxserver.io/issues/2023-07-01-armhf/ ****"
5-
sleep infinity
6-
fi
7-
83
if [[ -n "${CF_REMOTE_MANAGE_TOKEN}" ]]; then
94
exec s6-setuidgid abc cloudflared tunnel --no-autoupdate run --token ${CF_REMOTE_MANAGE_TOKEN}
105
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

0 commit comments

Comments
 (0)