X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=ui%2Fncurses%2Fnc-config.c;h=551b9d262666bcb078b8aea21d6a5d43963df48a;hp=4b1a58f98ade8635b16b941ee2ab341407b2987d;hb=0303df2c1d860cb0384b1d1c30729561ac2f2117;hpb=742b01687510dd78b3f5e6d3b98b5f420eb70443

diff --git a/ui/ncurses/nc-config.c b/ui/ncurses/nc-config.c
index 4b1a58f..551b9d2 100644
--- a/ui/ncurses/nc-config.c
+++ b/ui/ncurses/nc-config.c
@@ -188,8 +188,8 @@ static int screen_process_form(struct config_screen *screen)
 	const struct system_info *sysinfo = screen->cui->sysinfo;
 	enum net_conf_type net_conf_type;
 	struct interface_config *iface;
+	char *str, *end, *uuid;
 	struct config *config;
-	char *str, *end;
 	int rc, idx;
 
 	config = config_copy(screen, screen->cui->config);
@@ -199,8 +199,9 @@ static int screen_process_form(struct config_screen *screen)
 
 	config->autoboot_enabled = screen->autoboot_type != AUTOBOOT_DISABLED;
 
+	uuid = NULL;
 	if (screen->autoboot_type == AUTOBOOT_ONE) {
-		char mac[20], *uuid = NULL;
+		char mac[20];
 
 		/* if idx is -1 here, we have an unknown UUID selected.
 		 * Otherwise, it's a blockdev index (idx <= n_blockdevs) or an
@@ -216,13 +217,11 @@ static int screen_process_form(struct config_screen *screen)
 		} else if (idx != -1) {
 			uuid = sysinfo->blockdevs[idx]->uuid;
 		}
-
-		if (uuid) {
-			talloc_free(config->boot_device);
-			config->boot_device = talloc_strdup(config, uuid);
-		}
 	}
 
+	talloc_free(config->boot_device);
+	config->boot_device = uuid ? talloc_strdup(config, uuid) : NULL;
+
 	str = widget_textbox_get_value(screen->widgets.timeout_f);
 	if (str) {
 		unsigned long x;
@@ -484,7 +483,7 @@ static void config_screen_layout_widgets(struct config_screen *screen)
 	widget_move(widget_button_base(screen->widgets.help_b),
 			y, screen->field_x + 10);
 	widget_move(widget_button_base(screen->widgets.cancel_b),
-			y, screen->field_x + 20);
+			y, screen->field_x + 24);
 }
 
 static void config_screen_network_change(void *arg, int value)
@@ -542,7 +541,7 @@ static void config_screen_setup_empty(struct config_screen *screen)
 	widget_new_label(screen->widgetset, 2, screen->field_x,
 			_("Waiting for configuration data..."));
 	screen->widgets.cancel_b = widget_new_button(screen->widgetset,
-			4, screen->field_x, 6, _("Cancel"),
+			4, screen->field_x, 9, _("Cancel"),
 			cancel_click, screen);
 }
 
@@ -745,9 +744,9 @@ static void config_screen_setup_widgets(struct config_screen *screen,
 
 	screen->widgets.ok_b = widget_new_button(set, 0, 0, 6, _("OK"),
 			ok_click, screen);
-	screen->widgets.help_b = widget_new_button(set, 0, 0, 6, _("Help"),
+	screen->widgets.help_b = widget_new_button(set, 0, 0, 10, _("Help"),
 			help_click, screen);
-	screen->widgets.cancel_b = widget_new_button(set, 0, 0, 6, _("Cancel"),
+	screen->widgets.cancel_b = widget_new_button(set, 0, 0, 10, _("Cancel"),
 			cancel_click, screen);
 }