X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=ui%2Fncurses%2Fnc-cui.c;h=87d2503d94a4042c2b63f41f5ecc69d71619a245;hb=12abcbeb9fecf3b4107fb6f57e4e6da2d7821f8f;hp=ee6df87b0c7d0a00f305a6460235d3b7215d93b3;hpb=44ab15ff671fae26af2b5c8a5db8bcded677ef74;p=petitboot

diff --git a/ui/ncurses/nc-cui.c b/ui/ncurses/nc-cui.c
index ee6df87..87d2503 100644
--- a/ui/ncurses/nc-cui.c
+++ b/ui/ncurses/nc-cui.c
@@ -59,12 +59,37 @@ static struct pmenu *plugin_menu_init(struct cui *cui);
 
 static void cui_cancel_autoboot_on_exit(struct cui *cui);
 
+static struct {
+	int key;
+	struct autoboot_option opt;
+} autoboot_override_keys[] = {
+	{ KEY_F(10), {
+			.boot_type = BOOT_DEVICE_TYPE,
+			.type = DEVICE_TYPE_DISK,
+		},
+	},
+	{ KEY_F(11), {
+			.boot_type = BOOT_DEVICE_TYPE,
+			.type = DEVICE_TYPE_USB,
+		},
+	},
+	{ KEY_F(12), {
+			.boot_type = BOOT_DEVICE_TYPE,
+			.type = DEVICE_TYPE_NETWORK,
+		},
+	},
+};
+
 static bool lockdown_active(void)
 {
+#if defined(SIGNED_BOOT) && defined(HARD_LOCKDOWN)
+	return true;
+#else
 	bool lockdown = false;
 	if (access(LOCKDOWN_FILE, F_OK) != -1)
 		lockdown = true;
 	return lockdown;
+#endif
 }
 
 static void cui_start(void)
@@ -523,14 +548,50 @@ struct nc_scr *cui_set_current(struct cui *cui, struct nc_scr *scr)
 	return old;
 }
 
+static bool set_temp_autoboot_opt(struct cui *cui, struct autoboot_option *opt)
+{
+	cui->autoboot_opt = opt;
+	if (cui->client)
+		discover_client_send_temp_autoboot(cui->client, opt);
+
+	return true;
+}
+
+static bool key_cancels_boot(int key)
+{
+	unsigned int i;
+
+	if (key == 0xc)
+		return false;
+
+	for (i = 0; i < ARRAY_SIZE(autoboot_override_keys); i++)
+		if (key == autoboot_override_keys[i].key)
+			return false;
+
+	return true;
+}
+
 static bool process_global_keys(struct cui *cui, int key)
 {
+	unsigned int i;
+
 	switch (key) {
 	case 0xc:
 		if (cui->current && cui->current->main_ncw)
 			wrefresh(curscr);
 		return true;
 	}
+
+	/* check for autoboot override keys */
+	for (i = 0; i < ARRAY_SIZE(autoboot_override_keys); i++) {
+		if (key != autoboot_override_keys[i].key)
+			continue;
+
+		pb_log("Sending temporary autoboot override\n");
+		set_temp_autoboot_opt(cui, &autoboot_override_keys[i].opt);
+		return true;
+	}
+
 	return false;
 }
 
@@ -578,7 +639,7 @@ static int cui_process_key(void *arg)
 			}
 		}
 
-		if (!cui->has_input) {
+		if (!cui->has_input && key_cancels_boot(c)) {
 			cui->has_input = true;
 			if (cui->client) {
 				pb_log("UI input received (key = %d), aborting "
@@ -964,8 +1025,8 @@ fallback:
 	 * If this option was faked above move the context under
 	 * the item so it is cleaned up later in cui_plugins_remove().
 	 */
-	if (strncmp(cod->opt->id, "dummy", strlen("dummy") == 0 &&
-				cod->dev->type == DEVICE_TYPE_UNKNOWN)) {
+	if (strcmp(cod->opt->id, "dummy") == 0 &&
+			cod->dev->type == DEVICE_TYPE_UNKNOWN) {
 		talloc_steal(item, cod->dev);
 		talloc_steal(item, cod->opt);
 	}
@@ -1416,6 +1477,12 @@ static int cui_server_wait(void *arg)
 			pb_log("Aborting default boot on pb-discover connect\n");
 			discover_client_cancel_default(cui->client);
 		}
+
+		if (cui->autoboot_opt) {
+			pb_log("Sending autoboot override on pb-discover connect\n");
+			discover_client_send_temp_autoboot(cui->client,
+					cui->autoboot_opt);
+		}
 	}
 
 	return 0;
@@ -1574,7 +1641,8 @@ static void cui_cancel_autoboot_on_exit(struct cui *cui)
 
 int cui_run(struct cui *cui)
 {
-	assert(main);
+	assert(cui);
+	assert(cui->main);
 
 	cui->current = &cui->main->scr;
 	cui->default_item = 0;