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

diff -dur -x '*~' -x '*.orig' systemd-208.orig/Makefile.am systemd-208/Makefile.am
--- systemd-208.orig/Makefile.am	2013-10-02 04:57:09.000000000 +0200
+++ systemd-208/Makefile.am	2014-01-09 15:15:41.000000000 +0100
@@ -211,6 +211,8 @@
 TIMERS_TARGET_WANTS =
 USER_SOCKETS_TARGET_WANTS =
 USER_BUSNAMES_TARGET_WANTS =
+FINAL_TARGET_WANTS =
+GRAPHICAL_TARGET_WANTS =
 
 SYSTEM_UNIT_ALIASES =
 USER_UNIT_ALIASES =
@@ -230,6 +232,8 @@
 	what="$(SLICES_TARGET_WANTS)" && wants=slices.target && $(add-wants)
 	what="$(USER_SOCKETS_TARGET_WANTS)" && wants=sockets.target && dir=$(userunitdir) && $(add-wants)
 	what="$(USER_BUSNAMES_TARGET_WANTS)" && wants=busnames.target && dir=$(userunitdir) && $(add-wants)
+	what="$(FINAL_TARGET_WANTS)" && wants=final.target && dir=$(systemunitdir) && $(add-wants)
+	what="$(GRAPHICAL_TARGET_WANTS)" && wants=graphical.target && dir=$(systemunitdir) && $(add-wants)
 
 define add-wants
 	[ -z "$$what" ] || ( \
@@ -4001,8 +4005,15 @@
 	$(systemdstatedir)
 
 MULTI_USER_TARGET_WANTS += \
+	rc-local.service \
 	systemd-logind.service
 
+FINAL_TARGET_WANTS += \
+	halt-local.service
+
+GRAPHICAL_TARGET_WANTS += \
+	display-manager.service
+
 SYSTEM_UNIT_ALIASES += \
 	systemd-logind.service dbus-org.freedesktop.login1.service
 
@@ -4493,6 +4504,10 @@
 uninstall-hook: $(UNINSTALL_DATA_HOOKS) $(UNINSTALL_EXEC_HOOKS)
 
 install-data-hook: $(INSTALL_DATA_HOOKS)
+	( cd $(DESTDIR)$(systemunitdir) && \
+		rm -f display-manager.service single.service && \
+		$(LN_S) prefdm.service display-manager.service && \
+		$(LN_S) rescue.service single.service )
 
 distclean-local: $(DISTCLEAN_LOCAL_HOOKS)
 
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) {
         int r;
         _cleanup_free_ char *b = NULL;
         const char *hn;
         bool enoent = false;
 
-        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,
Commit	Line	Data
808bb44c JK	1	diff -dur -x '~' -x '.orig' systemd-208.orig/Makefile.am systemd-208/Makefile.am
	2	--- systemd-208.orig/Makefile.am 2013-10-02 04:57:09.000000000 +0200
	3	+++ systemd-208/Makefile.am 2014-01-09 15:15:41.000000000 +0100
	4	@@ -211,6 +211,8 @@
bce90f0e	5	TIMERS_TARGET_WANTS =
995ed764 TR	6	USER_SOCKETS_TARGET_WANTS =
995ed764 TR	7	USER_BUSNAMES_TARGET_WANTS =
d31498aa JR	8	+FINAL_TARGET_WANTS =
d31498aa JR	9	+GRAPHICAL_TARGET_WANTS =
440d1d13	10
d31498aa JR	11	SYSTEM_UNIT_ALIASES =
d31498aa JR	12	USER_UNIT_ALIASES =
808bb44c	13	@@ -230,6 +232,8 @@
1aed57ba	14	what="$(SLICES_TARGET_WANTS)" && wants=slices.target && $(add-wants)
995ed764 TR	15	what="$(USER_SOCKETS_TARGET_WANTS)" && wants=sockets.target && dir=$(userunitdir) && $(add-wants)
	16	what="$(USER_BUSNAMES_TARGET_WANTS)" && wants=busnames.target && dir=$(userunitdir) && $(add-wants)
	17	+ what="$(FINAL_TARGET_WANTS)" && wants=final.target && dir=$(systemunitdir) && $(add-wants)
	18	+ what="$(GRAPHICAL_TARGET_WANTS)" && wants=graphical.target && dir=$(systemunitdir) && $(add-wants)
d31498aa JR	19
	20	define add-wants
	21	[ -z "$$what" ] \|\| ( \
7edc5189	22	@@ -4001,8 +4005,15 @@
d31498aa JR	23	$(systemdstatedir)
	24
	25	MULTI_USER_TARGET_WANTS += \
	26	+ rc-local.service \
7edc5189	27	systemd-logind.service
d31498aa JR	28
	29	+FINAL_TARGET_WANTS += \
	30	+ halt-local.service
	31	+
	32	+GRAPHICAL_TARGET_WANTS += \
	33	+ display-manager.service
	34	+
	35	SYSTEM_UNIT_ALIASES += \
	36	systemd-logind.service dbus-org.freedesktop.login1.service
	37
808bb44c	38	@@ -4493,6 +4504,10 @@
d31498aa JR	39	uninstall-hook: $(UNINSTALL_DATA_HOOKS) $(UNINSTALL_EXEC_HOOKS)
	40
	41	install-data-hook: $(INSTALL_DATA_HOOKS)
4d29e184 BZ	42	+ ( cd $(DESTDIR)$(systemunitdir) && \
	43	+ rm -f display-manager.service single.service && \
	44	+ $(LN_S) prefdm.service display-manager.service && \
	45	+ $(LN_S) rescue.service single.service )
440d1d13	46
d31498aa JR	47	distclean-local: $(DISTCLEAN_LOCAL_HOOKS)
d31498aa JR	48
808bb44c JK	49	diff -dur -x '~' -x '.orig' systemd-208.orig/src/core/hostname-setup.c systemd-208/src/core/hostname-setup.c
	50	--- systemd-208.orig/src/core/hostname-setup.c 2013-08-13 22:02:46.000000000 +0200
	51	+++ systemd-208/src/core/hostname-setup.c 2014-01-09 15:15:41.000000000 +0100
c75f826c AM	52	@@ -23,6 +23,7 @@
	53
	54	#include "alloc-util.h"
	55	#include "fileio.h"
	56	+#include "fd-util.h"
	57	#include "hostname-setup.h"
	58	#include "hostname-util.h"
	59	#include "log.h"
808bb44c	60	@@ -53,13 +53,84 @@
da7cff0c JR	61	return 0;
da7cff0c JR	62	}
4d29e184	63
da7cff0c JR	64	+static int read_distro_hostname(char **hn) {
	65	+ int r;
	66	+ _cleanup_fclose_ FILE *f = NULL;
	67	+
	68	+ assert(hn);
	69	+
	70	+ f = fopen("/etc/sysconfig/network", "re");
	71	+ if (!f)
	72	+ return -errno;
	73	+
	74	+ for (;;) {
	75	+ char line[LINE_MAX];
	76	+ char s, k;
	77	+
	78	+ if (!fgets(line, sizeof(line), f)) {
	79	+ if (feof(f))
	80	+ break;
	81	+
	82	+ r = -errno;
	83	+ goto finish;
	84	+ }
	85	+
	86	+ s = strstrip(line);
	87	+
	88	+ if (!startswith_no_case(s, "HOSTNAME="))
	89	+ continue;
	90	+
	91	+ k = strdup(s+9);
	92	+ if (!k) {
	93	+ r = -ENOMEM;
	94	+ goto finish;
	95	+ }
	96	+
c75f826c	97	+ hostname_cleanup(k);
da7cff0c JR	98	+
	99	+ if (isempty(k)) {
	100	+ free(k);
	101	+ r = -ENOENT;
	102	+ goto finish;
	103	+ }
	104	+
	105	+ *hn = k;
	106	+ r = 0;
	107	+ goto finish;
	108	+ }
	109	+
	110	+ r = -ENOENT;
	111	+
	112	+finish:
	113	+ return r;
	114	+}
	115	+
	116	+static int read_hostname(char **hn) {
	117	+ int r;
	118	+
	119	+ assert(hn);
	120	+
	121	+ /* First, try to load the generic hostname configuration file,
	122	+ * that we support on all distributions */
	123	+
7edc5189	124	+ r = read_hostname_config("/etc/hostname", hn);
da7cff0c JR	125	+ if (r < 0) {
	126	+ if (r == -ENOENT)
	127	+ return read_distro_hostname(hn);
	128	+
	129	+ return r;
	130	+ }
	131	+
	132	+ return 0;
	133	+}
	134	+
	135	int hostname_setup(void) {
4d29e184	136	int r;
da7cff0c JR	137	_cleanup_free_ char *b = NULL;
	138	const char *hn;
	139	bool enoent = false;
4d29e184	140
7edc5189	141	- r = read_hostname_config("/etc/hostname", &b);
da7cff0c JR	142	+ r = read_hostname(&b);
	143	if (r < 0) {
	144	if (r == -ENOENT)
	145	enoent = true;
808bb44c JK	146	diff -dur -x '~' -x '.orig' systemd-208.orig/src/core/locale-setup.c systemd-208/src/core/locale-setup.c
	147	--- systemd-208.orig/src/core/locale-setup.c 2013-10-01 00:17:21.000000000 +0200
	148	+++ systemd-208/src/core/locale-setup.c 2014-01-09 15:15:41.000000000 +0100
	149	@@ -76,6 +76,7 @@
4d29e184	150
da7cff0c JR	151	if (detect_container(NULL) <= 0) {
	152	r = parse_env_file("/proc/cmdline", WHITESPACE,
	153	+ "LANG", &variables[VARIABLE_LANG],
	154	"locale.LANG", &variables[VARIABLE_LANG],
	155	"locale.LANGUAGE", &variables[VARIABLE_LANGUAGE],
	156	"locale.LC_CTYPE", &variables[VARIABLE_LC_CTYPE],
808bb44c	157	@@ -120,6 +121,15 @@
4d29e184 BZ	158	log_warning("Failed to read /etc/locale.conf: %s", strerror(-r));
	159	}
	160
da7cff0c JR	161	+ if (r <= 0 &&
	162	+ (r = parse_env_file("/etc/sysconfig/i18n", NEWLINE,
	163	+ "LANG", &variables[VARIABLE_LANG],
	164	+ NULL)) < 0) {
	165	+
	166	+ if (r != -ENOENT)
	167	+ log_warning("Failed to read /etc/sysconfig/i18n: %s", strerror(-r));
	168	+ }
	169	+
3d025d25	170	add = NULL;
11fa1d33	171	for (i = 0; i < _VARIABLE_MAX; i++) {
808bb44c	172	char *s;
c75f826c AM	173	--- a/src/basic/time-util.c~ 2016-11-03 18:16:42.000000000 +0100
	174	+++ b/src/basic/time-util.c 2016-11-12 19:54:28.457197174 +0100
	175	@@ -1290,8 +1290,16 @@ int get_timezone(char **tz) {
	176	e = path_startswith(t, "/usr/share/zoneinfo/");
	177	if (!e)
	178	e = path_startswith(t, "../usr/share/zoneinfo/");
	179	- if (!e)
	180	- return -EINVAL;
	181	+ if (!e) {
	182	+ r = parse_env_file("/etc/sysconfig/timezone", NEWLINE,
	183	+ "TIMEZONE", &e,
	184	+ NULL);
	185	+ if (r < 0) {
	186	+ if (r != -ENOENT)
	187	+ log_warning("Failed to read /etc/sysconfig/timezone: %s", strerror(-r));
	188	+ return -EINVAL;
	189	+ }
	190	+ }
a2211e27	191
c75f826c AM	192	if (!timezone_is_valid(e))
c75f826c AM	193	return -EINVAL;
808bb44c JK	194	diff -dur -x '~' -x '.orig' systemd-208.orig/src/vconsole/vconsole-setup.c systemd-208/src/vconsole/vconsole-setup.c
	195	--- systemd-208.orig/src/vconsole/vconsole-setup.c 2013-08-13 22:02:47.000000000 +0200
	196	+++ systemd-208/src/vconsole/vconsole-setup.c 2014-01-09 15:17:49.000000000 +0100
abea5afb AM	197	@@ -284,6 +284,17 @@ int main(int argc, char **argv) {
	198	if (r < 0 && r != -ENOENT)
	199	log_warning("Failed to read /etc/vconsole.conf: %s", strerror(-r));
808bb44c	200
d31498aa	201	+ if (r <= 0) {
abea5afb AM	202	+ int r1 = parse_env_file("/etc/sysconfig/console", NEWLINE,
	203	+ "CONSOLEFONT", &vc_font,
	204	+ "CONSOLEMAP", &vc_font_map,
	205	+ "CONSOLESCREENFONTMAP", &vc_font_unimap,
	206	+ "KEYTABLE", &vc_keymap,
	207	+ NULL);
808bb44c JK	208	+ if (r1 < 0 && r1 != -ENOENT)
808bb44c JK	209	+ log_warning("Failed to read /etc/sysconfig/console: %s", strerror(-r1));
abea5afb	210	+ }
808bb44c	211	+
abea5afb AM	212	/* Let the kernel command line override /etc/vconsole.conf */
	213	if (detect_container(NULL) <= 0) {
	214	r = parse_env_file("/proc/cmdline", WHITESPACE,