From 12496d89c761cc3054cee8fbe23eb75c0372d5b0 Mon Sep 17 00:00:00 2001
From: John Hanks <griznog@gmail.com>
Date: Wed, 28 Feb 2024 06:37:38 -0600
Subject: [PATCH] Fixing result of over aggressive sed expression.

---
 overlays/wwinit/rootfs/etc/systemd/system/ww4-disks.target.ww | 2 +-
 overlays/wwinit/rootfs/etc/systemd/system/ww4-mounts.ww       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/overlays/wwinit/rootfs/etc/systemd/system/ww4-disks.target.ww b/overlays/wwinit/rootfs/etc/systemd/system/ww4-disks.target.ww
index 314fa37f..74f4e8ee 100644
--- a/overlays/wwinit/rootfs/etc/systemd/system/ww4-disks.target.ww
+++ b/overlays/wwinit/rootfs/etc/systemd/system/ww4-disks.target.ww
@@ -15,7 +15,7 @@ Requisite=ignition-ww4-disks.service
 {{- $prefix = replace "/" "-" $prefix }}
 {{- $prefix = slice $prefix 1 }}{{ $suffix := "mount" }}
 {{- if eq $fs.Format "swap"}}
-{{- $prefix = replace "/dev/disk/by-partlabel/" "dev-disk-by\\x2dpartlabel-"}}{{ $fsdevice $suffix = "swap"}}
+{{- $prefix = replace "/dev/disk/by-partlabel/" "dev-disk-by\\x2dpartlabel-" $fsdevice }}{{ $suffix = "swap"}}
 {{- else }}
 {{- if ne $fs.Path "" }}
 {{- $prefix = replace "-" "\\x2d" $fs.Path }}
diff --git a/overlays/wwinit/rootfs/etc/systemd/system/ww4-mounts.ww b/overlays/wwinit/rootfs/etc/systemd/system/ww4-mounts.ww
index c2a96d55..d6343210 100644
--- a/overlays/wwinit/rootfs/etc/systemd/system/ww4-mounts.ww
+++ b/overlays/wwinit/rootfs/etc/systemd/system/ww4-mounts.ww
@@ -7,7 +7,7 @@
 {{- $prefix = slice $prefix 1 }}
 {{ $suffix := "mount"}}
 {{- if $fs.Label }}{{ $prefix = $fs.Label }}{{ end }}
-{{- if eq $fs.Format "swap"}}{{ $prefix = replace "/dev/disk/by-partlabel/" "dev-disk-by\\x2dpartlabel-"}}{{ $fsdevice $suffix = "swap"}}{{ end }}
+{{- if eq $fs.Format "swap" }}{{ $prefix = replace "/dev/disk/by-partlabel/" "dev-disk-by\\x2dpartlabel-" $fsdevice }}{{ $suffix = "swap" }}{{ end }}
 {{- $filename := print $prefix "."  $suffix  }}
 {{- file $filename }}
 # This file is autogenerated by warewulf