From c81ef9055b554e1aa68bfd0d668b752a63fa98b6 Mon Sep 17 00:00:00 2001
From: Brad Fitzpatrick <bradfitz@tailscale.com>
Date: Thu, 23 Oct 2025 17:59:25 -0700
Subject: [PATCH] util/linuxfw: fix 32-bit arm regression with iptables

This fixes a regression from dd615c8fdd that moved the
newIPTablesRunner constructor from a any-Linux-GOARCH file to one that
was only amd64 and arm64, thus breaking iptables on other platforms
(notably 32-bit "arm", as seen on older Pis running Buster with
iptables)

Tested by hand on a Raspberry Pi 2 w/ Buster + iptables for now, for
lack of automated 32-bit arm tests at the moment. But filed #17629.

Fixes #17623
Updates #17629

Change-Id: Iac1a3d78f35d8428821b46f0fed3f3717891c1bd
Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
(cherry picked from commit 8576a802caabffd5c5e94d614acc8dc954f0a443)
---
 util/linuxfw/iptables.go          | 4 +---
 util/linuxfw/iptables_disabled.go | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/util/linuxfw/iptables.go b/util/linuxfw/iptables.go
index 5bd7c528b..76c5400be 100644
--- a/util/linuxfw/iptables.go
+++ b/util/linuxfw/iptables.go
@@ -1,9 +1,7 @@
 // Copyright (c) Tailscale Inc & AUTHORS
 // SPDX-License-Identifier: BSD-3-Clause
 
-//go:build linux && (arm64 || amd64) && !ts_omit_iptables
-
-// TODO(#8502): add support for more architectures
+//go:build linux && !ts_omit_iptables
 
 package linuxfw
 
diff --git a/util/linuxfw/iptables_disabled.go b/util/linuxfw/iptables_disabled.go
index 8736f8399..538e33647 100644
--- a/util/linuxfw/iptables_disabled.go
+++ b/util/linuxfw/iptables_disabled.go
@@ -1,7 +1,7 @@
 // Copyright (c) Tailscale Inc & AUTHORS
 // SPDX-License-Identifier: BSD-3-Clause
 
-//go:build (linux && !(arm64 || amd64)) || ts_omit_iptables
+//go:build linux && ts_omit_iptables
 
 package linuxfw