From 3c0283f74a6ebd0f7148db829532a76bdf951ae3 Mon Sep 17 00:00:00 2001 From: Jeremi Piotrowski Date: Mon, 25 Mar 2024 11:35:04 +0000 Subject: [PATCH] sys-apps/systemd: Add hook to ensure timesyncd starts after sysexts Sysexts can includes services that have a Conflicts=systemd-timesyncd entry. To ensure that this takes effect, start timesyncd after the ensure-sysext.service. Signed-off-by: Jeremi Piotrowski --- .../coreos/config/env/sys-apps/systemd | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 sdk_container/src/third_party/coreos-overlay/coreos/config/env/sys-apps/systemd diff --git a/sdk_container/src/third_party/coreos-overlay/coreos/config/env/sys-apps/systemd b/sdk_container/src/third_party/coreos-overlay/coreos/config/env/sys-apps/systemd new file mode 100644 index 0000000000..3806da9f57 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/coreos/config/env/sys-apps/systemd @@ -0,0 +1,13 @@ +cros_post_src_install_timesync() { + local dir="${D}$(systemd_get_systemunitdir)/systemd-timesyncd.service.d" + mkdir -p "${dir}" + pushd "${dir}" + cat <flatcar.conf || die +# Allow sysexts to ship timesyncd replacements which can have +# a Conflicts=systemd-timesyncd directive that would result +# in systemd-timesyncd not being started. +[Unit] +After=ensure-sysext.service +EOF + popd +}