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

cmd/tailscaled: fix state path for windows svc

Browse Source 
Signed-off-by: James Tucker <james@tailscale.com>
This commit is contained in:
James Tucker 2022-05-26 15:06:46 -07:00 committed by James Tucker
parent c163b2a3f1
commit 3f686688a6
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
cmd/tailscaled/tailscaled.go
View File

@ -158,13 +158,12 @@ func main() {
}
}
if beWindowsSubprocess() {
return
}
flag.Parse()
if flag.NArg() > 0 {
log.Fatalf("tailscaled does not take non-flag arguments: %q", flag.Args())
// Windows subprocess is spawned with /subprocess, so we need to avoid this check there.
if runtime.GOOS != "windows" || flag.Arg(0) != "/subproc" {
log.Fatalf("tailscaled does not take non-flag arguments: %q", flag.Args())
}
}
if printVersion {
@ -193,6 +192,10 @@ func main() {
args.statepath = paths.DefaultTailscaledStateFile()
}
if beWindowsSubprocess() {
return
}
err := run()
// Remove file sharing from Windows shell (noop in non-windows)

4
cmd/tailscaled/tailscaled_windows.go
View File

@ -260,7 +260,7 @@ func startIPNServer(ctx context.Context, logid string) error {
linkMon, err := monitor.New(logf)
if err != nil {
return err
return fmt.Errorf("monitor: %w", err)
}
dialer := new(tsdial.Dialer)
@ -367,7 +367,7 @@ type engineOrError struct {
}
store, err := store.New(logf, statePathOrDefault())
if err != nil {
return err
return fmt.Errorf("store: %w", err)
}
ln, _, err := safesocket.Listen(args.socketpath, safesocket.WindowsLocalPort)