Merge pull request #61 from ejoerns/v0/topic/bootchooser-new

Adaptions for upcoming bootchooser implementation
rauc · Aug 17, 2016 · 80d3e70 · 80d3e70
2 parents b9fbc96 + a35d58a
commit 80d3e70
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/src/bootchooser.c b/src/bootchooser.c
@@ -160,8 +160,6 @@ static gboolean barebox_set_primary(RaucSlot *slot) {
 				BOOTSTATE_PREFIX, s->bootname, prio));
 	}
 
-	g_ptr_array_add(pairs, g_strdup_printf("%s.%s.ok=%i",
-			BOOTSTATE_PREFIX, slot->bootname, 1));
 	g_ptr_array_add(pairs, g_strdup_printf("%s.%s.remaining_attempts=%i",
 			BOOTSTATE_PREFIX, slot->bootname, 3));
 

diff --git a/src/install.c b/src/install.c
@@ -75,7 +75,7 @@ static const gchar* get_cmdline_bootname(void) {
 	/* For barebox, we check if the bootstate code set the active slot name
 	 * in the command line */
 	if (g_strcmp0(r_context()->config->system_bootloader, "barebox") == 0) {
-		regex = g_regex_new("bootstate\\.active=(\\S+)", 0, 0, NULL);
+		regex = g_regex_new("(?:bootstate|bootchooser)\\.active=(\\S+)", 0, 0, NULL);
 		if (g_regex_match(regex, contents, 0, &match)) {
 			bootname = g_match_info_fetch(match, 1);
 			goto out;