From: Dan Nicholson <dbn@endlessos.org>
Date: Mon, 26 Jun 2023 15:47:00 +0000 (-0600)
Subject: prepare-root: Adjust to composefs mount struct changes
X-Git-Tag: archive/raspbian/2023.7-3+rpi1~1^2~9^2~1^2~9^2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=94b49b41e7b10b550757df77ba32138c0d5a36dd;p=ostree.git

prepare-root: Adjust to composefs mount struct changes

This fixes a regression from the latest composefs submodule update in
1582edd1d4a6b26874d3897de8a5586f979a0715. In composefs commit
7560a4fd388481f479c0b3fc2e6d20c6321d9b74 the struct field was changed
from the generic `expected_digest` with the thought that there may be
other signatures or digests in the future.
---

diff --git a/src/switchroot/ostree-prepare-root.c b/src/switchroot/ostree-prepare-root.c
index 2bfc48f5..be772a3f 100644
--- a/src/switchroot/ostree-prepare-root.c
+++ b/src/switchroot/ostree-prepare-root.c
@@ -326,7 +326,7 @@ main (int argc, char *argv[])
       if (composefs_mode == OSTREE_COMPOSEFS_MODE_DIGEST)
         {
           cfs_options.flags |= LCFS_MOUNT_FLAGS_REQUIRE_VERITY;
-          cfs_options.expected_digest = composefs_digest;
+          cfs_options.expected_fsverity_digest = composefs_digest;
         }
 
 #ifdef USE_LIBSYSTEMD