From 26c6ff39bcc865b9b4d77c11490e169683a7d972 Mon Sep 17 00:00:00 2001
From: Christian Goll <cgoll@suse.de>
Date: Thu, 19 May 2022 11:11:32 +0200
Subject: [PATCH 1/2] Use Device for Link, fallback to name

If  for the provison network an arbitary name, like overlay is used not default, the Name for the network device was the network name and not the physical device.
---
 .../etc/systemd/network/10-persistent-net.link.ww   | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

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 4bfcd3fa..e56c063c 100644
--- a/overlays/wwinit/etc/systemd/network/10-persistent-net.link.ww
+++ b/overlays/wwinit/etc/systemd/network/10-persistent-net.link.ww
@@ -1,9 +1,16 @@
-# /etc/systemd/network/10-persistent-net.link
+# This file is autogenerated by warewulf 
+# Host:   {{.BuildHost}}
+# Time:   {{.BuildTime}}
+# Source: {{.BuildSource}}
 {{range $devname, $netdev := .NetDevs}}
 {{- if $netdev.Primary}}
 [Match]
 MACAddress={{$netdev.Hwaddr}}
 [Link]
-Name={{$devname}}
-{{- end}}
+{{ if $netdev.Device -}}
+Name={{ $netdev.Device }}
+{{ else -}}
+Name={{ $devname }}
+{{ end -}}
+{{ end -}}
 {{end}}

From b03d997cb0132b80f80b7bf6242900b85a8c003d Mon Sep 17 00:00:00 2001
From: Christian Goll <cgoll@suse.de>
Date: Thu, 19 May 2022 11:23:52 +0200
Subject: [PATCH 2/2] Kernel override/version needs not to bet set

---
 overlays/wwinit/etc/issue.ww | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/overlays/wwinit/etc/issue.ww b/overlays/wwinit/etc/issue.ww
index 38088e3d..d526a2b6 100644
--- a/overlays/wwinit/etc/issue.ww
+++ b/overlays/wwinit/etc/issue.ww
@@ -1,6 +1,6 @@
 Warewulf Node:      {{.Id}}
 Container:          {{.Container}}
-Kernel:             {{.Kernel.Version}}
+{{ if .Kernel.Version }}Kernel:             {{.Kernel.Version}} {{ end -}}
 Kernelargs:         {{.Kernel.Args}}
 
 Network: