From cfce50ba52fabf41c8f95e6424b150390e7a8384 Mon Sep 17 00:00:00 2001
From: Gregory Kurtzer <gmkurtzer@gmail.com>
Date: Tue, 24 May 2022 21:57:47 -0700
Subject: [PATCH] Some minor runtime template updates

---
 overlays/generic/etc/group.ww  |  2 +-
 overlays/generic/etc/hosts.ww  | 20 +++++++++++++++++++-
 overlays/generic/etc/passwd.ww |  3 +++
 3 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/overlays/generic/etc/group.ww b/overlays/generic/etc/group.ww
index 8005528f..ec6e50b2 100644
--- a/overlays/generic/etc/group.ww
+++ b/overlays/generic/etc/group.ww
@@ -1,2 +1,2 @@
 {{IncludeFrom $.Container "/etc/group"}}
-{{Include "/etc/group"}}
+{{Include "/etc/group"}}
\ No newline at end of file
diff --git a/overlays/generic/etc/hosts.ww b/overlays/generic/etc/hosts.ww
index 395adfcb..c1c2e5a8 100644
--- a/overlays/generic/etc/hosts.ww
+++ b/overlays/generic/etc/hosts.ww
@@ -1 +1,19 @@
-{{Include "/etc/hosts"}}
\ No newline at end of file
+127.0.0.1   localhost localhost.localdomain localhost4 localhost4.localdomain4
+::1         localhost localhost.localdomain localhost6 localhost6.localdomain6
+
+
+
+# Warewulf Server
+{{$.Ipaddr}} {{$.BuildHost}}
+
+{{-range $node := $.AllNodes}}                  {{/* for each node */}}
+# Entry for {{$node.Id.Get}}
+{{- range $devname, $netdev := $node.NetDevs}} {{/* for each network device on the node */}}
+{{- if $netdev.Ipaddr.Defined}}                {{/* if we have an ip address on this network device */}}
+{{- /* emit the node name as hostname if this is the primary */}}
+{{$netdev.Ipaddr.Get}} {{$node.Id.Get}}-{{$devname}}
+{{- if $netdev.Device.Defined}} {{$node.Id.Get}}-{{$netdev.Device.Get}}{{end}}
+{{- if $netdev.Primary.GetB}} {{$node.Id.Get}}{{end}}
+{{- end}} {{/* end if ip */}}
+{{- end}} {{/* end for each network device */}}
+{{- end}} {{/* end for each node */}}
diff --git a/overlays/generic/etc/passwd.ww b/overlays/generic/etc/passwd.ww
index abace04d..70a04234 100644
--- a/overlays/generic/etc/passwd.ww
+++ b/overlays/generic/etc/passwd.ww
@@ -1 +1,4 @@
+# Uncomment the following line to enable passwordless root login
+# root::0:0:root:/root:/bin/bash
 {{IncludeFrom $.Container "/etc/passwd"}}
+{{Include "/etc/passwd"}}
\ No newline at end of file