From a74286a71d74306642d3858b0f6684d99b29a7ec Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Mon, 17 Jun 2024 14:18:11 +0200
Subject: [slx-extra-script] Add post-mount hook

---
 modules.d/slx-extra-script/module-setup.sh                   | 11 +++++++----
 .../slx-extra-script/services/s3-extra-post-mount.service    | 12 ++++++++++++
 2 files changed, 19 insertions(+), 4 deletions(-)
 create mode 100644 modules.d/slx-extra-script/services/s3-extra-post-mount.service

diff --git a/modules.d/slx-extra-script/module-setup.sh b/modules.d/slx-extra-script/module-setup.sh
index da057429..9cc9bdbe 100755
--- a/modules.d/slx-extra-script/module-setup.sh
+++ b/modules.d/slx-extra-script/module-setup.sh
@@ -11,8 +11,11 @@ install() {
 		--wafter "s3-fetch-config.service" \
 		--before "s3-dnbd3root.service"
 	mkdir --parents "${initdir}/${systemdsystemunitdir}/initrd.target.wants"
-	inst_simple "${moddir}/services/s3-extra-post-dmsetup.service" \
-		"${systemdsystemunitdir}/s3-extra-post-dmsetup.service"
-	ln_r "${systemdsystemunitdir}/s3-extra-post-dmsetup.service" \
-		"${systemdsystemunitdir}/initrd.target.wants/s3-extra-post-dmsetup.service"
+	local i
+	for i in dmsetup mount; do
+		inst_simple "${moddir}/services/s3-extra-post-${i}.service" \
+			"${systemdsystemunitdir}/s3-extra-post-${i}.service"
+		ln_r "${systemdsystemunitdir}/s3-extra-post-${i}.service" \
+			"${systemdsystemunitdir}/initrd.target.wants/s3-extra-post-${i}.service"
+	done
 }
diff --git a/modules.d/slx-extra-script/services/s3-extra-post-mount.service b/modules.d/slx-extra-script/services/s3-extra-post-mount.service
new file mode 100644
index 00000000..d7373ab8
--- /dev/null
+++ b/modules.d/slx-extra-script/services/s3-extra-post-mount.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Run extra script after /sysroot is mounted
+ConditionFileIsExecutable=/etc/extra-init
+After=s3-mount-root.service
+Before=initrd-switch-root.target initrd-cleanup.service
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+ExecStart=/etc/extra-init post-mount
+KillMode=process
+KillSignal=SIGTERM
-- 
cgit v1.2.3-55-g7522