Merge branch 'main' into gabriel-samfira/bump-coreos-cloudinit

flatcar · Mar 26, 2024 · 75f7a45 · 75f7a45
2 parents bbd32d0 + e5930f7
commit 75f7a45
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
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
@@ -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/.repo/manifests/version.txt b/sdk_container/.repo/manifests/version.txt
@@ -1,4 +1,4 @@
-FLATCAR_VERSION=3916.0.0+nightly-20240321-2100
-FLATCAR_VERSION_ID=3916.0.0
-FLATCAR_BUILD_ID="nightly-20240321-2100"
-FLATCAR_SDK_VERSION=3916.0.0+nightly-20240321-2100
+FLATCAR_VERSION=3920.0.0+nightly-20240325-2100
+FLATCAR_VERSION_ID=3920.0.0
+FLATCAR_BUILD_ID="nightly-20240325-2100"
+FLATCAR_SDK_VERSION=3920.0.0+nightly-20240325-2100
diff --git a/...pp-admin/toolbox/toolbox-0.0.0-r16.ebuild → ...pp-admin/toolbox/toolbox-0.0.0-r17.ebuild b/...pp-admin/toolbox/toolbox-0.0.0-r16.ebuild → ...pp-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
@@ -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
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		- Fixed `toolbox` to prevent mounted `ctr` snapshots from being garbage-collected ([toolbox#9](https://github.com/flatcar/toolbox/pull/9))