TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2024-11-29 04:55:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

release/dist/unixpkgs: demote deb iptables+iproute2 packages to recommended

Browse Source 
Fixes #9236

Change-Id: Idbad2edb0262ef842afd6b40ae47f46e685b112d
Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
This commit is contained in:
Brad Fitzpatrick 2023-09-07 13:21:02 -07:00 committed by Brad Fitzpatrick
parent 50990f8931
commit 1bd3edbb46
1 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
release/dist/unixpkgs/pkgs.go vendored
View File

@ -250,10 +250,25 @@ func (t *debTarget) Build(b *dist.Build) ([]string, error) {
PreRemove: filepath.Join(repoDir, "release/deb/debian.prerm.sh"), PreRemove: filepath.Join(repoDir, "release/deb/debian.prerm.sh"),
PostRemove: filepath.Join(repoDir, "release/deb/debian.postrm.sh"), PostRemove: filepath.Join(repoDir, "release/deb/debian.postrm.sh"),
}, },
Depends: []string{"iptables", "iproute2"}, Depends: []string{},
Recommends: []string{"tailscale-archive-keyring (>= 1.35.181)"}, Recommends: []string{
Replaces: []string{"tailscale-relay"}, "tailscale-archive-keyring (>= 1.35.181)",
Conflicts: []string{"tailscale-relay"}, // iptables is often required but not strictly needed; see
// https://github.com/tailscale/tailscale/issues/9236.
// We want to let people be able to install without it
// or remove it after the fact if they want.
"iptables",
// The "ip" command isn't needed since 2021-11-01 in
// 408b0923a61972ed but kept as an option as of
// 2021-11-18 in d24ed3f68e35e802d531371. See
// https://github.com/tailscale/tailscale/issues/391.
// We keep it recommended because it's usually
// installed anyway and it's useful for debugging. But
// we can live without it, so it's not Depends.
"iproute2",
},
Replaces: []string{"tailscale-relay"},
Conflicts: []string{"tailscale-relay"},
}, },
}) })
pkg, err := nfpm.Get("deb") pkg, err := nfpm.Get("deb")