TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-06-08 08:48:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

ipn/ipnlocal: support c2n updates with old systemd versions (#12296)

Browse Source 
The `--wait` flag for `systemd-run` was added in systemd 232. While it
is quite old, it doesn't hurt to special-case them and skip the `--wait`
flag. The consequence is that we lose the update command output in logs,
but at least auto-updates will work.

Fixes #12136

Signed-off-by: Andrew Lytvynov <awly@tailscale.com>
This commit is contained in:
Andrew Lytvynov 2024-05-30 16:55:02 -07:00 committed by GitHub
parent 1ea100e2e5
commit 776a05223b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 30 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
ipn/ipnlocal/c2n.go
View File

@ -478,17 +478,44 @@ func findCmdTailscale() (string, error) {
} }
func tailscaleUpdateCmd(cmdTS string) *exec.Cmd { func tailscaleUpdateCmd(cmdTS string) *exec.Cmd {
defaultCmd := exec.Command(cmdTS, "update", "--yes")
if runtime.GOOS != "linux" { if runtime.GOOS != "linux" {
return exec.Command(cmdTS, "update", "--yes") return defaultCmd
} }
if _, err := exec.LookPath("systemd-run"); err != nil { if _, err := exec.LookPath("systemd-run"); err != nil {
return exec.Command(cmdTS, "update", "--yes") return defaultCmd
} }
// When systemd-run is available, use it to run the update command. This // When systemd-run is available, use it to run the update command. This
// creates a new temporary unit separate from the tailscaled unit. When // creates a new temporary unit separate from the tailscaled unit. When
// tailscaled is restarted during the update, systemd won't kill this // tailscaled is restarted during the update, systemd won't kill this
// temporary update unit, which could cause unexpected breakage. // temporary update unit, which could cause unexpected breakage.
return exec.Command("systemd-run", "--wait", "--pipe", "--collect", cmdTS, "update", "--yes") //
// We want to use the --wait flag for systemd-run, to block the update
// command until completion and collect output. But this flag was added in
// systemd 232, so we need to check the version first.
//
// The output will look like:
//
// systemd 255 (255.7-1-arch)
// +PAM +AUDIT ... other feature flags ...
systemdVerOut, err := exec.Command("systemd-run", "--version").Output()
if err != nil {
return defaultCmd
}
parts := strings.Fields(string(systemdVerOut))
if len(parts) < 2 || parts[0] != "systemd" {
return defaultCmd
}
systemdVer, err := strconv.Atoi(parts[1])
if err != nil {
return defaultCmd
}
if systemdVer < 232 {
return exec.Command("systemd-run", "--pipe", "--collect", cmdTS, "update", "--yes")
} else {
return exec.Command("systemd-run", "--wait", "--pipe", "--collect", cmdTS, "update", "--yes")
}
} }
func regularFileExists(path string) bool { func regularFileExists(path string) bool {