From 743309ff6019a6b956ad21f73ced5ae5673f2b1b Mon Sep 17 00:00:00 2001
From: "flowzone-app[bot]"
 <124931076+flowzone-app[bot]@users.noreply.github.com>
Date: Fri, 13 Sep 2024 16:23:29 +0000
Subject: [PATCH] v6.0.25

---
 .versionbot/CHANGELOG.yml                     | 23 +++++++++++++++++++
 CHANGELOG.md                                  |  5 ++++
 .../conf/distro/include/balena-os.inc         |  2 +-
 3 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/.versionbot/CHANGELOG.yml b/.versionbot/CHANGELOG.yml
index 786075a801..9f6860d84c 100644
--- a/.versionbot/CHANGELOG.yml
+++ b/.versionbot/CHANGELOG.yml
@@ -1,3 +1,26 @@
+- commits:
+    - subject: "initrdscripts: Make cryptsetup fail hard in unexpected conditions"
+      hash: c1bccdbd95bcb0202c4b80679ade0967df643342
+      body: |
+        This patch adds a set of checks that make sure that the partition
+        layout is as expected on a system with encrypted disks. Namely it
+        * Checks that the boot partition is split
+        * Checks that it can find the correct amount of encrypted partitions
+        * Checks that the label on the unlocked filesystem matches the label
+          on the encrypted partition
+        * Checks that system is not mixing encrypted and unencrypted
+          partitions
+        * Checks there are no ambiguities or duplicit partitions
+      footer:
+        Change-type: patch
+        change-type: patch
+        Signed-off-by: Michal Toman <michalt@balena.io>
+        signed-off-by: Michal Toman <michalt@balena.io>
+      author: Michal Toman
+      nested: []
+  version: 6.0.25
+  title: ""
+  date: 2024-09-13T16:23:25.632Z
 - commits:
     - subject: "common: fix return in commit_apply-dbx HUP hook"
       hash: a557b614a0ce2cf39d6bdfb3e464834b0d570895
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d516b0205d..9a63983873 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,11 @@
 Change log
 -----------
 
+# v6.0.25
+## (2024-09-13)
+
+* initrdscripts: Make cryptsetup fail hard in unexpected conditions [Michal Toman]
+
 # v6.0.24
 ## (2024-09-13)
 
diff --git a/meta-balena-common/conf/distro/include/balena-os.inc b/meta-balena-common/conf/distro/include/balena-os.inc
index 6a51c5ca18..716d3186f4 100644
--- a/meta-balena-common/conf/distro/include/balena-os.inc
+++ b/meta-balena-common/conf/distro/include/balena-os.inc
@@ -5,7 +5,7 @@ include conf/distro/include/balena-os-rust-version.inc
 
 DISTRO = "balena-os"
 DISTRO_NAME = "balenaOS"
-DISTRO_VERSION = "6.0.24"
+DISTRO_VERSION = "6.0.25"
 HOSTOS_VERSION = "${DISTRO_VERSION}"
 python () {
     ''' Set HOSTOS_VERSION from board VERSION if available '''