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,8 +4005,15 @@
25 MULTI_USER_TARGET_WANTS += \
27 systemd-logind.service
29 +FINAL_TARGET_WANTS += \
32 +GRAPHICAL_TARGET_WANTS += \
33 + display-manager.service
35 SYSTEM_UNIT_ALIASES += \
36 systemd-logind.service dbus-org.freedesktop.login1.service
38 @@ -4493,6 +4504,10 @@
39 uninstall-hook: $(UNINSTALL_DATA_HOOKS) $(UNINSTALL_EXEC_HOOKS)
41 install-data-hook: $(INSTALL_DATA_HOOKS)
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 )
47 distclean-local: $(DISTCLEAN_LOCAL_HOOKS)
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
56 +static int read_distro_hostname(char **hn) {
58 + _cleanup_fclose_ FILE *f = NULL;
62 + f = fopen("/etc/sysconfig/network", "re");
67 + char line[LINE_MAX];
70 + if (!fgets(line, sizeof(line), f)) {
80 + if (!startswith_no_case(s, "HOSTNAME="))
89 + hostname_cleanup(k, false);
108 +static int read_hostname(char **hn) {
113 + /* First, try to load the generic hostname configuration file,
114 + * that we support on all distributions */
116 + r = read_hostname_config("/etc/hostname", hn);
119 + return read_distro_hostname(hn);
127 int hostname_setup(void) {
129 _cleanup_free_ char *b = NULL;
133 - r = read_hostname_config("/etc/hostname", &b);
134 + r = read_hostname(&b);
138 diff -dur -x '*~' -x '*.orig' systemd-208.orig/src/core/locale-setup.c systemd-208/src/core/locale-setup.c
139 --- systemd-208.orig/src/core/locale-setup.c 2013-10-01 00:17:21.000000000 +0200
140 +++ systemd-208/src/core/locale-setup.c 2014-01-09 15:15:41.000000000 +0100
143 if (detect_container(NULL) <= 0) {
144 r = parse_env_file("/proc/cmdline", WHITESPACE,
145 + "LANG", &variables[VARIABLE_LANG],
146 "locale.LANG", &variables[VARIABLE_LANG],
147 "locale.LANGUAGE", &variables[VARIABLE_LANGUAGE],
148 "locale.LC_CTYPE", &variables[VARIABLE_LC_CTYPE],
150 log_warning("Failed to read /etc/locale.conf: %s", strerror(-r));
154 + (r = parse_env_file("/etc/sysconfig/i18n", NEWLINE,
155 + "LANG", &variables[VARIABLE_LANG],
159 + log_warning("Failed to read /etc/sysconfig/i18n: %s", strerror(-r));
163 for (i = 0; i < _VARIABLE_MAX; i++) {
165 diff -dur -x '*~' -x '*.orig' systemd-208.orig/src/timedate/timedated.c systemd-208/src/timedate/timedated.c
166 --- systemd-208.orig/src/timedate/timedated.c 2013-08-13 22:02:47.000000000 +0200
167 +++ systemd-208/src/timedate/timedated.c 2014-01-09 15:15:41.000000000 +0100
172 + goto have_timezone;
176 + r = parse_env_file("/etc/sysconfig/timezone", NEWLINE,
177 + "TIMEZONE", &c->zone,
181 + log_warning("Failed to read /etc/sysconfig/timezone: %s", strerror(-r));
185 if (isempty(c->zone)) {
188 diff -dur -x '*~' -x '*.orig' systemd-208.orig/src/vconsole/vconsole-setup.c systemd-208/src/vconsole/vconsole-setup.c
189 --- systemd-208.orig/src/vconsole/vconsole-setup.c 2013-08-13 22:02:47.000000000 +0200
190 +++ systemd-208/src/vconsole/vconsole-setup.c 2014-01-09 15:17:49.000000000 +0100
191 @@ -284,6 +284,17 @@ int main(int argc, char **argv) {
192 if (r < 0 && r != -ENOENT)
193 log_warning("Failed to read /etc/vconsole.conf: %s", strerror(-r));
196 + int r1 = parse_env_file("/etc/sysconfig/console", NEWLINE,
197 + "CONSOLEFONT", &vc_font,
198 + "CONSOLEMAP", &vc_font_map,
199 + "CONSOLESCREENFONTMAP", &vc_font_unimap,
200 + "KEYTABLE", &vc_keymap,
202 + if (r1 < 0 && r1 != -ENOENT)
203 + log_warning("Failed to read /etc/sysconfig/console: %s", strerror(-r1));
206 /* Let the kernel command line override /etc/vconsole.conf */
207 if (detect_container(NULL) <= 0) {
208 r = parse_env_file("/proc/cmdline", WHITESPACE,