kelvin/warewulf
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Revert "add error handling to dynamic network configuration"

Browse Source
This commit is contained in:
Christian Goll
2023-09-07 12:09:23 +02:00
committed by GitHub
parent 7dc2061b20
commit bb0c37763b
3 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -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 - Add EL9 Quickstart guide to index.rst
- Container file gids are now updated properly during syncuser. #840 - Container file gids are now updated properly during syncuser. #840
- Fix build for API. - Fix build for API.
- Add error handling to `wwctl`'s dynamic IP configuration attempt.
### Changed ### Changed

1
CONTRIBUTORS.md
View File

@@ -27,4 +27,3 @@
* Jeffrey Frey @jtfrey * Jeffrey Frey @jtfrey
* Xu Yang(Jason Yang) <jasonyangshadow@gmail.com> @JasonYangShadow * Xu Yang(Jason Yang) <jasonyangshadow@gmail.com> @JasonYangShadow
* Arnaud LECOMTE <contact@arnaud-lcm.com> * Arnaud LECOMTE <contact@arnaud-lcm.com>
* Matt Jolly <Matt.Jolly@footclan.ninja>

5
internal/pkg/config/root.go
View File

@@ -119,10 +119,7 @@ func (conf *RootConf) SetDynamicDefaults() (err error) {
if conf.Ipaddr == "" { if conf.Ipaddr == "" {
wwlog.Verbose("Configuration has no valid network, going to dynamic values") wwlog.Verbose("Configuration has no valid network, going to dynamic values")
conn, err := net.Dial("udp", "8.8.8.8:80") conn, _ := net.Dial("udp", "8.8.8.8:80")
if err != nil {
return errors.Wrap(err, "Couldn't establish a connection to remote")
}
defer conn.Close() defer conn.Close()
ipaddr = conn.LocalAddr().(*net.UDPAddr).IP ipaddr = conn.LocalAddr().(*net.UDPAddr).IP
mask = ipaddr.DefaultMask() mask = ipaddr.DefaultMask()