From c41947903ac89ac6fdbbaae9d71e92ef62c5943a Mon Sep 17 00:00:00 2001
From: Brad Fitzpatrick <bradfitz@tailscale.com>
Date: Thu, 17 Sep 2020 07:59:55 -0700
Subject: [PATCH] ipn: don't log if legacy prefs don't exist (the normal case
 these days)

---
 ipn/local.go | 5 ++++-
 ipn/prefs.go | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/ipn/local.go b/ipn/local.go
index fc994bcd1..c981e66ff 100644
--- a/ipn/local.go
+++ b/ipn/local.go
@@ -8,6 +8,7 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"os"
 	"strings"
 	"sync"
 	"time"
@@ -669,7 +670,9 @@ func (b *LocalBackend) loadStateLocked(key StateKey, prefs *Prefs, legacyPath st
 			if legacyPath != "" {
 				b.prefs, err = LoadPrefs(legacyPath)
 				if err != nil {
-					b.logf("Failed to load legacy prefs: %v", err)
+					if !os.IsNotExist(err) {
+						b.logf("Failed to load legacy prefs: %v", err)
+					}
 					b.prefs = NewPrefs()
 				} else {
 					b.logf("Imported state from relaynode for %q", key)
diff --git a/ipn/prefs.go b/ipn/prefs.go
index 50759e1bd..5febba4e9 100644
--- a/ipn/prefs.go
+++ b/ipn/prefs.go
@@ -228,11 +228,11 @@ func (p *Prefs) Clone() *Prefs {
 func LoadPrefs(filename string) (*Prefs, error) {
 	data, err := ioutil.ReadFile(filename)
 	if err != nil {
-		return nil, fmt.Errorf("loading prefs from %q: %v", filename, err)
+		return nil, fmt.Errorf("LoadPrefs open: %w", err) // err includes path
 	}
 	p, err := PrefsFromBytes(data, false)
 	if err != nil {
-		return nil, fmt.Errorf("decoding prefs in %q: %v", filename, err)
+		return nil, fmt.Errorf("LoadPrefs(%q) decode: %w", filename, err)
 	}
 	return p, nil
 }