lzc256
/
tailscale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ipn: load hostname in Start. 

This prevents hostname being forced to os.Hostname despite override
when control is contacted for the first time after starting tailscaled.

Signed-off-by: Dmytro Shynkevych <dmytro@tailscale.com>
reviewable/pr590/r1
Dmytro Shynkevych 2020-07-22 13:37:41 -04:00
parent de11f90d9d
commit 218de6d530
No known key found for this signature in database
GPG Key ID: FF5E2F3DAD97EA23
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ipn/local.go
View File

@ -353,6 +353,9 @@ func (b *LocalBackend) Start(opts Options) error {
b.serverURL = b.prefs.ControlURL b.serverURL = b.prefs.ControlURL
hostinfo.RoutableIPs = append(hostinfo.RoutableIPs, b.prefs.AdvertiseRoutes...) hostinfo.RoutableIPs = append(hostinfo.RoutableIPs, b.prefs.AdvertiseRoutes...)
hostinfo.RequestTags = append(hostinfo.RequestTags, b.prefs.AdvertiseTags...) hostinfo.RequestTags = append(hostinfo.RequestTags, b.prefs.AdvertiseTags...)
if b.prefs.Hostname != "" {
hostinfo.Hostname = b.prefs.Hostname
}
b.notify = opts.Notify b.notify = opts.Notify
b.netMap = nil b.netMap = nil