From 07dbd5b2a729b04ce46a60757f6ec30eeb36802b Mon Sep 17 00:00:00 2001
From: Jonathon Anderson <janderson@ciq.com>
Date: Thu, 21 Dec 2023 23:09:20 -0700
Subject: [PATCH] Only set persistent-net name if device is specified

persistent-net should not use the warewulf interface name as a default device
name because the network configuration scripts don't.

Signed-off-by: Jonathon Anderson <janderson@ciq.com>
---
 .../wwinit/etc/systemd/network/10-persistent-net.link.ww    | 6 +-----
 1 file changed, 1 insertion(+), 5 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 6a073dc7..159f74c2 100644
--- a/overlays/wwinit/etc/systemd/network/10-persistent-net.link.ww
+++ b/overlays/wwinit/etc/systemd/network/10-persistent-net.link.ww
@@ -5,14 +5,10 @@
 {{range $devname, $netdev := .NetDevs}}
 {{- $filename := print "10-persistent-net-" $devname ".link"}}
 {{- file $filename }}
-{{- if $netdev.Hwaddr }}
+{{- if and $netdev.Hwaddr $netdev.Device }}
 [Match]
 MACAddress={{$netdev.Hwaddr}}
 [Link]
-{{ if $netdev.Device -}}
 Name={{ $netdev.Device }}
-{{ else -}}
-Name={{ $devname }}
-{{ end -}}
 {{ end -}}
 {{end}}