From e9bcb9b35daa8572dd01ea99f065f1c7de5a3c22 Mon Sep 17 00:00:00 2001 From: Robin Schneider Date: Mon, 12 Oct 2026 10:53:43 +0200 Subject: [PATCH 1/2] mask systemd-timesyncd Signed-off-by: Robin Schneider OEM STACKIT: mask systemd-timesyncd Signed-off-by: Robin Schneider --- .../coreos-base/oem-stackit/files/manglefs.sh | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100755 sdk_container/src/third_party/coreos-overlay/coreos-base/oem-stackit/files/manglefs.sh diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-stackit/files/manglefs.sh b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-stackit/files/manglefs.sh new file mode 100755 index 00000000000..c825af2bd20 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-stackit/files/manglefs.sh @@ -0,0 +1,11 @@ +#!/bin/bash + +set -euo pipefail + +rootfs="${1}" + +# chronyd Conflicts= with timesyncd; with both enabled, which one survives the +# boot transaction is a race. Mask timesyncd so chronyd always wins. This can't +# be done from the ebuild: the base image already owns the unit file and +# Portage's collision protection refuses to overwrite it. +ln -sf /dev/null "${rootfs}/usr/lib/systemd/system/systemd-timesyncd.service" From 5aa6d9e9c8578f8916bec6597b9151e4b957ce23 Mon Sep 17 00:00:00 2001 From: Robin Schneider Date: Wed, 14 Oct 2026 09:53:18 +0200 Subject: [PATCH 2/2] Add changelog Signed-off-by: Robin Schneider --- changelog/bugfixes/2026-10-14-stackit-mask-timesyncd.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog/bugfixes/2026-10-14-stackit-mask-timesyncd.md diff --git a/changelog/bugfixes/2026-10-14-stackit-mask-timesyncd.md b/changelog/bugfixes/2026-10-14-stackit-mask-timesyncd.md new file mode 100644 index 00000000000..ee78caccc06 --- /dev/null +++ b/changelog/bugfixes/2026-10-14-stackit-mask-timesyncd.md @@ -0,0 +1 @@ +- STACKIT: Masked `systemd-timesyncd.service` in the OEM sysext. It conflicts with `chronyd.service`, and which of the two ended up running after boot depended on timing. ([scripts#4318](https://github.com/flatcar/scripts/pull/4318))