From 3441d4d6d61462b05dff9e8b94dde3ed45df812f Mon Sep 17 00:00:00 2001 From: Aiden McClelland Date: Mon, 9 Mar 2026 23:42:33 -0600 Subject: [PATCH] fix: update patch-db (ciborium revert) and create /media/startos as 750 - Update patch-db submodule: fixes DB null-nuke caused by ciborium's broken deserialize_str, and stack overflow from recursive apply_patches - Create /media/startos with mode 750 in initramfs before subdirectories --- build/lib/scripts/startos-initramfs-module | 1 + core/Cargo.lock | 11 ++++++++++- patch-db | 2 +- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/build/lib/scripts/startos-initramfs-module b/build/lib/scripts/startos-initramfs-module index f093328cc..6299edd5b 100755 --- a/build/lib/scripts/startos-initramfs-module +++ b/build/lib/scripts/startos-initramfs-module @@ -104,6 +104,7 @@ local_mount_root() -olowerdir=/startos/config/overlay:/lower,upperdir=/upper/data,workdir=/upper/work \ overlay ${rootmnt} + mkdir -m 750 -p ${rootmnt}/media/startos mkdir -p ${rootmnt}/media/startos/config mount --bind /startos/config ${rootmnt}/media/startos/config mkdir -p ${rootmnt}/media/startos/images diff --git a/core/Cargo.lock b/core/Cargo.lock index 0b7389bc6..10caba090 100644 --- a/core/Cargo.lock +++ b/core/Cargo.lock @@ -4345,7 +4345,6 @@ name = "patch-db" version = "0.1.0" dependencies = [ "async-trait", - "ciborium", "fd-lock-rs", "futures", "imbl", @@ -4356,6 +4355,7 @@ dependencies = [ "nix 0.30.1", "patch-db-macro", "serde", + "serde_cbor_2", "thiserror 2.0.18", "tokio", "tracing", @@ -5793,6 +5793,15 @@ dependencies = [ "serde", ] +[[package]] +name = "serde_cbor_2" +version = "0.13.0" +source = "git+https://github.com/dr-bonez/cbor.git#2ce7fe5a5ca5700aa095668b5ba67154b7f213a4" +dependencies = [ + "half 2.7.1", + "serde", +] + [[package]] name = "serde_core" version = "1.0.228" diff --git a/patch-db b/patch-db index 003cb1dcf..12227eab1 160000 --- a/patch-db +++ b/patch-db @@ -1 +1 @@ -Subproject commit 003cb1dcf2a59330f7363cba2a8e81109acef85d +Subproject commit 12227eab18ec2f56b66fa16f3e49411a6eaae6f2