mirrors
/
tailscale
mirror of https://github.com/tailscale/tailscale.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

tailfs: fix startup issues on windows 

Starts TailFS for Windows too, initializes shares on startup.

Updates tailscale/corp#16827

Signed-off-by: Percy Wegmann <percy@tailscale.com>
This commit is contained in:
Percy Wegmann 2024-02-09 16:23:42 -06:00 committed by Percy Wegmann
parent ddcffaef7a
commit 87154a2f88
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmd/tailscaled/tailscaled_windows.go
View File

@ -48,6 +48,7 @@ import (
"tailscale.com/net/dns" "tailscale.com/net/dns"
"tailscale.com/net/netmon" "tailscale.com/net/netmon"
"tailscale.com/net/tstun" "tailscale.com/net/tstun"
"tailscale.com/tailfs/tailfsimpl"
"tailscale.com/tsd" "tailscale.com/tsd"
"tailscale.com/types/logger" "tailscale.com/types/logger"
"tailscale.com/types/logid" "tailscale.com/types/logid"
@ -315,6 +316,8 @@ func beWindowsSubprocess() bool {
} }
sys.Set(netMon) sys.Set(netMon)
sys.Set(tailfsimpl.NewFileSystemForRemote(log.Printf))
publicLogID, _ := logid.ParsePublicID(logID) publicLogID, _ := logid.ParsePublicID(logID)
err = startIPNServer(ctx, log.Printf, publicLogID, sys) err = startIPNServer(ctx, log.Printf, publicLogID, sys)
if err != nil { if err != nil {

2
ipn/ipnlocal/local.go
View File

@ -432,7 +432,7 @@ func NewLocalBackend(logf logger.Logf, logID logid.PublicID, sys *tsd.System, lo
// initialize TailFS shares from saved state // initialize TailFS shares from saved state
fs, ok := b.sys.TailFSForRemote.GetOK() fs, ok := b.sys.TailFSForRemote.GetOK()
if !ok { if ok {
b.mu.Lock() b.mu.Lock()
shares, err := b.tailFSGetSharesLocked() shares, err := b.tailFSGetSharesLocked()
b.mu.Unlock() b.mu.Unlock()