From 7256148ccde0c466a2013512ebf6a1abc956bdfb Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux Date: Thu, 18 Apr 2024 14:46:48 +0200 Subject: [PATCH 1/2] coreos-base/coreos-init: drop daemon-reload command With the recent systemd upgrade we do not need to reload the systemd daemon anymore Signed-off-by: Mathieu Tortuyaux --- .../coreos-base/coreos-init/coreos-init-9999.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild index b211353ed4d..17854a60147 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild @@ -10,7 +10,7 @@ CROS_WORKON_REPO="https://github.com" if [[ "${PV}" == 9999 ]]; then KEYWORDS="~amd64 ~arm ~arm64 ~x86" else - CROS_WORKON_COMMIT="96e929df6c04df58a87187cf2a769923e5ecdf41" # flatcar-master + CROS_WORKON_COMMIT="db06907d621459ed488ca13031852357b59b24ec" # tormath1/sysext KEYWORDS="amd64 arm arm64 x86" fi From 0ff5ec6275d5e628a0c853308bb8efa344ef6c25 Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux Date: Thu, 18 Apr 2024 14:58:39 +0200 Subject: [PATCH 2/2] build_sysext: teach sysext to reload the daemon This ensures that the Systemd daemon is reloaded once the sysext image merged. Signed-off-by: Mathieu Tortuyaux --- build_sysext | 1 + 1 file changed, 1 insertion(+) diff --git a/build_sysext b/build_sysext index 963391df567..b9407b5bd00 100755 --- a/build_sysext +++ b/build_sysext @@ -277,6 +277,7 @@ all_fields=( 'ID=flatcar' "${version_field}" "ARCHITECTURE=${ARCH}" + "EXTENSION_RELOAD_MANAGER=1" ) printf '%s\n' "${all_fields[@]}" >"${BUILD_DIR}/install-root/usr/lib/extension-release.d/extension-release.${SYSEXTNAME}"