From 568eef2f8b9cd43f22cf4b111190e355cd7cb799 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Thu, 1 Feb 2024 10:26:17 +0100
Subject: Link all services in initrd.target.wants

---
 modules.d/conf-tgz/module-setup.sh                           |  8 ++------
 modules.d/slx-addons/module-setup.sh                         |  4 ++--
 modules.d/slx-drm/module-setup.sh                            |  4 ++--
 modules.d/slx-network/module-setup.sh                        | 12 ++++++------
 modules.d/slx-network/services/s3-parse-network-kcl.service  |  2 ++
 .../slx-network/services/s3-setup-bootif-network.service     |  2 --
 modules.d/slx-runmode/module-setup.sh                        |  4 ++--
 modules.d/slx-ssl/module-setup.sh                            |  4 ++--
 8 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/modules.d/conf-tgz/module-setup.sh b/modules.d/conf-tgz/module-setup.sh
index 29aae9ea..936d4356 100755
--- a/modules.d/conf-tgz/module-setup.sh
+++ b/modules.d/conf-tgz/module-setup.sh
@@ -15,12 +15,8 @@ install() {
 		inst_simple "${moddir}/services/${_name}.service" \
 				"${systemdsystemunitdir}/${_name}.service"
 		mkdir --parents \
-				"${initdir}/${systemdsystemunitdir}/dracut-pre-pivot.service.requires"
+				"${initdir}/${systemdsystemunitdir}/initrd.target.wants"
 		ln_r "${systemdsystemunitdir}/${_name}.service" \
-				"${systemdsystemunitdir}/dracut-pre-pivot.service.requires/${_name}.service"
-		mkdir --parents \
-				"${initdir}/${systemdsystemunitdir}/dracut-mount.service.wants"
-		ln_r "${systemdsystemunitdir}/${_name}.service" \
-				"${systemdsystemunitdir}/dracut-mount.service.wants/${_name}.service"
+				"${systemdsystemunitdir}/initrd.target.wants/${_name}.service"
 	done
 }
diff --git a/modules.d/slx-addons/module-setup.sh b/modules.d/slx-addons/module-setup.sh
index 5d84584c..ed1ad89e 100755
--- a/modules.d/slx-addons/module-setup.sh
+++ b/modules.d/slx-addons/module-setup.sh
@@ -17,7 +17,7 @@ install() {
 	inst_simple "${moddir}/services/${_name}.service" \
 			"${systemdsystemunitdir}/${_name}.service"
 	mkdir --parents \
-			"${initdir}/${systemdsystemunitdir}/dracut-pre-pivot.service.requires"
+			"${initdir}/${systemdsystemunitdir}/initrd.target.wants"
 	ln_r "${systemdsystemunitdir}/${_name}.service" \
-			"${systemdsystemunitdir}/dracut-pre-pivot.service.requires/${_name}.service"
+			"${systemdsystemunitdir}/initrd.target.wants/${_name}.service"
 }
diff --git a/modules.d/slx-drm/module-setup.sh b/modules.d/slx-drm/module-setup.sh
index 00ff80a7..13c15b9e 100755
--- a/modules.d/slx-drm/module-setup.sh
+++ b/modules.d/slx-drm/module-setup.sh
@@ -23,8 +23,8 @@ install() {
 		inst_simple "${moddir}/services/${_name}.service" \
 				"${systemdsystemunitdir}/${_name}.service"
 		mkdir --parents \
-				"${initdir}/${systemdsystemunitdir}/dracut-pre-pivot.service.requires"
+				"${initdir}/${systemdsystemunitdir}/initrd.target.wants"
 		ln_r "${systemdsystemunitdir}/${_name}.service" \
-				"${systemdsystemunitdir}/dracut-pre-pivot.service.requires/${_name}.service"
+				"${systemdsystemunitdir}/initrd.target.wants/${_name}.service"
 	done
 }
