From 363ac15ddb2d80dc14276841b582541ebc0074bf Mon Sep 17 00:00:00 2001 From: Kai Lueke Date: Tue, 17 Jan 2023 19:47:20 +0100 Subject: [PATCH] sys-apps/baselayout: Always copy missing entries over to the database This pulls in https://github.com/flatcar/baselayout/pull/26 to fix the regression in Alpha/Beta (itself a fix for another regression) where systemd-tmpfiles bailed if /etc/passwd|group didn't have the core user, now solved by always copying missing entries over to the databases, not only if the files didn't exist. --- .../coreos-overlay/changelog/bugfixes/2023-01-17-tmpfiles.md | 1 + .../{baselayout-3.6.8-r5.ebuild => baselayout-3.6.8-r6.ebuild} | 0 .../coreos-overlay/sys-apps/baselayout/baselayout-9999.ebuild | 2 +- 3 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 sdk_container/src/third_party/coreos-overlay/changelog/bugfixes/2023-01-17-tmpfiles.md rename sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/{baselayout-3.6.8-r5.ebuild => baselayout-3.6.8-r6.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/changelog/bugfixes/2023-01-17-tmpfiles.md b/sdk_container/src/third_party/coreos-overlay/changelog/bugfixes/2023-01-17-tmpfiles.md new file mode 100644 index 0000000000..9b80c69f62 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/changelog/bugfixes/2023-01-17-tmpfiles.md @@ -0,0 +1 @@ +- Fixed a regression (in Alpha/Beta) where machines failed to boot if they didn't have the `core` user or group in `/etc/passwd` or `/etc/group` ([baselayout#26](https://github.com/flatcar/baselayout/pull/26)) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-3.6.8-r5.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-3.6.8-r6.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-3.6.8-r5.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-3.6.8-r6.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-9999.ebuild index 3966cf427d..d9726c8eb3 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-9999.ebuild @@ -9,7 +9,7 @@ CROS_WORKON_REPO="https://github.com" if [[ "${PV}" == 9999 ]]; then KEYWORDS="~amd64 ~arm ~arm64 ~x86" else - CROS_WORKON_COMMIT="718ae27067797175e3591020932c8873165aaf1d" # flatcar-master + CROS_WORKON_COMMIT="b2a203ff5d0c6b929b1c51a40457fbbe0c696893" # flatcar-master KEYWORDS="amd64 arm arm64 x86" fi