Merge pull request #1751 from mslacken/RequireIgnition

Require ignition for mount and not only after

CHANGELOG.md

@@ -49,6 +49,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Don't add "default" profile to new nodes if it does not exist. #1721
 - Make DHCP range optional.
 - Don't use DHCP for interfaces attached to a bond. #1743
+- Wait until ignition has completed before trying to mount
 
 ### Removed
 

overlays/ignition/internal/ignition_test.go

@@ -91,6 +91,7 @@ Filename: scratch.mount
 [Unit]
 ConditionPathExists=/warewulf/ignition.json
 Before=local-fs.target
+Requires=ignition-ww4-disks.service
 After=ignition-ww4-disks.service
 [Mount]
 Where=/scratch
@@ -105,6 +106,7 @@ Filename: dev-disk-by\x2dpartlabel-swap.swap
 # This file is autogenerated by warewulf
 [Unit]
 ConditionPathExists=/warewulf/ignition.json
+Requires=ignition-ww4-disks.service
 After=ignition-ww4-disks.service
 Before=swap.target
 [Swap]

overlays/ignition/rootfs/etc/systemd/system/ww4-mounts.ww

@@ -10,6 +10,7 @@
 {{- if eq $fs.Format "swap"}}
 [Unit]
 ConditionPathExists=/warewulf/ignition.json
+Requires=ignition-ww4-disks.service
 After=ignition-ww4-disks.service
 Before=swap.target
 [Swap]
@@ -20,6 +21,7 @@ RequiredBy=swap.target
 [Unit]
 ConditionPathExists=/warewulf/ignition.json
 Before=local-fs.target
+Requires=ignition-ww4-disks.service
 After=ignition-ww4-disks.service
 [Mount]
 Where={{ $fs.Path }}