discover/syslinux-parser: Fix missing comma in ignored names.

[petitboot] / discover / platform.c

diff --git a/discover/platform.c b/discover/platform.c
index 74e2a82df3225519fdcc2ad49ebc3502214bda09..cc6306f035b96e622fb40026b780925279ac78fa 100644 (file)
--- a/discover/platform.c
+++ b/discover/platform.c
@@ -3,6 +3,7 @@
 
 #include <fcntl.h>
 #include <string.h>
+#include <locale.h>
 
 #include <log/log.h>
 #include <file/file.h>
@@ -35,6 +36,9 @@ static void dump_config(struct config *config)
        if (config->safe_mode)
                pb_log(" safe mode: active\n");
 
+       if (config->disable_snapshots)
+               pb_log(" dm-snapshots disabled\n");
+
        for (i = 0; i < config->network.n_interfaces; i++) {
                struct interface_config *ifconf =
                        config->network.interfaces[i];
@@ -56,6 +60,7 @@ static void dump_config(struct config *config)
                        pb_log("   static:\n");
                        pb_log("    ip:  %s\n", ifconf->static_config.address);
                        pb_log("    gw:  %s\n", ifconf->static_config.gateway);
+                       pb_log("    url:  %s\n", ifconf->static_config.url);
 
                }
        }
@@ -74,6 +79,19 @@ static void dump_config(struct config *config)
        pb_log("  IPMI boot device 0x%02x%s\n", config->ipmi_bootdev,
                        config->ipmi_bootdev_persistent ? " (persistent)" : "");
 
+       pb_log("  Modifications allowed to disks: %s\n",
+                       config->allow_writes ? "yes" : "no");
+
+       pb_log("  Default UI to boot on: %s\n",
+               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 ?: "");
 }
@@ -99,6 +117,8 @@ static bool config_debug_on_cmdline(void)
 
 void config_set_defaults(struct config *config)
 {
+       const char *lang;
+
        config->autoboot_enabled = true;
        config->autoboot_timeout_sec = 10;
        config->autoboot_enabled = true;
@@ -106,8 +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->lang = NULL;
+       config->allow_writes = true;
+       config->disable_snapshots = false;
+
+       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,
@@ -121,6 +148,14 @@ void config_set_defaults(struct config *config)
        config->ipmi_bootdev_persistent = false;
 
        config->debug = config_debug_on_cmdline();
+
+       lang = setlocale(LC_ALL, NULL);
+       pb_log("lang: %s\n", lang);
+       if (lang && strlen(lang))
+               config->lang = talloc_strdup(config, lang);
+       else
+               config->lang = NULL;
+
 }
 
 int platform_init(void *ctx)