mirror of
https://github.com/tailscale/tailscale.git
synced 2024-12-04 23:45:34 +00:00
cmd/tailscaled: disambiguate some startup failure error messages
Updates #3351
Change-Id: I0afead4a084623567f56b19187574fa97b295b2a
Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
(cherry picked from commit 5294125e7a
)
This commit is contained in:
parent
71f1dd5aa2
commit
1b9fbdc057
@ -440,14 +440,14 @@ func tryEngine(logf logger.Logf, linkMon *monitor.Mon, name string) (e wgengine.
|
|||||||
log.Printf("Connecting to BIRD at %s ...", args.birdSocketPath)
|
log.Printf("Connecting to BIRD at %s ...", args.birdSocketPath)
|
||||||
conf.BIRDClient, err = createBIRDClient(args.birdSocketPath)
|
conf.BIRDClient, err = createBIRDClient(args.birdSocketPath)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, false, err
|
return nil, false, fmt.Errorf("createBIRDClient: %w", err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if !useNetstack {
|
if !useNetstack {
|
||||||
dev, devName, err := tstun.New(logf, name)
|
dev, devName, err := tstun.New(logf, name)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
tstun.Diagnose(logf, name)
|
tstun.Diagnose(logf, name)
|
||||||
return nil, false, err
|
return nil, false, fmt.Errorf("tstun.New(%q): %w", name, err)
|
||||||
}
|
}
|
||||||
conf.Tun = dev
|
conf.Tun = dev
|
||||||
if strings.HasPrefix(name, "tap:") {
|
if strings.HasPrefix(name, "tap:") {
|
||||||
@ -459,11 +459,11 @@ func tryEngine(logf logger.Logf, linkMon *monitor.Mon, name string) (e wgengine.
|
|||||||
r, err := router.New(logf, dev, linkMon)
|
r, err := router.New(logf, dev, linkMon)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
dev.Close()
|
dev.Close()
|
||||||
return nil, false, err
|
return nil, false, fmt.Errorf("creating router: %w", err)
|
||||||
}
|
}
|
||||||
d, err := dns.NewOSConfigurator(logf, devName)
|
d, err := dns.NewOSConfigurator(logf, devName)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, false, err
|
return nil, false, fmt.Errorf("dns.NewOSConfigurator: %w", err)
|
||||||
}
|
}
|
||||||
conf.DNS = d
|
conf.DNS = d
|
||||||
conf.Router = r
|
conf.Router = r
|
||||||
|
Loading…
Reference in New Issue
Block a user