From fdd2201ef52b8baff7109bc04543494b34398237 Mon Sep 17 00:00:00 2001
From: Michael Stapelberg <stapelberg@google.com>
Date: Thu, 14 Jun 2018 18:28:40 +0200
Subject: [PATCH] netconfig: prevent duplicate error messages

---
 internal/netconfig/netconfig.go | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/internal/netconfig/netconfig.go b/internal/netconfig/netconfig.go
index 68e8867..d19ac80 100644
--- a/internal/netconfig/netconfig.go
+++ b/internal/netconfig/netconfig.go
@@ -434,21 +434,26 @@ func Apply(dir, root string) error {
 	var firstErr error
 
 	if err := applyDhcp4(dir); err != nil {
-		log.Printf("cannot apply dhcp4 lease: %v", err)
-		firstErr = fmt.Errorf("dhcp4: %v", err)
+		if firstErr == nil {
+			firstErr = fmt.Errorf("dhcp4: %v", err)
+		} else {
+			log.Printf("cannot apply dhcp4 lease: %v", err)
+		}
 	}
 
 	if err := applyDhcp6(dir); err != nil {
-		log.Printf("cannot apply dhcp6 lease: %v", err)
 		if firstErr == nil {
 			firstErr = fmt.Errorf("dhcp6: %v", err)
+		} else {
+			log.Printf("cannot apply dhcp6 lease: %v", err)
 		}
 	}
 
 	if err := applySysctl(); err != nil {
-		log.Printf("cannot apply sysctl config: %v", err)
 		if firstErr == nil {
 			firstErr = fmt.Errorf("sysctl: %v", err)
+		} else {
+			log.Printf("cannot apply sysctl config: %v", err)
 		}
 	}