Try to use more systemd services

5 files changed, 35 insertions, 19 deletions

diff --git a/modules.d/slx-clock/scripts/configure-timesyncd.sh b/modules.d/slx-clock/hooks/s3-configure-timesyncd.sh
index 77541ab0..77541ab0 100644..100755
--- a/modules.d/slx-clock/scripts/configure-timesyncd.sh
+++ b/modules.d/slx-clock/hooks/s3-configure-timesyncd.sh
diff --git a/modules.d/slx-clock/scripts/ntp-sync.sh b/modules.d/slx-clock/hooks/s3-ntp-sync.sh
index a533353c..96e72c04 100755
--- a/modules.d/slx-clock/scripts/ntp-sync.sh
+++ b/modules.d/slx-clock/hooks/s3-ntp-sync.sh
@@ -50,11 +50,4 @@ ntp_sync() {
 	echo "Timesync finished"
 }
 
-if command -v systemd-cat > /dev/null; then
-	ntp_sync 2>&1 | systemd-cat
-else
-	ntp_sync
-fi
-
-true
-
+ntp_sync
diff --git a/modules.d/slx-clock/module-setup.sh b/modules.d/slx-clock/module-setup.sh
index f9ff0c48..3b62089c 100755
--- a/modules.d/slx-clock/module-setup.sh
+++ b/modules.d/slx-clock/module-setup.sh
@@ -8,16 +8,16 @@ depends() {
 	echo dnbd3-rootfs busybox
 }
 install() {
-	# see where systemd-cat is installed
-	local sdc_bin="$( command -v systemd-cat )"
-	if [ -z "$sdc_bin" ]; then
-		warn "Could not find systemd-cat in $PATH. Check if its installed."
-		return 1
-	fi
-	# wait til we have the openslx config for ntp servers
-	# which happens in pre-mount/10
-	inst_multiple "/etc/services" "/usr/share/zoneinfo/Europe/Berlin" "$sdc_bin"
+	inst_multiple "/etc/services" "/usr/share/zoneinfo/Europe/Berlin"
 	inst "/usr/share/zoneinfo/Europe/Berlin" "/etc/localtime"
-	inst_hook pre-mount 15 "$moddir/scripts/ntp-sync.sh"
-	inst_hook pre-pivot 15 "$moddir/scripts/configure-timesyncd.sh"
+	for _name in "s3-setup-addons" "s3-configure-timesyncd"; do
+		inst "$moddir/hooks/${_name}.sh" \
+				"/usr/local/bin/${_name}.sh"
+		inst_simple "${moddir}/services/${_name}.service" \
+				"${systemdsystemunitdir}/${_name}.service"
+		mkdir --parents \
+				"${initdir}/${systemdsystemunitdir}/dracut-pre-pivot.service.requires"
+		ln_r "${systemdsystemunitdir}/${_name}.service" \
+				"${systemdsystemunitdir}/dracut-pre-pivot.service.requires/${_name}.service"
+	done
 }
diff --git a/modules.d/slx-clock/services/s3-configure-timesyncd.service b/modules.d/slx-clock/services/s3-configure-timesyncd.service
new file mode 100644
index 00000000..c370859a
--- /dev/null
+++ b/modules.d/slx-clock/services/s3-configure-timesyncd.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Configure timesyncd in stage 4
+After=initrd-root-fs.target
+After=s3-ntp-sync.service
+Before=initrd-switch-root.target
+DefaultDependencies=no
+IgnoreOnIsolate=true
+
+[Service]
+Type=oneshot
+RemainAfterExit=true
+ExecStart=/usr/local/bin/s3-configure-timesyncd.sh
diff --git a/modules.d/slx-clock/services/s3-ntp-sync.service b/modules.d/slx-clock/services/s3-ntp-sync.service
new file mode 100644
index 00000000..77208d0f
--- /dev/null
+++ b/modules.d/slx-clock/services/s3-ntp-sync.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Sync time via NTP
+Requires=s3-setup-bootif-network.service
+After=s3-setup-bootif-network.service
+DefaultDependencies=no
+IgnoreOnIsolate=true
+
+[Service]
+Type=oneshot
+RemainAfterExit=true
+ExecStart=/usr/local/bin/s3-ntp-sync.sh