diff --git a/modules.d/slx-network/module-setup.sh b/modules.d/slx-network/module-setup.sh
index 6e28ba1f..498c7102 100755
--- a/modules.d/slx-network/module-setup.sh
+++ b/modules.d/slx-network/module-setup.sh
@@ -39,9 +39,9 @@ install() {
 	inst_simple "${moddir}/services/${_name}.service" \
 			"${systemdsystemunitdir}/${_name}.service"
 	mkdir --parents \
-			"${initdir}/${systemdsystemunitdir}/dracut-cmdline.service.requires"
+			"${initdir}/${systemdsystemunitdir}/initrd.target.wants"
 	ln_r "${systemdsystemunitdir}/${_name}.service" \
-			"${systemdsystemunitdir}/dracut-cmdline.service.requires/${_name}.service"
+			"${systemdsystemunitdir}/initrd.target.wants/${_name}.service"
 	# Setup bootif network: bridge, vlan, dhcp, ...
 	_name="s3-setup-bootif-network"
 	inst "$moddir/hooks/${_name}.sh" \
@@ -49,9 +49,9 @@ install() {
 	inst_simple "${moddir}/services/${_name}.service" \
 			"${systemdsystemunitdir}/${_name}.service"
 	mkdir --parents \
-			"${initdir}/${systemdsystemunitdir}/dracut-initqueue.service.wants"
+			"${initdir}/${systemdsystemunitdir}/initrd.target.wants"
 	ln_r "${systemdsystemunitdir}/${_name}.service" \
-			"${systemdsystemunitdir}/dracut-initqueue.service.wants/${_name}.service"
+			"${systemdsystemunitdir}/initrd.target.wants/${_name}.service"
 	# Copy files related to networking. Must be the very last thing before switchroot to
 	# make sure nothing else tries to meddle with these after copying, e.g. slx-ssl.
 	_name="s3-copy-network-files"
@@ -60,9 +60,9 @@ install() {
 	inst_simple "${moddir}/services/${_name}.service" \
 			"${systemdsystemunitdir}/${_name}.service"
 	mkdir --parents \
-			"${initdir}/${systemdsystemunitdir}/dracut-pre-pivot.service.requires"
+			"${initdir}/${systemdsystemunitdir}/initrd.target.wants"
 	ln_r "${systemdsystemunitdir}/${_name}.service" \
-			"${systemdsystemunitdir}/dracut-pre-pivot.service.requires/${_name}.service"
+			"${systemdsystemunitdir}/initrd.target.wants/${_name}.service"
 
 	# hooks
 	inst_hook pre-pivot 10 "${moddir}/hooks/configure-jumbo-frames.sh"
diff --git a/modules.d/slx-network/services/s3-parse-network-kcl.service b/modules.d/slx-network/services/s3-parse-network-kcl.service
index da0445ca..89ffcecf 100644
--- a/modules.d/slx-network/services/s3-parse-network-kcl.service
+++ b/modules.d/slx-network/services/s3-parse-network-kcl.service
@@ -1,8 +1,10 @@
 [Unit]
 Description=Extract network config from KCL
 DefaultDependencies=no
+# Need MAC extracted from cmdline
 Wants=dracut-cmdline.service
 After=dracut-cmdline.service
+# We generate a naming rule for the boot interface
 Wants=systemd-udevd.service
 Before=systemd-udevd.service
 IgnoreOnIsolate=true
diff --git a/modules.d/slx-network/services/s3-setup-bootif-network.service b/modules.d/slx-network/services/s3-setup-bootif-network.service
index 227a8ff6..4b0ed4b2 100644
--- a/modules.d/slx-network/services/s3-setup-bootif-network.service
+++ b/modules.d/slx-network/services/s3-setup-bootif-network.service
@@ -4,8 +4,6 @@ DefaultDependencies=no
 IgnoreOnIsolate=true
 Wants=s3-parse-network-kcl.service
 After=s3-parse-network-kcl.service
-Before=dracut-pre-mount.service
-Before=s3-dnbd3root.service
 
 [Service]
 Type=oneshot
diff --git a/modules.d/slx-runmode/module-setup.sh b/modules.d/slx-runmode/module-setup.sh
index c6ab9524..82b56262 100755
--- a/modules.d/slx-runmode/module-setup.sh
+++ b/modules.d/slx-runmode/module-setup.sh
@@ -14,7 +14,7 @@ install() {
 	inst_simple "${moddir}/services/${_name}.service" \
 			"${systemdsystemunitdir}/${_name}.service"
 	mkdir --parents \
-			"${initdir}/${systemdsystemunitdir}/dracut-pre-pivot.service.requires"
+			"${initdir}/${systemdsystemunitdir}/initrd.target.wants"
 	ln_r "${systemdsystemunitdir}/${_name}.service" \
-			"${systemdsystemunitdir}/dracut-pre-pivot.service.requires/${_name}.service"
+			"${systemdsystemunitdir}/initrd.target.wants/${_name}.service"
 }
diff --git a/modules.d/slx-ssl/module-setup.sh b/modules.d/slx-ssl/module-setup.sh
index 5b756e32..6e35b16f 100755
--- a/modules.d/slx-ssl/module-setup.sh
+++ b/modules.d/slx-ssl/module-setup.sh
@@ -15,7 +15,7 @@ install() {
 	inst_simple "${moddir}/services/s3-ssl-sat.service" \
 			"${systemdsystemunitdir}/s3-ssl-sat.service"
 	mkdir --parents \
-			"${initdir}/${systemdsystemunitdir}/dracut-mount.service.requires"
+			"${initdir}/${systemdsystemunitdir}/initrd.target.wants"
 	ln_r "${systemdsystemunitdir}/s3-ssl-sat.service" \
-			"${systemdsystemunitdir}/dracut-mount.service.requires/s3-ssl-sat.service"
+			"${systemdsystemunitdir}/initrd.target.wants/s3-ssl-sat.service"
 }
-- 
cgit v1.2.3-55-g7522