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

cmd/tailscale: fix broken build, result of borked stash pop.

This commit is contained in:
David Anderson 2020-06-02 04:27:28 +00:00
parent 3c7791f6bf
commit 83b6b06cc4
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cmd/tailscale/tailscale.go
View File

@ -107,12 +107,12 @@ change in the future.
var upArgs struct { var upArgs struct {
server string server string
acceptRoutes bool acceptRoutes bool
noSingleRoutes bool singleRoutes bool
shieldsUp bool shieldsUp bool
advertiseRoutes string advertiseRoutes string
advertiseTags string advertiseTags string
enableDERP bool enableDERP bool
noSNAT bool snat bool
netfilterMode string netfilterMode string
authKey string authKey string
} }
@ -200,11 +200,11 @@ func runUp(ctx context.Context, args []string) error {
prefs.ControlURL = upArgs.server prefs.ControlURL = upArgs.server
prefs.WantRunning = true prefs.WantRunning = true
prefs.RouteAll = upArgs.acceptRoutes prefs.RouteAll = upArgs.acceptRoutes
prefs.AllowSingleHosts = !upArgs.noSingleRoutes prefs.AllowSingleHosts = !upArgs.singleRoutes
prefs.ShieldsUp = upArgs.shieldsUp prefs.ShieldsUp = upArgs.shieldsUp
prefs.AdvertiseRoutes = routes prefs.AdvertiseRoutes = routes
prefs.AdvertiseTags = tags prefs.AdvertiseTags = tags
prefs.NoSNAT = upArgs.noSNAT prefs.NoSNAT = upArgs.snat
prefs.DisableDERP = !upArgs.enableDERP prefs.DisableDERP = !upArgs.enableDERP
if runtime.GOOS == "linux" { if runtime.GOOS == "linux" {
switch upArgs.netfilterMode { switch upArgs.netfilterMode {