From d343e06d816117089e5f03511368fe0df1ec08e6 Mon Sep 17 00:00:00 2001 From: Michael Stapelberg Date: Sat, 2 Jun 2018 17:36:36 +0200 Subject: [PATCH] netconfig: apply as much of the config as possible --- internal/netconfig/netconfig.go | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/internal/netconfig/netconfig.go b/internal/netconfig/netconfig.go index b85bf99..78e18d4 100644 --- a/internal/netconfig/netconfig.go +++ b/internal/netconfig/netconfig.go @@ -243,21 +243,30 @@ func Apply(iface, dir string) error { return err } + var firstErr error + if err := applyDhcp4(iface, dir); err != nil { - return err + log.Printf("cannot apply dhcp4 lease: %v", err) + firstErr = err } if err := applyDhcp6(iface, dir); err != nil { - return err + log.Printf("cannot apply dhcp6 lease: %v", err) + if firstErr == nil { + firstErr = err + } } if err := applySysctl(); err != nil { - return err + log.Printf("cannot apply sysctl config: %v", err) + if firstErr == nil { + firstErr = err + } } if err := applyFirewall(); err != nil { return err } - return nil + return firstErr }