prepare-root: Adjust to composefs mount struct changes
authorDan Nicholson <dbn@endlessos.org>
Mon, 26 Jun 2023 15:47:00 +0000 (09:47 -0600)
committerDan Nicholson <dbn@endlessos.org>
Mon, 26 Jun 2023 15:47:00 +0000 (09:47 -0600)
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.

src/switchroot/ostree-prepare-root.c

index 2bfc48f5d882224d96302c4e3ee0324df27572bd..be772a3f0182bc324a8bb03506e833cc7010d136 100644 (file)
@@ -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