From 21167bc5c37196ca5a49d8739613dc92ea462dee Mon Sep 17 00:00:00 2001 From: Jeremi Piotrowski Date: Wed, 9 Feb 2022 13:16:38 +0000 Subject: [PATCH 1/2] bump coreos-init and bootengine commit for cgroupv1-runtime-revert change This pulls in https://github.com/flatcar-linux/bootengine/pull/35 and https://github.com/flatcar-linux/init/pull/62, which enable boot time switching back to legacy cgroups by creating a flag files (/etc/flatcar-cgroupv1) from ignition. --- ...eos-init-0.0.1-r172.ebuild => coreos-init-0.0.1-r173.ebuild} | 0 .../coreos-base/coreos-init/coreos-init-9999.ebuild | 2 +- ...ootengine-0.0.38-r12.ebuild => bootengine-0.0.38-r13.ebuild} | 0 .../coreos-overlay/sys-kernel/bootengine/bootengine-9999.ebuild | 2 +- 4 files changed, 2 insertions(+), 2 deletions(-) rename sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/{coreos-init-0.0.1-r172.ebuild => coreos-init-0.0.1-r173.ebuild} (100%) rename sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/{bootengine-0.0.38-r12.ebuild => bootengine-0.0.38-r13.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r172.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r173.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r172.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r173.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild index e7de4bf2ea..7cded8adda 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/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="f980a88ab9ff96552df0d6a484f10f93574c5c0b" # flatcar-master + CROS_WORKON_COMMIT="e72d7a46b73d21d4f0c5840c6bb19aa0ad8e08f6" # flatcar-master KEYWORDS="amd64 arm arm64 x86" fi diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-0.0.38-r12.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-0.0.38-r13.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-0.0.38-r12.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-0.0.38-r13.ebuild 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 d4ad449c7c..5fffb461e0 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="dac35d0e420ec906189f4350fce2cd995fde1a35" # flatcar-master + CROS_WORKON_COMMIT="d586e78111173bb0d9ebd4afa7efbc45f07dffb4" # flatcar-master KEYWORDS="amd64 arm arm64 x86" fi From ea14a7cb10b72168f86b94e889a3b2c77450f2d2 Mon Sep 17 00:00:00 2001 From: Jeremi Piotrowski Date: Tue, 1 Mar 2022 13:58:20 +0000 Subject: [PATCH 2/2] changelog: add entry for cgroupv1 switch functionality Signed-off-by: Jeremi Piotrowski --- .../coreos-overlay/changelog/changes/2022-03-01-cgroupv1.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 sdk_container/src/third_party/coreos-overlay/changelog/changes/2022-03-01-cgroupv1.md diff --git a/sdk_container/src/third_party/coreos-overlay/changelog/changes/2022-03-01-cgroupv1.md b/sdk_container/src/third_party/coreos-overlay/changelog/changes/2022-03-01-cgroupv1.md new file mode 100644 index 0000000000..37ef4534ba --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/changelog/changes/2022-03-01-cgroupv1.md @@ -0,0 +1 @@ +- Added support for switching back to CGroupsV1 without requiring a reboot. Create `/etc/flatcar-cgroupv1` through ignition. ([PR#1666](https://github.com/flatcar-linux/coreos-overlay/pull/1666))