From 45236d8ff6e0dfa3f2ad5a70541acf0fcde454b6 Mon Sep 17 00:00:00 2001 From: Kai Lueke Date: Tue, 14 Feb 2023 22:36:27 +0900 Subject: [PATCH] sys-kernel/bootengine: Set up /etc as overlay mount This pulls in https://github.com/flatcar/bootengine/pull/53 to provide files in /etc through an overlay mount from /usr/share/flatcar/etc - essentially giving us a 3-way merge of config files that allows us to update /etc while keeping user changes. --- .../changelog/changes/2023-02-20-etc-overlayfs.md | 1 + .../coreos-overlay/sys-kernel/bootengine/bootengine-9999.ebuild | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 sdk_container/src/third_party/coreos-overlay/changelog/changes/2023-02-20-etc-overlayfs.md diff --git a/sdk_container/src/third_party/coreos-overlay/changelog/changes/2023-02-20-etc-overlayfs.md b/sdk_container/src/third_party/coreos-overlay/changelog/changes/2023-02-20-etc-overlayfs.md new file mode 100644 index 0000000000..cd3ade4ca4 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/changelog/changes/2023-02-20-etc-overlayfs.md @@ -0,0 +1 @@ +- `/etc` is now set up as overlayfs with the original `/etc` folder being the store for changed files/directories and `/usr/share/flatcar/etc` providing the lower default directory tree ([bootengine#53](https://github.com/flatcar/bootengine/pull/53), [scripts#666](https://github.com/flatcar/scripts/pull/666)) 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 3657e78fa2..823dbdafdb 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="aa8a19eb8e555d75535632600a353ea4cb5576eb" # flatcar-master + CROS_WORKON_COMMIT="98a903c775dc0dea3db45e5ca730d7be4d480cf2" # flatcar-master KEYWORDS="amd64 arm arm64 x86" fi