- release 6 (by relup.sh)

[packages/systemd.git] / target-pld.patch

; rest of target-pld.patch logic in systemd.spec
diff -dur -x '*~' -x '*.orig' systemd-208.orig/src/core/hostname-setup.c systemd-208/src/core/hostname-setup.c
--- systemd-208.orig/src/core/hostname-setup.c	2013-08-13 22:02:46.000000000 +0200
+++ systemd-208/src/core/hostname-setup.c	2014-01-09 15:15:41.000000000 +0100
@@ -23,6 +23,7 @@
 
 #include "alloc-util.h"
 #include "fileio.h"
+#include "fd-util.h"
 #include "hostname-setup.h"
 #include "hostname-util.h"
 #include "log.h"
@@ -53,13 +53,84 @@
         return 0;
 }
 
+static int read_distro_hostname(char **hn) {
+        int r;
+        _cleanup_fclose_ FILE *f = NULL;
+
+        assert(hn);
+
+        f = fopen("/etc/sysconfig/network", "re");
+        if (!f)
+                return -errno;
+
+        for (;;) {
+                char line[LINE_MAX];
+                char *s, *k;
+
+                if (!fgets(line, sizeof(line), f)) {
+                        if (feof(f))
+                                break;
+
+                        r = -errno;
+                        goto finish;
+                }
+
+                s = strstrip(line);
+
+                if (!startswith_no_case(s, "HOSTNAME="))
+                        continue;
+
+                k = strdup(s+9);
+                if (!k) {
+                        r = -ENOMEM;
+                        goto finish;
+                }
+
+                hostname_cleanup(k);
+
+                if (isempty(k)) {
+                        free(k);
+                        r = -ENOENT;
+                        goto finish;
+                }
+
+                *hn = k;
+                r = 0;
+                goto finish;
+        }
+
+        r = -ENOENT;
+
+finish:
+        return r;
+}
+
+static int read_hostname(char **hn) {
+        int r;
+
+        assert(hn);
+
+        /* First, try to load the generic hostname configuration file,
+         * that we support on all distributions */
+
+        r = read_hostname_config("/etc/hostname", hn);
+        if (r < 0) {
+                if (r == -ENOENT)
+                        return read_distro_hostname(hn);
+
+                return r;
+        }
+
+        return 0;
+}
+
 int hostname_setup(void) {
         _cleanup_free_ char *b = NULL;
         bool enoent = false;
         const char *hn;
         int r;
 
-        r = read_hostname_config("/etc/hostname", &b);
+        r = read_hostname(&b);
         if (r < 0) {
                 if (r == -ENOENT)
                         enoent = true;
diff -dur -x '*~' -x '*.orig' systemd-208.orig/src/core/locale-setup.c systemd-208/src/core/locale-setup.c
--- systemd-208.orig/src/core/locale-setup.c	2013-10-01 00:17:21.000000000 +0200
+++ systemd-208/src/core/locale-setup.c	2014-01-09 15:15:41.000000000 +0100
@@ -76,6 +76,7 @@
 
         if (detect_container(NULL) <= 0) {
                 r = parse_env_file("/proc/cmdline", WHITESPACE,
+                                   "LANG",                     &variables[VARIABLE_LANG],
                                    "locale.LANG",              &variables[VARIABLE_LANG],
                                    "locale.LANGUAGE",          &variables[VARIABLE_LANGUAGE],
                                    "locale.LC_CTYPE",          &variables[VARIABLE_LC_CTYPE],
@@ -120,6 +121,15 @@
                         log_warning("Failed to read /etc/locale.conf: %s", strerror(-r));
         }
 
+        if (r <= 0 &&
+            (r = parse_env_file("/etc/sysconfig/i18n", NEWLINE,
+                                "LANG", &variables[VARIABLE_LANG],
+                                NULL)) < 0) {
+
+                if (r != -ENOENT)
+                        log_warning("Failed to read /etc/sysconfig/i18n: %s", strerror(-r));
+        }
+
         add = NULL;
         for (i = 0; i < _VARIABLE_MAX; i++) {
                 char *s;
--- a/src/basic/time-util.c~	2016-11-03 18:16:42.000000000 +0100
+++ b/src/basic/time-util.c	2016-11-12 19:54:28.457197174 +0100
@@ -1290,8 +1290,16 @@ int get_timezone(char **tz) {
         e = path_startswith(t, "/usr/share/zoneinfo/");
         if (!e)
                 e = path_startswith(t, "../usr/share/zoneinfo/");
-        if (!e)
-                return -EINVAL;
+        if (!e) {
+                r = parse_env_file("/etc/sysconfig/timezone", NEWLINE,
+                        "TIMEZONE", &e,
+                        NULL);
+                if (r < 0) {
+                        if (r != -ENOENT)
+                                log_warning("Failed to read /etc/sysconfig/timezone: %s", strerror(-r));
+                        return -EINVAL;
+                }
+        }
 
         if (!timezone_is_valid(e))
                 return -EINVAL;
diff -dur -x '*~' -x '*.orig' systemd-208.orig/src/vconsole/vconsole-setup.c systemd-208/src/vconsole/vconsole-setup.c
--- systemd-208.orig/src/vconsole/vconsole-setup.c	2013-08-13 22:02:47.000000000 +0200
+++ systemd-208/src/vconsole/vconsole-setup.c	2014-01-09 15:17:49.000000000 +0100
@@ -284,6 +284,17 @@ int main(int argc, char **argv) {
         if (r < 0 && r != -ENOENT)
                 log_warning("Failed to read /etc/vconsole.conf: %s", strerror(-r));
 
+        if (r <= 0) {
+                int r1 = parse_env_file("/etc/sysconfig/console", NEWLINE,
+                                "CONSOLEFONT", &vc_font,
+                                "CONSOLEMAP", &vc_font_map,
+                                "CONSOLESCREENFONTMAP", &vc_font_unimap,
+                                "KEYTABLE", &vc_keymap,
+                                NULL);
+                if (r1 < 0 && r1 != -ENOENT)
+                        log_warning("Failed to read /etc/sysconfig/console: %s", strerror(-r1));
+        } 
+
         /* Let the kernel command line override /etc/vconsole.conf */
         if (detect_container(NULL) <= 0) {
                 r = parse_env_file("/proc/cmdline", WHITESPACE,