src/context: priorize bootchooser to select bootslot

The commit 9af0613 introduced the new
bootchooser API r_boot_get_current_bootname() to allow the backend to
determine the current bootslot.

Since then, the bootchooser is able determine the bootslot if it cannot
be guessed from the kernel cmdline; it is used by the custom backend
only at that moment.

This gives the priority to the bootchooser over the kernel cmdline.

Signed-off-by: Gaël PORTAY <[email protected]>

Author: gportay

src/context.c

@@ -373,10 +373,6 @@ static gboolean r_context_configure_target(GError **error)
 	if (r_whitespace_removed(context->config->system_variant))
 		g_warning("Ignoring surrounding whitespace in system variant: %s", context->config->system_variant);
 
-	if (context->bootslot == NULL) {
-		context->bootslot = get_cmdline_bootname();
-	}
-
 	if (context->bootslot == NULL) {
 		context->bootslot = r_boot_get_current_bootname(context->config, &ierror);
 		if (ierror) {
@@ -385,6 +381,10 @@ static gboolean r_context_configure_target(GError **error)
 		}
 	}
 
+	if (context->bootslot == NULL) {
+		context->bootslot = get_cmdline_bootname();
+	}
+
 	g_clear_pointer(&context->boot_id, g_free);
 	g_clear_pointer(&context->machine_id, g_free);