Merge pull request #426 from mslacken/fix-persistent-net-link

Use Device for Link, fallback to name
2022-05-20 15:06:48 +02:00
parent 3c60433c9b b03d997cb0
commit 64f51db94d
2 changed files with 11 additions and 4 deletions
--- 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:
--- 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}}