From e5179b2e78bb0fe3355a8fd01201d7a96ff147ca Mon Sep 17 00:00:00 2001 From: David Eichin Date: Fri, 22 Mar 2024 15:49:47 +0100 Subject: [PATCH] changelog: upgrade toolbox to latest version This version fixes that mounted snapshots with ctr are being gc'ed which breaks the toolbox. --- .../2024-03-22-toolbox-prevent-snapshots-from-being-gced.md | 1 + .../{toolbox-0.0.0-r16.ebuild => toolbox-0.0.0-r17.ebuild} | 0 .../coreos-overlay/app-admin/toolbox/toolbox-9999.ebuild | 2 +- 3 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 changelog/bugfixes/2024-03-22-toolbox-prevent-snapshots-from-being-gced.md rename sdk_container/src/third_party/coreos-overlay/app-admin/toolbox/{toolbox-0.0.0-r16.ebuild => toolbox-0.0.0-r17.ebuild} (100%) diff --git a/changelog/bugfixes/2024-03-22-toolbox-prevent-snapshots-from-being-gced.md b/changelog/bugfixes/2024-03-22-toolbox-prevent-snapshots-from-being-gced.md new file mode 100644 index 0000000000..8cf892cb4a --- /dev/null +++ b/changelog/bugfixes/2024-03-22-toolbox-prevent-snapshots-from-being-gced.md @@ -0,0 +1 @@ +- Fixed `toolbox` to prevent mounted `ctr` snapshots from being garbage-collected ([toolbox#9](https://github.com/flatcar/toolbox/pull/9)) diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/toolbox/toolbox-0.0.0-r16.ebuild b/sdk_container/src/third_party/coreos-overlay/app-admin/toolbox/toolbox-0.0.0-r17.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/app-admin/toolbox/toolbox-0.0.0-r16.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-admin/toolbox/toolbox-0.0.0-r17.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/toolbox/toolbox-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/app-admin/toolbox/toolbox-9999.ebuild index 75f1d6f125..c8766101cb 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-admin/toolbox/toolbox-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-admin/toolbox/toolbox-9999.ebuild @@ -9,7 +9,7 @@ CROS_WORKON_REPO="https://github.com" if [[ "${PV}" == 9999 ]]; then KEYWORDS="~amd64 ~arm64" else - CROS_WORKON_COMMIT="9695c9b42036ac958fae10a6268f95ae5c3fcc2b" # flatcar-master + CROS_WORKON_COMMIT="fce9ba2bbd55e1835af72952bfbb7aed6be75606" # flatcar-master KEYWORDS="amd64 arm64" fi