mirror of
https://github.com/tailscale/tailscale.git
synced 2025-12-23 09:06:24 +00:00
util/linuxfw: fix 32-bit arm regression with iptables
This fixes a regression fromdd615c8fddthat 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 commit8576a802ca)
This commit is contained in:
@@ -1,9 +1,7 @@
|
|||||||
// Copyright (c) Tailscale Inc & AUTHORS
|
// Copyright (c) Tailscale Inc & AUTHORS
|
||||||
// SPDX-License-Identifier: BSD-3-Clause
|
// SPDX-License-Identifier: BSD-3-Clause
|
||||||
|
|
||||||
//go:build linux && (arm64 || amd64) && !ts_omit_iptables
|
//go:build linux && !ts_omit_iptables
|
||||||
|
|
||||||
// TODO(#8502): add support for more architectures
|
|
||||||
|
|
||||||
package linuxfw
|
package linuxfw
|
||||||
|
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
// Copyright (c) Tailscale Inc & AUTHORS
|
// Copyright (c) Tailscale Inc & AUTHORS
|
||||||
// SPDX-License-Identifier: BSD-3-Clause
|
// SPDX-License-Identifier: BSD-3-Clause
|
||||||
|
|
||||||
//go:build (linux && !(arm64 || amd64)) || ts_omit_iptables
|
//go:build linux && ts_omit_iptables
|
||||||
|
|
||||||
package linuxfw
|
package linuxfw
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user