From: Alexander Larsson <alexl@redhat.com>
Date: Mon, 15 Apr 2024 18:09:34 +0000 (+0200)
Subject: prepare-root: Handle non-AB aboot properly
X-Git-Tag: archive/raspbian/2024.8-1+rpi1^2~7^2~2^2~9^2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=6ac8c49a8347c939b7ce92cce86d0addb5d0a670;p=ostree.git

prepare-root: Handle non-AB aboot properly

otcore_get_ostree_target() should set is_aboot for android boot
systems, but currently it only does this on A/B boot systems, not
single-boot-partition systems. Fix this by setting it in the second
case.
---

diff --git a/src/libotcore/otcore-prepare-root.c b/src/libotcore/otcore-prepare-root.c
index 187eeec0..f76db04a 100644
--- a/src/libotcore/otcore-prepare-root.c
+++ b/src/libotcore/otcore-prepare-root.c
@@ -111,6 +111,8 @@ otcore_get_ostree_target (const char *cmdline, gboolean *is_aboot, char **out_ta
    */
   if (proc_cmdline_has_key_starting_with (cmdline, "androidboot."))
     {
+      if (is_aboot)
+        *is_aboot = true;
       *out_target = g_strdup (slot_a);
       return TRUE;
     }