From dff5567b11580df3f700f96c46970398f3bf1637 Mon Sep 17 00:00:00 2001
From: Gregory Kurtzer <gmkurtzer@gmail.com>
Date: Wed, 29 Dec 2021 17:30:01 -0800
Subject: [PATCH] More updates/fixes from testing

---
 internal/pkg/overlay/overlay.go                   |  3 ++-
 overlays/generic/etc/hosts.ww                     | 15 +--------------
 .../etc/systemd/network/10-persistent-net.link.ww |  4 +---
 3 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/internal/pkg/overlay/overlay.go b/internal/pkg/overlay/overlay.go
index 0d36dd90..d882556a 100644
--- a/internal/pkg/overlay/overlay.go
+++ b/internal/pkg/overlay/overlay.go
@@ -74,7 +74,7 @@ func BuildAllOverlays(nodes []node.NodeInfo) error {
 	for _, n := range nodes {
 		var overlays []string
 
-		overlays = append(overlays, "wwinit")
+		overlays = append(overlays, n.SystemOverlay.Get())
 		overlays = append(overlays, n.RuntimeOverlay.Get())
 
 		for _, overlay := range overlays {
@@ -194,6 +194,7 @@ func BuildOverlay(nodeInfo node.NodeInfo, overlayName string) error {
 		tstruct.NetDevs[devname].Gateway = netdev.Gateway.Get()
 		tstruct.NetDevs[devname].Type = netdev.Type.Get()
 		tstruct.NetDevs[devname].OnBoot = netdev.OnBoot.GetB()
+		tstruct.NetDevs[devname].Default = netdev.Default.GetB()
 
 		mask := net.IPMask(net.ParseIP(netdev.Netmask.Get()).To4())
 		ipaddr := net.ParseIP(netdev.Ipaddr.Get()).To4()
diff --git a/overlays/generic/etc/hosts.ww b/overlays/generic/etc/hosts.ww
index b4641eae..395adfcb 100644
--- a/overlays/generic/etc/hosts.ww
+++ b/overlays/generic/etc/hosts.ww
@@ -1,14 +1 @@
-127.0.0.1   localhost localhost.localdomain localhost4 localhost4.localdomain4
-::1         localhost localhost.localdomain localhost6 localhost6.localdomain6
-
-
-{{range $node := $.AllNodes}}
-# Entry for {{$node.Id.Get}}
-{{- range $devname, $netdev := $node.NetDevs}}
-{{- if eq $netdev.Name.Get "default"}}
-{{$netdev.Ipaddr.Get}} {{$node.Id.Get}}
-{{- else}}
-{{$netdev.Ipaddr.Get}} {{$node.Id.Get}}-{{$devname}}
-{{- end}}
-{{- end}}
-{{end}}
+{{Include "/etc/hosts"}}
\ No newline at end of file
diff --git a/overlays/wwinit/etc/systemd/network/10-persistent-net.link.ww b/overlays/wwinit/etc/systemd/network/10-persistent-net.link.ww
index 7dafb682..d335d0bc 100644
--- a/overlays/wwinit/etc/systemd/network/10-persistent-net.link.ww
+++ b/overlays/wwinit/etc/systemd/network/10-persistent-net.link.ww
@@ -1,11 +1,9 @@
 # /etc/systemd/network/10-persistent-net.link
-
 {{range $devname, $netdev := .NetDevs}}
-{{- if eq $netdev.Name "default"}}
+{{- if $netdev.Default}}
 [Match]
 MACAddress={{$netdev.Hwaddr}}
 [Link]
 Name={{$devname}}
 {{- end}}
 {{end}}
-