diff options
| author | Florian Kriener <florian@kriener.org> | 2011-03-29 18:31:38 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2011-03-29 19:41:06 +0200 |
| commit | 34f0fd8187e3de692a04f20958893e163ead72ca (patch) | |
| tree | 82c7954a7a96cdb6ff9c78100c9c3e9867218f75 /src/locale-setup.c | |
| parent | 964d124efad8a2fe07141338cb4ef674f7217fe2 (diff) | |
locale: full fledged /etc/default/locale support for debian
debian uses /etc/default/locale for all locale setup, this patch
adds full support for it to systemd.
Diffstat (limited to 'src/locale-setup.c')
| -rw-r--r-- | src/locale-setup.c | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/src/locale-setup.c b/src/locale-setup.c index f6fd97ebb..e146746df 100644 --- a/src/locale-setup.c +++ b/src/locale-setup.c @@ -139,7 +139,19 @@ int locale_setup(void) { #elif defined(TARGET_DEBIAN) || defined(TARGET_UBUNTU) if (r <= 0 && (r = parse_env_file("/etc/default/locale", NEWLINE, - "LANG", &variables[VARIABLE_LANG], + "LANG", &variables[VARIABLE_LANG], + "LC_CTYPE", &variables[VARIABLE_LC_CTYPE], + "LC_NUMERIC", &variables[VARIABLE_LC_NUMERIC], + "LC_TIME", &variables[VARIABLE_LC_TIME], + "LC_COLLATE", &variables[VARIABLE_LC_COLLATE], + "LC_MONETARY", &variables[VARIABLE_LC_MONETARY], + "LC_MESSAGES", &variables[VARIABLE_LC_MESSAGES], + "LC_PAPER", &variables[VARIABLE_LC_PAPER], + "LC_NAME", &variables[VARIABLE_LC_NAME], + "LC_ADDRESS", &variables[VARIABLE_LC_ADDRESS], + "LC_TELEPHONE", &variables[VARIABLE_LC_TELEPHONE], + "LC_MEASUREMENT", &variables[VARIABLE_LC_MEASUREMENT], + "LC_IDENTIFICATION", &variables[VARIABLE_LC_IDENTIFICATION], NULL)) < 0) { if (r != -ENOENT) |