From 34f0fd8187e3de692a04f20958893e163ead72ca Mon Sep 17 00:00:00 2001 From: Florian Kriener Date: Tue, 29 Mar 2011 18:31:38 +0200 Subject: [PATCH] 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. --- src/locale-setup.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/locale-setup.c b/src/locale-setup.c index f6fd97eb..e146746d 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) -- 2.39.5