From 836d28559e9ea4377b844aec4a8aeb683f367594 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Tue, 15 Apr 2025 16:04:21 +0200
Subject: [slx-dmsetup] Try to get swap-service to actually run after we
 detected all HDDs

---
 modules.d/slx-dmsetup/module-setup.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'modules.d')

diff --git a/modules.d/slx-dmsetup/module-setup.sh b/modules.d/slx-dmsetup/module-setup.sh
index 538b050e..dedd5f89 100755
--- a/modules.d/slx-dmsetup/module-setup.sh
+++ b/modules.d/slx-dmsetup/module-setup.sh
@@ -27,14 +27,16 @@ install() {
 
 	slx_service "s3-mount-swap" "Mount existing swap partitions" \
 		--before   "s3-cow-setup.service" \
-		--wafter    "systemd-udevd.service"
+		--wafter   "systemd-udev-trigger.service" \
+		--wafter   "systemd-udevd.service"
 
 	slx_service "s3-prepare-rw-layer" "Prepare suitable partitions for use as write layer" \
 		--before   "s3-cow-setup.service"
 
 	slx_service "s3-scan-id44" "Scan for partitions marked as scratch space (ID44)" \
 		--before   "s3-prepare-rw-layer.service" \
-		--after    "s3-fetch-config.service"
+		--wafter   "systemd-udev-trigger.service" \
+		--wafter   "s3-fetch-config.service"
 
 	inst_multiple blockdev xxd \
 		mkfs.ext4 resize2fs \
-- 
cgit v1.2.3-55-g7522