From bb0c37763b9a754e645515edf8725439d3f5d04a Mon Sep 17 00:00:00 2001 From: Christian Goll Date: Thu, 7 Sep 2023 12:09:23 +0200 Subject: [PATCH] Revert "add error handling to dynamic network configuration" --- CHANGELOG.md | 1 - CONTRIBUTORS.md | 1 - internal/pkg/config/root.go | 5 +---- 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index db644f2b..bc0e55f1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -38,7 +38,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Add EL9 Quickstart guide to index.rst - Container file gids are now updated properly during syncuser. #840 - Fix build for API. -- Add error handling to `wwctl`'s dynamic IP configuration attempt. ### Changed diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 45127882..9b394cae 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -27,4 +27,3 @@ * Jeffrey Frey @jtfrey * Xu Yang(Jason Yang) @JasonYangShadow * Arnaud LECOMTE -* Matt Jolly diff --git a/internal/pkg/config/root.go b/internal/pkg/config/root.go index 3e641e6a..67c4447a 100644 --- a/internal/pkg/config/root.go +++ b/internal/pkg/config/root.go @@ -119,10 +119,7 @@ func (conf *RootConf) SetDynamicDefaults() (err error) { if conf.Ipaddr == "" { wwlog.Verbose("Configuration has no valid network, going to dynamic values") - conn, err := net.Dial("udp", "8.8.8.8:80") - if err != nil { - return errors.Wrap(err, "Couldn't establish a connection to remote") - } + conn, _ := net.Dial("udp", "8.8.8.8:80") defer conn.Close() ipaddr = conn.LocalAddr().(*net.UDPAddr).IP mask = ipaddr.DefaultMask()