From a59c004693e2fbcf8e64e46a6daff98a6ee89c3d Mon Sep 17 00:00:00 2001 From: Kai Lueke Date: Thu, 30 Mar 2023 19:56:12 +0900 Subject: [PATCH] Use tmpfiles to set up /var/log/journal/ from initrd This pulls in https://github.com/flatcar/bootengine/pull/60 and https://github.com/flatcar/baselayout/pull/29 to fix the persisting of the journal on first boot. --- .../changelog/bugfixes/2023-03-30-var-log-journal.md | 1 + .../coreos-overlay/sys-apps/baselayout/baselayout-9999.ebuild | 2 +- .../coreos-overlay/sys-kernel/bootengine/bootengine-9999.ebuild | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 sdk_container/src/third_party/coreos-overlay/changelog/bugfixes/2023-03-30-var-log-journal.md diff --git a/sdk_container/src/third_party/coreos-overlay/changelog/bugfixes/2023-03-30-var-log-journal.md b/sdk_container/src/third_party/coreos-overlay/changelog/bugfixes/2023-03-30-var-log-journal.md new file mode 100644 index 0000000000..e724343450 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/changelog/bugfixes/2023-03-30-var-log-journal.md @@ -0,0 +1 @@ +- Ensured that `/var/log/journal/` is created early enough for systemd-journald to persist the logs on first boot ([bootengine#60](https://github.com/flatcar/bootengine/pull/60), [baselayout#29](https://github.com/flatcar/baselayout/pull/29)) 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 29fce7fe13..08dd5924b6 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="d4d6da73919bacc5b05a012d3d00dc8e2d669c0d" # flatcar-master + CROS_WORKON_COMMIT="f55f20a58997b0cdf7d85e90d1a7050a5e19c7ae" # flatcar-master KEYWORDS="amd64 arm arm64 x86" fi diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-9999.ebuild index cde24d37c0..fb952e00ce 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-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="dcd4b1e4e348384834e9cb456e91282d77f18c80" # flatcar-master + CROS_WORKON_COMMIT="d3cc0f4b1dce6a5084a8a909810efc30c367020b" # flatcar-master KEYWORDS="amd64 arm arm64 x86" fi