X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Flocale%2Flocalectl.c;h=41a88a828c2cbdd81d04b3f923beb996ea09ccf8;hp=8acc212033872399b5b421ad78efbc879c6087e0;hb=de33fc625725d199629ed074d6278504deb23deb;hpb=7568345034f2890af745747783c5abfbf6eccf0f diff --git a/src/locale/localectl.c b/src/locale/localectl.c index 8acc21203..41a88a828 100644 --- a/src/locale/localectl.c +++ b/src/locale/localectl.c @@ -43,6 +43,8 @@ #include "path-util.h" #include "utf8.h" #include "def.h" +#include "virt.h" +#include "fileio.h" #include "locale-util.h" static bool arg_no_pager = false; @@ -81,6 +83,52 @@ typedef struct StatusInfo { const char *x11_options; } StatusInfo; +static void print_overriden_variables(void) { + int r; + char *variables[_VARIABLE_LC_MAX] = {}; + LocaleVariable j; + bool print_warning = true; + + if (detect_container(NULL) > 0 || arg_host) + return; + + r = parse_env_file("/proc/cmdline", WHITESPACE, + "locale.LANG", &variables[VARIABLE_LANG], + "locale.LANGUAGE", &variables[VARIABLE_LANGUAGE], + "locale.LC_CTYPE", &variables[VARIABLE_LC_CTYPE], + "locale.LC_NUMERIC", &variables[VARIABLE_LC_NUMERIC], + "locale.LC_TIME", &variables[VARIABLE_LC_TIME], + "locale.LC_COLLATE", &variables[VARIABLE_LC_COLLATE], + "locale.LC_MONETARY", &variables[VARIABLE_LC_MONETARY], + "locale.LC_MESSAGES", &variables[VARIABLE_LC_MESSAGES], + "locale.LC_PAPER", &variables[VARIABLE_LC_PAPER], + "locale.LC_NAME", &variables[VARIABLE_LC_NAME], + "locale.LC_ADDRESS", &variables[VARIABLE_LC_ADDRESS], + "locale.LC_TELEPHONE", &variables[VARIABLE_LC_TELEPHONE], + "locale.LC_MEASUREMENT", &variables[VARIABLE_LC_MEASUREMENT], + "locale.LC_IDENTIFICATION", &variables[VARIABLE_LC_IDENTIFICATION], + NULL); + + if (r < 0 && r != -ENOENT) { + log_warning_errno(r, "Failed to read /proc/cmdline: %m"); + goto finish; + } + + for (j = 0; j < _VARIABLE_LC_MAX; j++) + if (variables[j]) { + if (print_warning) { + log_warning("Warning: Settings on kernel command line override system locale settings in /etc/locale.conf.\n" + " Command Line: %s=%s", locale_variable_to_string(j), variables[j]); + + print_warning = false; + } else + log_warning(" %s=%s", locale_variable_to_string(j), variables[j]); + } + finish: + for (j = 0; j < _VARIABLE_LC_MAX; j++) + free(variables[j]); +} + static void print_status_info(StatusInfo *i) { assert(i); @@ -130,10 +178,11 @@ static int show_status(sd_bus *bus, char **args, unsigned n) { map, &info); if (r < 0) { - log_error("Could not get properties: %s", strerror(-r)); + log_error_errno(r, "Could not get properties: %m"); goto fail; } + print_overriden_variables(); print_status_info(&info); fail: @@ -185,10 +234,8 @@ static int list_locales(sd_bus *bus, char **args, unsigned n) { assert(args); r = get_locales(&l); - if (r < 0) { - log_error("Failed to read list of locales: %s", strerror(-r)); - return r; - } + if (r < 0) + return log_error_errno(r, "Failed to read list of locales: %m"); pager_open_if_enabled(); strv_print(l); @@ -260,10 +307,8 @@ static int nftw_cb( *e = 0; r = set_consume(keymaps, p); - if (r < 0 && r != -EEXIST) { - log_error("Can't add keymap: %s", strerror(-r)); - return r; - } + if (r < 0 && r != -EEXIST) + return log_error_errno(r, "Can't add keymap: %m"); return 0; } @@ -272,7 +317,7 @@ static int list_vconsole_keymaps(sd_bus *bus, char **args, unsigned n) { _cleanup_strv_free_ char **l = NULL; const char *dir; - keymaps = set_new(string_hash_func, string_compare_func); + keymaps = set_new(&string_hash_ops); if (!keymaps) return log_oom(); @@ -356,10 +401,8 @@ static int list_x11_keymaps(sd_bus *bus, char **args, unsigned n) { } f = fopen("/usr/share/X11/xkb/rules/base.lst", "re"); - if (!f) { - log_error("Failed to open keyboard mapping list. %m"); - return -errno; - } + if (!f) + return log_error_errno(errno, "Failed to open keyboard mapping list. %m"); if (streq(args[0], "list-x11-keymap-models")) look_for = MODELS; @@ -440,8 +483,7 @@ static int list_x11_keymaps(sd_bus *bus, char **args, unsigned n) { return 0; } -static int help(void) { - +static void help(void) { printf("%s [OPTIONS...] COMMAND ...\n\n" "Query or change system locale and keyboard settings.\n\n" " -h --help Show this help\n" @@ -455,18 +497,16 @@ static int help(void) { " status Show current locale settings\n" " set-locale LOCALE... Set system locale\n" " list-locales Show known locales\n" - " set-keymap MAP [MAP] Set virtual console keyboard mapping\n" + " set-keymap MAP [MAP] Set console and X11 keyboard mappings\n" " list-keymaps Show known virtual console keyboard mappings\n" - " set-x11-keymap LAYOUT [MODEL] [VARIANT] [OPTIONS]\n" - " Set X11 keyboard mapping\n" + " set-x11-keymap LAYOUT [MODEL [VARIANT [OPTIONS]]]\n" + " Set X11 and console keyboard mappings\n" " list-x11-keymap-models Show known X11 keyboard mapping models\n" " list-x11-keymap-layouts Show known X11 keyboard mapping layouts\n" " list-x11-keymap-variants [LAYOUT]\n" " Show known X11 keyboard mapping variants\n" - " list-x11-keymap-options Show known X11 keyboard mapping options\n", - program_invocation_short_name); - - return 0; + " list-x11-keymap-options Show known X11 keyboard mapping options\n" + , program_invocation_short_name); } static int parse_argv(int argc, char *argv[]) { @@ -494,12 +534,13 @@ static int parse_argv(int argc, char *argv[]) { assert(argc >= 0); assert(argv); - while ((c = getopt_long(argc, argv, "hH:M:", options, NULL)) >= 0) { + while ((c = getopt_long(argc, argv, "hH:M:", options, NULL)) >= 0) switch (c) { case 'h': - return help(); + help(); + return 0; case ARG_VERSION: puts(PACKAGE_STRING); @@ -524,7 +565,7 @@ static int parse_argv(int argc, char *argv[]) { break; case 'M': - arg_transport = BUS_TRANSPORT_CONTAINER; + arg_transport = BUS_TRANSPORT_MACHINE; arg_host = optarg; break; @@ -534,7 +575,6 @@ static int parse_argv(int argc, char *argv[]) { default: assert_not_reached("Unhandled option"); } - } return 1; } @@ -624,7 +664,7 @@ static int localectl_main(sd_bus *bus, int argc, char *argv[]) { } int main(int argc, char*argv[]) { - _cleanup_bus_unref_ sd_bus *bus = NULL; + _cleanup_bus_close_unref_ sd_bus *bus = NULL; int r; setlocale(LC_ALL, ""); @@ -637,7 +677,7 @@ int main(int argc, char*argv[]) { r = bus_open_transport(arg_transport, arg_host, false, &bus); if (r < 0) { - log_error("Failed to create bus connection: %s", strerror(-r)); + log_error_errno(r, "Failed to create bus connection: %m"); goto finish; }