kelvin/warewulf
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Require ignition for mount and not only after

Browse Source 
Signed-off-by: Christian Goll <cgoll@suse.com>
This commit is contained in:
Christian Goll
2025-02-19 12:13:50 +01:00
committed by Jonathon Anderson
parent 9fd3b354e0
commit bd485817c1
3 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -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 - Don't add "default" profile to new nodes if it does not exist. #1721
- Make DHCP range optional. - Make DHCP range optional.
- Don't use DHCP for interfaces attached to a bond. #1743 - Don't use DHCP for interfaces attached to a bond. #1743
- Wait until ignition has completed before trying to mount
### Removed ### Removed

2
overlays/ignition/internal/ignition_test.go
View File

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

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

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