Adds the --ignore-seed option when installing

When using a local chunk store, it's useful to ignore using the active slot as a seed.
fhackenberger · Nov 19, 2019 · 03665b7 · 03665b7
1 parent 41d5f33
commit 03665b7
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/include/context.h b/include/context.h
@@ -45,6 +45,8 @@ typedef struct {
 	gchar *handlerextra;
 	/* ignore compatible check */
 	gboolean ignore_compatible;
+	/* ignore using slot as seed */
+	gboolean ignore_slot_as_seed;
 
 	/* for storing installation runtime informations */
 	RContextInstallationInfo *install_info;
@@ -124,4 +126,4 @@ void r_context_register_progress_callback(progress_callback progress_cb);
 
 RaucContext *r_context_conf(void);
 const RaucContext *r_context(void);
-void r_context_clean(void);
+void r_context_clean(void);
diff --git a/src/main.c b/src/main.c
@@ -25,7 +25,7 @@
 GMainLoop *r_loop = NULL;
 int r_exit_status = 0;
 
-gboolean install_ignore_compatible, install_progressbar = FALSE;
+gboolean install_ignore_compatible, install_progressbar, install_ignore_slot_as_seed = FALSE;
 gboolean info_noverify, info_dumpcert = FALSE;
 gboolean status_detailed = FALSE;
 gchar *output_format = NULL;
@@ -220,6 +220,7 @@ static gboolean install_start(int argc, char **argv)
 	args->status_result = 2;
 
 	r_context_conf()->ignore_compatible = install_ignore_compatible;
+	r_context_conf()->ignore_slot_as_seed = install_ignore_slot_as_seed;
 
 	r_loop = g_main_loop_new(NULL, FALSE);
 	if (ENABLE_SERVICE) {
@@ -1703,6 +1704,7 @@ typedef struct {
 
 GOptionEntry entries_install[] = {
 	{"ignore-compatible", '\0', 0, G_OPTION_ARG_NONE, &install_ignore_compatible, "disable compatible check", NULL},
+	{"ignore-seed", '\0', 0, G_OPTION_ARG_NONE, &install_ignore_slot_as_seed, "disable using slot as seed", NULL},
 	{"progress", '\0', 0, G_OPTION_ARG_NONE, &install_progressbar, "show progress bar", NULL},
 	{0}
 };

diff --git a/src/update_handler.c b/src/update_handler.c
@@ -261,9 +261,12 @@ static gboolean casync_extract_image(RaucImage *image, gchar *dest, GError **err
 			}
 			seed_mounted = TRUE;
 		}
-
-		g_debug("Adding as casync directory tree seed: %s", seedslot->mount_point);
-		seed = g_strdup(seedslot->mount_point);
+		if (!r_context()->ignore_compatible) {
+			g_debug("Adding as casync directory tree seed: %s", seedslot->mount_point);
+			seed = g_strdup(seedslot->mount_point);
+		}else {
+			g_debug("Skipping to use tree seed: %s", seedslot->mount_point);
+		}
 	} else {
 		g_debug("Adding as casync blob seed: %s", seedslot->device);
 		seed = g_strdup(seedslot->device);