From 3b05403baf6ebba969baaf0b6147ca684a61fe49 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Tue, 25 Apr 2023 14:56:25 +0200
Subject: [slx-clock] Write any output to journal

---
 modules.d/slx-clock/module-setup.sh     | 12 +++++++++---
 modules.d/slx-clock/scripts/ntp-sync.sh |  6 +++++-
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/modules.d/slx-clock/module-setup.sh b/modules.d/slx-clock/module-setup.sh
index 12533363..d0f2c480 100755
--- a/modules.d/slx-clock/module-setup.sh
+++ b/modules.d/slx-clock/module-setup.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 check() {
-	if ! hash ntpdate; then
+	if ! hash ntpd; then
 		derror "Missing 'ntpdate'. Please install it."
 		return 1
 	fi
@@ -12,10 +12,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
-	inst /usr/share/zoneinfo/Europe/Berlin /etc/localtime
+	inst_multiple "/etc/services" "/usr/share/zoneinfo/Europe/Berlin" "$sdc_bin"
+	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"
 }
diff --git a/modules.d/slx-clock/scripts/ntp-sync.sh b/modules.d/slx-clock/scripts/ntp-sync.sh
index 81b4b5a3..a533353c 100755
--- a/modules.d/slx-clock/scripts/ntp-sync.sh
+++ b/modules.d/slx-clock/scripts/ntp-sync.sh
@@ -50,7 +50,11 @@ ntp_sync() {
 	echo "Timesync finished"
 }
 
-ntp_sync
+if command -v systemd-cat > /dev/null; then
+	ntp_sync 2>&1 | systemd-cat
+else
+	ntp_sync
+fi
 
 true
 
-- 
cgit v1.2.3-55-g7522