Merge pull request #1812 from flatcar-linux/coreos-overlay

coreos-base/coreos-init: skip ensure-sysext unit
flatcar-archive · Apr 13, 2022 · deddaa2 · deddaa2
2 parents 16e6dce + 8f7a082
commit deddaa2
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/changelog/bugfixes/2022-04-12-skip-ensure-sysext.md 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
@@ -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="656181fd8e80fd10f44b8e0ec64998cfd1ff8901" # flatcar-master
 	KEYWORDS="amd64 arm arm64 x86"
 fi
 

diff --git a/sys-apps/systemd/CHECKLIST.md b/sys-apps/systemd/CHECKLIST.md
@@ -0,0 +1 @@
+- Check that the `systemd-sysext.service`'s `ConditionDirectoryNotEmpty` entries are correctly reflected in `flatcar-linux/init:systemd/system/ensure-sysext.service`
Original file line number	Diff line number	Diff line change
		@@ -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))
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		- Check that the `systemd-sysext.service`'s `ConditionDirectoryNotEmpty` entries are correctly reflected in `flatcar-linux/init:systemd/system/ensure-sysext.service`