Merge branch 'main' of github.com:hpcng/warewulf into overlay_refactor

This commit is contained in:
Gregory Kurtzer
2022-01-06 00:37:17 +00:00
5 changed files with 38 additions and 4 deletions

View File

@@ -87,7 +87,11 @@ func (config *nodeYaml) FindAllNodes() ([]NodeInfo, error) {
n.NetDevs[devname] = &netdev
}
n.NetDevs[devname].Device.Set(netdev.Device)
if netdev.Device != "" {
n.NetDevs[devname].Device.Set(netdev.Device)
} else {
n.NetDevs[devname].Device.Set(devname)
}
n.NetDevs[devname].Ipaddr.Set(netdev.Ipaddr)
n.NetDevs[devname].Netmask.Set(netdev.Netmask)
n.NetDevs[devname].Hwaddr.Set(netdev.Hwaddr)