X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fplatform.c;h=cc6306f035b96e622fb40026b780925279ac78fa;hp=254da979b41e2cc8157ba39f0ad9734979d43498;hb=b5f9e34d85075afe7aa87b5ce4a1a2d911468e36;hpb=ce54f866b2b9e48bab73acd73b4c05a057f9ddca

diff --git a/discover/platform.c b/discover/platform.c
index 254da97..cc6306f 100644
--- a/discover/platform.c
+++ b/discover/platform.c
@@ -83,7 +83,14 @@ static void dump_config(struct config *config)
 			config->allow_writes ? "yes" : "no");
 
 	pb_log("  Default UI to boot on: %s\n",
-		config->boot_tty ?: "none set");
+		config->boot_console ?: "none set");
+	if (config->manual_console)
+		pb_log("    (Manually set)\n");
+
+	if (config->http_proxy)
+		pb_log("  HTTP Proxy: %s\n", config->http_proxy);
+	if (config->https_proxy)
+		pb_log("  HTTPS Proxy: %s\n", config->https_proxy);
 
 
 	pb_log(" language: %s\n", config->lang ?: "");
@@ -119,13 +126,15 @@ void config_set_defaults(struct config *config)
 	config->network.n_interfaces = 0;
 	config->network.dns_servers = NULL;
 	config->network.n_dns_servers = 0;
+	config->http_proxy = NULL;
+	config->https_proxy = NULL;
 	config->safe_mode = false;
 	config->allow_writes = true;
 	config->disable_snapshots = false;
 
-	config->n_tty = 0;
-	config->tty_list = NULL;
-	config->boot_tty = NULL;
+	config->n_consoles = 0;
+	config->consoles = NULL;
+	config->boot_console = NULL;
 
 	config->n_autoboot_opts = 2;
 	config->autoboot_opts = talloc_array(config, struct autoboot_option,