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
6 USER_SOCKETS_TARGET_WANTS =
7 USER_BUSNAMES_TARGET_WANTS =
9 +GRAPHICAL_TARGET_WANTS =
14 what="$(SLICES_TARGET_WANTS)" && wants=slices.target && $(add-wants)
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)
21 [ -z "$$what" ] || ( \
22 @@ -4001,9 +4005,16 @@
25 MULTI_USER_TARGET_WANTS += \
27 systemd-logind.service \
28 systemd-user-sessions.service
30 +FINAL_TARGET_WANTS += \
33 +GRAPHICAL_TARGET_WANTS += \
34 + display-manager.service
36 SYSTEM_UNIT_ALIASES += \
37 systemd-logind.service dbus-org.freedesktop.login1.service
39 @@ -4493,6 +4504,10 @@
40 uninstall-hook: $(UNINSTALL_DATA_HOOKS) $(UNINSTALL_EXEC_HOOKS)
42 install-data-hook: $(INSTALL_DATA_HOOKS)
43 + ( cd $(DESTDIR)$(systemunitdir) && \
44 + rm -f display-manager.service single.service && \
45 + $(LN_S) prefdm.service display-manager.service && \
46 + $(LN_S) rescue.service single.service )
48 distclean-local: $(DISTCLEAN_LOCAL_HOOKS)
50 diff -dur -x '*~' -x '*.orig' systemd-208.orig/src/core/hostname-setup.c systemd-208/src/core/hostname-setup.c
51 --- systemd-208.orig/src/core/hostname-setup.c 2013-08-13 22:02:46.000000000 +0200
52 +++ systemd-208/src/core/hostname-setup.c 2014-01-09 15:15:41.000000000 +0100
57 +static int read_distro_hostname(char **hn) {
59 + _cleanup_fclose_ FILE *f = NULL;
63 + f = fopen("/etc/sysconfig/network", "re");
68 + char line[LINE_MAX];
71 + if (!fgets(line, sizeof(line), f)) {
81 + if (!startswith_no_case(s, "HOSTNAME="))
90 + hostname_cleanup(k, false);
109 +static int read_hostname(char **hn) {
114 + /* First, try to load the generic hostname configuration file,
115 + * that we support on all distributions */
117 + r = read_and_strip_hostname("/etc/hostname", hn);
120 + return read_distro_hostname(hn);
128 int hostname_setup(void) {
130 _cleanup_free_ char *b = NULL;
134 - r = read_and_strip_hostname("/etc/hostname", &b);
135 + r = read_hostname(&b);
139 diff -dur -x '*~' -x '*.orig' systemd-208.orig/src/core/locale-setup.c systemd-208/src/core/locale-setup.c
140 --- systemd-208.orig/src/core/locale-setup.c 2013-10-01 00:17:21.000000000 +0200
141 +++ systemd-208/src/core/locale-setup.c 2014-01-09 15:15:41.000000000 +0100
144 if (detect_container(NULL) <= 0) {
145 r = parse_env_file("/proc/cmdline", WHITESPACE,
146 + "LANG", &variables[VARIABLE_LANG],
147 "locale.LANG", &variables[VARIABLE_LANG],
148 "locale.LANGUAGE", &variables[VARIABLE_LANGUAGE],
149 "locale.LC_CTYPE", &variables[VARIABLE_LC_CTYPE],
151 log_warning("Failed to read /etc/locale.conf: %s", strerror(-r));
155 + (r = parse_env_file("/etc/sysconfig/i18n", NEWLINE,
156 + "LANG", &variables[VARIABLE_LANG],
160 + log_warning("Failed to read /etc/sysconfig/i18n: %s", strerror(-r));
164 for (i = 0; i < _VARIABLE_MAX; i++) {
166 diff -dur -x '*~' -x '*.orig' systemd-208.orig/src/timedate/timedated.c systemd-208/src/timedate/timedated.c
167 --- systemd-208.orig/src/timedate/timedated.c 2013-08-13 22:02:47.000000000 +0200
168 +++ systemd-208/src/timedate/timedated.c 2014-01-09 15:15:41.000000000 +0100
173 + r = parse_env_file("/etc/sysconfig/timezone", NEWLINE,
174 + "TIMEZONE", &c->zone,
178 + log_warning("Failed to read /etc/sysconfig/timezone: %s", strerror(-r));
182 if (isempty(c->zone)) {
184 diff -dur -x '*~' -x '*.orig' systemd-208.orig/src/vconsole/vconsole-setup.c systemd-208/src/vconsole/vconsole-setup.c
185 --- systemd-208.orig/src/vconsole/vconsole-setup.c 2013-08-13 22:02:47.000000000 +0200
186 +++ systemd-208/src/vconsole/vconsole-setup.c 2014-01-09 15:17:49.000000000 +0100
187 @@ -284,6 +284,17 @@ int main(int argc, char **argv) {
188 if (r < 0 && r != -ENOENT)
189 log_warning("Failed to read /etc/vconsole.conf: %s", strerror(-r));
192 + int r1 = parse_env_file("/etc/sysconfig/console", NEWLINE,
193 + "CONSOLEFONT", &vc_font,
194 + "CONSOLEMAP", &vc_font_map,
195 + "CONSOLESCREENFONTMAP", &vc_font_unimap,
196 + "KEYTABLE", &vc_keymap,
198 + if (r1 < 0 && r1 != -ENOENT)
199 + log_warning("Failed to read /etc/sysconfig/console: %s", strerror(-r1));
202 /* Let the kernel command line override /etc/vconsole.conf */
203 if (detect_container(NULL) <= 0) {
204 r = parse_env_file("/proc/cmdline", WHITESPACE,