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

Merge upstream

Browse Source
This commit is contained in:
Carter Dodd
2022-05-13 19:42:18 -05:00
parent 379faad51d 8e88ac12e0
commit a36467b2a8
22 changed files with 88 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
internal/pkg/overlay/overlay.go
View File

@@ -254,7 +254,7 @@ func BuildOverlayIndir(nodeInfo node.NodeInfo, overlayNames []string, outputDir
tstruct.NetDevs[devname].Gateway = netdev.Gateway.Get()
tstruct.NetDevs[devname].Type = netdev.Type.Get()
tstruct.NetDevs[devname].OnBoot = netdev.OnBoot.Get()
tstruct.NetDevs[devname].Default = netdev.Default.Get()
tstruct.NetDevs[devname].Primary = netdev.Primary.Get()
mask := net.IPMask(net.ParseIP(netdev.Netmask.Get()).To4())
ipaddr := net.ParseIP(netdev.Ipaddr.Get()).To4()
netaddr := net.IPNet{IP: ipaddr, Mask: mask}