File 0001-Revert-locale-setup-handle-locale-at-boot-... of Package systemd

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-Revert-locale-setup-handle-locale-at-boot-time-well.patch of Package systemd (Revision 4656560bfd5667a62c16dc8006385e3b)

Currently displaying revision 4656560bfd5667a62c16dc8006385e3b , Show latest

From d20ca21a214427371c7cfc18ec08f1819889c5c4 Mon Sep 17 00:00:00 2001
From: Franck Bui <fbui@suse.com>
Date: Tue, 28 Nov 2017 09:44:57 +0100
Subject: [PATCH 1/2] Revert "locale-setup: handle locale at boot time well"

This reverts commit 01c4b6f4f0d951d17f6873f68156ecd7763429c6.

[fbui: fate#319454]
---
 src/core/locale-setup.c | 39 ---------------------------------------
 1 file changed, 39 deletions(-)

diff --git a/src/core/locale-setup.c b/src/core/locale-setup.c
index 36f631ea3..fdd847ee8 100644
--- a/src/core/locale-setup.c
+++ b/src/core/locale-setup.c
@@ -21,7 +21,6 @@
 #include <stdlib.h>
 
 #include "env-util.h"
-#include "alloc-util.h"
 #include "fileio.h"
 #include "locale-setup.h"
 #include "locale-util.h"
@@ -34,8 +33,6 @@ int locale_setup(char ***environment) {
         char **add;
         char *variables[_VARIABLE_LC_MAX] = {};
         int r = 0, i;
-        char _cleanup_free_ *rc_lang = NULL, *rc_lc_ctype = NULL;
-        char _cleanup_free_ *root_uses_lang = NULL;
 
         if (detect_container() <= 0) {
                 r = parse_env_file("/proc/cmdline", WHITESPACE,
@@ -83,42 +80,6 @@ int locale_setup(char ***environment) {
                         log_warning_errno(r, "Failed to read /etc/locale.conf: %m");
         }
 
-        r = parse_env_file("/etc/sysconfig/language", NEWLINE,
-                           "RC_LANG", &rc_lang,
-                           "RC_LC_CTYPE", &rc_lc_ctype,
-                           "ROOT_USES_LANG", &root_uses_lang,
-                           NULL);
-
-        if (r < 0 && r != -ENOENT)
-                log_warning_errno(r, "Failed to read /etc/sysconfig/language: %m");
-
-        /*
-         * Use the values of the interactive locale configuration in /etc/sysconfig/language
-         * as fallback if /etc/locale.conf does not exist and no locale was specified on the
-         * kernel's command line.  The special case ROOT_USES_LANG=ctype allows to set LC_CTYPE
-         * even if LANG for root is set to e.g. POSIX. But do this only if no LC_CTYPE has been
-         * set in /etc/locale.conf and on the kernel's command line.
-         */
-        if (root_uses_lang) {
-                if (strcaseeq(root_uses_lang, "yes") && !variables[VARIABLE_LANG]) {
-                        variables[VARIABLE_LANG] = rc_lang;
-                        rc_lang = NULL;
-                }
-                if (strcaseeq(root_uses_lang, "ctype") && !variables[VARIABLE_LC_CTYPE]) {
-                        if (variables[VARIABLE_LANG])
-                                variables[VARIABLE_LC_CTYPE] = strdup(variables[VARIABLE_LANG]);
-
-                        else if (!isempty(rc_lc_ctype)) {
-                                variables[VARIABLE_LC_CTYPE] = rc_lc_ctype;
-                                rc_lc_ctype = NULL;
-
-                        } else if (!isempty(rc_lang)) {
-                                variables[VARIABLE_LC_CTYPE] = rc_lang;
-                                rc_lang = NULL;
-                        }
-                }
-        }
-
         add = NULL;
         for (i = 0; i < _VARIABLE_LC_MAX; i++) {
                 char *s;
-- 
2.14.2

Places

File 0001-Revert-locale-setup-handle-locale-at-boot-time-well.patch of Package systemd (Revision 4656560bfd5667a62c16dc8006385e3b)

Places