bootloader: Pass "options" to aboot bootloader backend
authorEric Curtin <ecurtin@redhat.com>
Mon, 26 Jun 2023 10:44:32 +0000 (11:44 +0100)
committerEric Curtin <ecurtin@redhat.com>
Mon, 26 Jun 2023 10:44:56 +0000 (11:44 +0100)
aboot-deploy must know where the next root filesystem to boot is to set
up a symlink /ostree/root.a or /ostree/root.b , this location is in the
ostree= part of these passed in options.

Signed-off-by: Eric Curtin <ecurtin@redhat.com>
src/libostree/ostree-bootloader-aboot.c

index c21bd67c89e5bcacb091356142aec58ec47431bd..c125ca5983651e3e983fa396c00b35fa6438b581 100644 (file)
@@ -161,7 +161,8 @@ _ostree_bootloader_aboot_post_bls_sync (OstreeBootloader *bootloader, int bootve
 
   g_autofree char *path_str = g_file_get_path (self->sysroot->path);
 
-  const char *const aboot_argv[] = { "aboot-deploy", "-r", path_str, "-c", abootcfg, aboot, NULL };
+  const char *const aboot_argv[]
+      = { "aboot-deploy", "-r", path_str, "-c", abootcfg, "-o", options, aboot, NULL };
   int estatus;
   if (!g_spawn_sync (NULL, (char **)aboot_argv, NULL, G_SPAWN_SEARCH_PATH, NULL, NULL, NULL, NULL,
                      &estatus, error))