From 9f618aeafe2eb16b90abfa4ccf9933da6fd9304c Mon Sep 17 00:00:00 2001 From: Kai Lueke Date: Tue, 12 Apr 2022 18:21:15 +0900 Subject: [PATCH] coreos-base/coreos-init: skip ensure-sysext unit This pulls in https://github.com/flatcar-linux/init/pull/68 to skip the ensure-sysext unit when systemd-sysext is skipped to prevent a dependency failure being reported. Closes: https://github.com/flatcar-linux/Flatcar/issues/710 --- changelog/bugfixes/2022-04-12-skip-ensure-sysext.md | 1 + coreos-base/coreos-init/coreos-init-9999.ebuild | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 changelog/bugfixes/2022-04-12-skip-ensure-sysext.md diff --git a/changelog/bugfixes/2022-04-12-skip-ensure-sysext.md b/changelog/bugfixes/2022-04-12-skip-ensure-sysext.md new file mode 100644 index 00000000000..26833e50925 --- /dev/null +++ b/changelog/bugfixes/2022-04-12-skip-ensure-sysext.md @@ -0,0 +1 @@ +- Skipped starting `ensure-sysext.service` if `systemd-sysext.service` won't be started, to prevent reporting a dependency failure ([Flatcar#710](https://github.com/flatcar-linux/Flatcar/issues/710)) diff --git a/coreos-base/coreos-init/coreos-init-9999.ebuild b/coreos-base/coreos-init/coreos-init-9999.ebuild index a9e3b825e69..0d43977b89c 100644 --- a/coreos-base/coreos-init/coreos-init-9999.ebuild +++ b/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="d76453b957f1e9ebe428c66ea6c9e3bb9a2d3489" # flatcar-master + CROS_WORKON_COMMIT="ccade77b6d568094fb4e4d4cf71b867819551798" # flatcar-master KEYWORDS="amd64 arm arm64 x86" fi