TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2024-11-25 19:15:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

clientupdate,ipn/ipnlocal: fix c2n update on freebsd (#10168)

Browse Source 
The c2n part was broken because we were not looking up the tailscale
binary for that GOOS. The rest of the update was failing at the `pkg
upgrade` confirmation prompt. We also need to manually restart
tailscaled after update.

Updates #cleanup

Signed-off-by: Andrew Lytvynov <awly@tailscale.com>
This commit is contained in:
Andrew Lytvynov 2023-11-08 18:56:00 -07:00 committed by GitHub
parent d544e80fc1
commit bff786520e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 30 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
clientupdate/clientupdate.go
View File

@ -606,11 +606,11 @@ func (up *Updater) updateAlpineLike() (err error) {
out, err := exec.Command("apk", "update").CombinedOutput() out, err := exec.Command("apk", "update").CombinedOutput()
if err != nil { if err != nil {
return fmt.Errorf("failed refresh apk repository indexes: %w, output: %q", err, out) return fmt.Errorf("failed refresh apk repository indexes: %w, output:\n%s", err, out)
} }
out, err = exec.Command("apk", "info", "tailscale").CombinedOutput() out, err = exec.Command("apk", "info", "tailscale").CombinedOutput()
if err != nil { if err != nil {
return fmt.Errorf("failed checking apk for latest tailscale version: %w, output: %q", err, out) return fmt.Errorf("failed checking apk for latest tailscale version: %w, output:\n%s", err, out)
} }
ver, err := parseAlpinePackageVersion(out) ver, err := parseAlpinePackageVersion(out)
if err != nil { if err != nil {
@ -658,7 +658,7 @@ func (up *Updater) updateMacAppStore() error {
out, err := exec.Command("open", "https://apps.apple.com/us/app/tailscale/id1475387142").CombinedOutput() out, err := exec.Command("open", "https://apps.apple.com/us/app/tailscale/id1475387142").CombinedOutput()
if err != nil { if err != nil {
return fmt.Errorf("can't open the Tailscale page in App Store: %w, output: %q", err, string(out)) return fmt.Errorf("can't open the Tailscale page in App Store: %w, output:\n%s", err, string(out))
} }
return nil return nil
} }
@ -925,23 +925,29 @@ func (up *Updater) updateFreeBSD() (err error) {
out, err := exec.Command("pkg", "update").CombinedOutput() out, err := exec.Command("pkg", "update").CombinedOutput()
if err != nil { if err != nil {
return fmt.Errorf("failed refresh pkg repository indexes: %w, output: %q", err, out) return fmt.Errorf("failed refresh pkg repository indexes: %w, output:\n%s", err, out)
} }
out, err = exec.Command("pkg", "rquery", "%v", "tailscale").CombinedOutput() out, err = exec.Command("pkg", "rquery", "%v", "tailscale").CombinedOutput()
if err != nil { if err != nil {
return fmt.Errorf("failed checking pkg for latest tailscale version: %w, output: %q", err, out) return fmt.Errorf("failed checking pkg for latest tailscale version: %w, output:\n%s", err, out)
} }
ver := string(bytes.TrimSpace(out)) ver := string(bytes.TrimSpace(out))
if !up.confirm(ver) { if !up.confirm(ver) {
return nil return nil
} }
cmd := exec.Command("pkg", "upgrade", "tailscale") cmd := exec.Command("pkg", "upgrade", "-y", "tailscale")
cmd.Stdout = up.Stdout cmd.Stdout = up.Stdout
cmd.Stderr = up.Stderr cmd.Stderr = up.Stderr
if err := cmd.Run(); err != nil { if err := cmd.Run(); err != nil {
return fmt.Errorf("failed tailscale update using pkg: %w", err) return fmt.Errorf("failed tailscale update using pkg: %w", err)
} }
// pkg does not automatically restart services after upgrade.
out, err = exec.Command("service", "tailscaled", "restart").CombinedOutput()
if err != nil {
return fmt.Errorf("failed to restart tailscaled after update: %w, output:\n%s", err, out)
}
return nil return nil
} }

25
ipn/ipnlocal/c2n.go
View File

@ -332,24 +332,33 @@ func findCmdTailscale() (string, error) {
if err != nil { if err != nil {
return "", err return "", err
} }
var ts string
switch runtime.GOOS { switch runtime.GOOS {
case "linux": case "linux":
if self == "/usr/sbin/tailscaled" || self == "/usr/bin/tailscaled" { if self == "/usr/sbin/tailscaled" || self == "/usr/bin/tailscaled" {
return "/usr/bin/tailscale", nil ts = "/usr/bin/tailscale"
} }
if self == "/usr/local/sbin/tailscaled" || self == "/usr/local/bin/tailscaled" { if self == "/usr/local/sbin/tailscaled" || self == "/usr/local/bin/tailscaled" {
return "/usr/local/bin/tailscale", nil ts = "/usr/local/bin/tailscale"
} }
return "", errors.New("tailscale not found in expected place")
case "windows": case "windows":
dir := filepath.Dir(self) ts = filepath.Join(filepath.Dir(self), "tailscale.exe")
ts := filepath.Join(dir, "tailscale.exe") case "freebsd":
if fi, err := os.Stat(ts); err == nil && fi.Mode().IsRegular() { if self == "/usr/local/bin/tailscaled" {
ts = "/usr/local/bin/tailscale"
}
default:
return "", fmt.Errorf("unsupported OS %v", runtime.GOOS)
}
if ts != "" && regularFileExists(ts) {
return ts, nil return ts, nil
} }
return "", errors.New("tailscale.exe not found in expected place") return "", errors.New("tailscale executable not found in expected place")
} }
return "", fmt.Errorf("unsupported OS %v", runtime.GOOS)
func regularFileExists(path string) bool {
fi, err := os.Stat(path)
return err == nil && fi.Mode().IsRegular()
} }
func (b *LocalBackend) handleC2NWoL(w http.ResponseWriter, r *http.Request) { func (b *LocalBackend) handleC2NWoL(w http.ResponseWriter, r *http.Request) {