X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=ui%2Fncurses%2Fnc-config.c;h=3107c72bddfa966caaeefe4044f8ec31bf9e9a2e;hb=71f338ca02092cb75608a511d6885affaf7adb66;hp=64d0619b66c66703dc64c9d08c9b50e07dfc3903;hpb=8c60755607cbade935b1f763dffbf9ee1c38f97a;p=petitboot diff --git a/ui/ncurses/nc-config.c b/ui/ncurses/nc-config.c index 64d0619..3107c72 100644 --- a/ui/ncurses/nc-config.c +++ b/ui/ncurses/nc-config.c @@ -249,6 +249,10 @@ static int screen_process_form(struct config_screen *screen) } str = widget_textbox_get_value(screen->widgets.dns_f); + talloc_free(config->network.dns_servers); + config->network.dns_servers = NULL; + config->network.n_dns_servers = 0; + if (str && strlen(str)) { char *dns, *tmp; int i; @@ -499,6 +503,7 @@ static void config_screen_setup_widgets(struct config_screen *screen, screen->widgets.timeout_f = widget_new_textbox(set, 0, 0, 5, str); screen->widgets.timeout_help_l = widget_new_label(set, 0, 0, "seconds"); + widget_textbox_set_fixed_size(screen->widgets.timeout_f); widget_textbox_set_validator_integer(screen->widgets.timeout_f, 0, 999); screen->widgets.network_l = widget_new_label(set, 0, 0, "Network"); @@ -557,10 +562,12 @@ static void config_screen_setup_widgets(struct config_screen *screen, screen->widgets.ip_addr_l = widget_new_label(set, 0, 0, "IP/mask:"); screen->widgets.ip_addr_f = widget_new_textbox(set, 0, 0, 16, ip); screen->widgets.ip_mask_l = widget_new_label(set, 0, 0, "/"); - screen->widgets.ip_mask_f = widget_new_textbox(set, 0, 0, 4, mask); + screen->widgets.ip_mask_f = widget_new_textbox(set, 0, 0, 3, mask); screen->widgets.ip_addr_mask_help_l = widget_new_label(set, 0, 0, "(eg. 192.168.0.10 / 24)"); + widget_textbox_set_fixed_size(screen->widgets.ip_addr_f); + widget_textbox_set_fixed_size(screen->widgets.ip_mask_f); widget_textbox_set_validator_ipv4(screen->widgets.ip_addr_f); widget_textbox_set_validator_integer(screen->widgets.ip_mask_f, 1, 31); @@ -569,6 +576,7 @@ static void config_screen_setup_widgets(struct config_screen *screen, screen->widgets.gateway_help_l = widget_new_label(set, 0, 0, "(eg. 192.168.0.1)"); + widget_textbox_set_fixed_size(screen->widgets.gateway_f); widget_textbox_set_validator_ipv4(screen->widgets.gateway_f); str = talloc_strdup(screen, "");