cmd/tailscaled: fix state path for windows svc

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

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)