Skip to content

Commit c81ef90

Browse files
committed
util/linuxfw: fix 32-bit arm regression with iptables
This fixes a regression from dd615c8 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 tailscale#17629. Fixes tailscale#17623 Updates tailscale#17629 Change-Id: Iac1a3d78f35d8428821b46f0fed3f3717891c1bd Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com> (cherry picked from commit 8576a80)
1 parent 9fe44b3 commit c81ef90

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

util/linuxfw/iptables.go

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
// Copyright (c) Tailscale Inc & AUTHORS
22
// SPDX-License-Identifier: BSD-3-Clause
33

4-
//go:build linux && (arm64 || amd64) && !ts_omit_iptables
5-
6-
// TODO(#8502): add support for more architectures
4+
//go:build linux && !ts_omit_iptables
75

86
package linuxfw
97

util/linuxfw/iptables_disabled.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Copyright (c) Tailscale Inc & AUTHORS
22
// SPDX-License-Identifier: BSD-3-Clause
33

4-
//go:build (linux && !(arm64 || amd64)) || ts_omit_iptables
4+
//go:build linux && ts_omit_iptables
55

66
package linuxfw
77

0 commit comments

Comments
 (0)