diff options
| author | Jeremy Kerr <jk@ozlabs.org> | 2015-09-24 14:38:47 +1000 |
|---|---|---|
| committer | Jeremy Kerr <jk@ozlabs.org> | 2015-09-24 14:57:40 +1000 |
| commit | 519d84fe21d48fe277ef5cc65d29839f86b4e1a0 (patch) | |
| tree | 78bd8a29bbc9643cc321bf96d1c3408f8d38c1d8 /discover | |
| parent | 804a112a34aed2d20021f7ae1750d8545bb0149e (diff) | |
| download | talos-petitboot-519d84fe21d48fe277ef5cc65d29839f86b4e1a0.tar.gz talos-petitboot-519d84fe21d48fe277ef5cc65d29839f86b4e1a0.zip | |
discover: Set default language
Rather than setting NULL, do a setlocale(LC_ALL, NULL) to query the
system locale value as our default.
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
Diffstat (limited to 'discover')
| -rw-r--r-- | discover/platform.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/discover/platform.c b/discover/platform.c index a6bd74c..5f448f1 100644 --- 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> @@ -102,6 +103,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; @@ -110,7 +113,6 @@ void config_set_defaults(struct config *config) config->network.dns_servers = NULL; config->network.n_dns_servers = 0; config->safe_mode = false; - config->lang = NULL; config->allow_writes = true; config->disable_snapshots = false; @@ -126,6 +128,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) |
