1 |
diff -Naur systemd-185/configure.ac systemd-185-magellan/configure.ac |
diff -Naur systemd-185/configure.ac systemd-185-magellan/configure.ac |
2 |
--- systemd-185/configure.ac 2012-06-04 20:06:13.704620269 +0200 |
--- systemd-185/configure.ac 2012-06-04 20:06:13.704620269 +0200 |
3 |
+++ systemd-185-magellan/configure.ac 2012-06-26 16:03:20.226982674 +0200 |
+++ systemd-185-magellan/configure.ac 2012-06-26 16:45:21.419979202 +0200 |
4 |
@@ -494,7 +494,7 @@ |
@@ -494,7 +494,7 @@ |
5 |
AC_PATH_PROG([XSLTPROC], [xsltproc]) |
AC_PATH_PROG([XSLTPROC], [xsltproc]) |
6 |
AM_CONDITIONAL(HAVE_XSLTPROC, test x"$XSLTPROC" != x) |
AM_CONDITIONAL(HAVE_XSLTPROC, test x"$XSLTPROC" != x) |
34 |
AM_CONDITIONAL(TARGET_ALTLINUX, test x"$with_distro" = xaltlinux) |
AM_CONDITIONAL(TARGET_ALTLINUX, test x"$with_distro" = xaltlinux) |
35 |
diff -Naur systemd-185/Makefile.am systemd-185-magellan/Makefile.am |
diff -Naur systemd-185/Makefile.am systemd-185-magellan/Makefile.am |
36 |
--- systemd-185/Makefile.am 2012-06-04 20:14:57.703501056 +0200 |
--- systemd-185/Makefile.am 2012-06-04 20:14:57.703501056 +0200 |
37 |
+++ systemd-185-magellan/Makefile.am 2012-06-26 16:04:38.444982768 +0200 |
+++ systemd-185-magellan/Makefile.am 2012-06-26 16:45:21.420979286 +0200 |
38 |
@@ -153,6 +153,12 @@ |
@@ -153,6 +153,12 @@ |
39 |
-DKBD_SETFONT=\"/usr/bin/setfont\" \ |
-DKBD_SETFONT=\"/usr/bin/setfont\" \ |
40 |
-DDEFAULT_FONT=\"LatArCyrHeb-16\" |
-DDEFAULT_FONT=\"LatArCyrHeb-16\" |
58 |
endif |
endif |
59 |
diff -Naur systemd-185/src/core/hostname-setup.c systemd-185-magellan/src/core/hostname-setup.c |
diff -Naur systemd-185/src/core/hostname-setup.c systemd-185-magellan/src/core/hostname-setup.c |
60 |
--- systemd-185/src/core/hostname-setup.c 2012-05-21 19:23:02.751293222 +0200 |
--- systemd-185/src/core/hostname-setup.c 2012-05-21 19:23:02.751293222 +0200 |
61 |
+++ systemd-185-magellan/src/core/hostname-setup.c 2012-06-26 16:08:41.560982822 +0200 |
+++ systemd-185-magellan/src/core/hostname-setup.c 2012-06-26 16:45:21.420979286 +0200 |
62 |
@@ -34,6 +34,8 @@ |
@@ -34,6 +34,8 @@ |
63 |
#define FILENAME "/etc/sysconfig/network" |
#define FILENAME "/etc/sysconfig/network" |
64 |
#elif defined(TARGET_SUSE) || defined(TARGET_SLACKWARE) |
#elif defined(TARGET_SUSE) || defined(TARGET_SLACKWARE) |
79 |
return -ENOENT; |
return -ENOENT; |
80 |
diff -Naur systemd-185/src/core/locale-setup.c systemd-185-magellan/src/core/locale-setup.c |
diff -Naur systemd-185/src/core/locale-setup.c systemd-185-magellan/src/core/locale-setup.c |
81 |
--- systemd-185/src/core/locale-setup.c 2012-04-12 01:04:30.612222912 +0200 |
--- systemd-185/src/core/locale-setup.c 2012-04-12 01:04:30.612222912 +0200 |
82 |
+++ systemd-185-magellan/src/core/locale-setup.c 2012-06-26 16:11:06.075983329 +0200 |
+++ systemd-185-magellan/src/core/locale-setup.c 2012-06-26 16:45:21.420979286 +0200 |
83 |
@@ -173,7 +173,7 @@ |
@@ -173,7 +173,7 @@ |
84 |
log_warning("Failed to read /etc/rc.conf: %s", strerror(-r)); |
log_warning("Failed to read /etc/rc.conf: %s", strerror(-r)); |
85 |
} |
} |
91 |
* export commands at /etc/profile.env, with variables being |
* export commands at /etc/profile.env, with variables being |
92 |
diff -Naur systemd-185/src/fsck/fsck.c systemd-185-magellan/src/fsck/fsck.c |
diff -Naur systemd-185/src/fsck/fsck.c systemd-185-magellan/src/fsck/fsck.c |
93 |
--- systemd-185/src/fsck/fsck.c 2012-04-12 17:54:42.016667199 +0200 |
--- systemd-185/src/fsck/fsck.c 2012-04-12 17:54:42.016667199 +0200 |
94 |
+++ systemd-185-magellan/src/fsck/fsck.c 2012-06-26 16:06:03.926982686 +0200 |
+++ systemd-185-magellan/src/fsck/fsck.c 2012-06-26 16:45:21.421979382 +0200 |
95 |
@@ -127,7 +127,7 @@ |
@@ -127,7 +127,7 @@ |
96 |
arg_skip = true; |
arg_skip = true; |
97 |
else if (startswith(w, "fsck.mode")) |
else if (startswith(w, "fsck.mode")) |
103 |
else if (strneq(w, "forcefsck", l)) |
else if (strneq(w, "forcefsck", l)) |
104 |
diff -Naur systemd-185/src/quotacheck/quotacheck.c systemd-185-magellan/src/quotacheck/quotacheck.c |
diff -Naur systemd-185/src/quotacheck/quotacheck.c systemd-185-magellan/src/quotacheck/quotacheck.c |
105 |
--- systemd-185/src/quotacheck/quotacheck.c 2012-04-12 17:54:42.017667199 +0200 |
--- systemd-185/src/quotacheck/quotacheck.c 2012-04-12 17:54:42.017667199 +0200 |
106 |
+++ systemd-185-magellan/src/quotacheck/quotacheck.c 2012-06-26 16:13:20.141982550 +0200 |
+++ systemd-185-magellan/src/quotacheck/quotacheck.c 2012-06-26 16:45:21.421979382 +0200 |
107 |
@@ -54,7 +54,7 @@ |
@@ -54,7 +54,7 @@ |
108 |
arg_skip = true; |
arg_skip = true; |
109 |
else if (startswith(w, "quotacheck.mode")) |
else if (startswith(w, "quotacheck.mode")) |
126 |
#endif |
#endif |
127 |
diff -Naur systemd-185/src/vconsole/vconsole-setup.c systemd-185-magellan/src/vconsole/vconsole-setup.c |
diff -Naur systemd-185/src/vconsole/vconsole-setup.c systemd-185-magellan/src/vconsole/vconsole-setup.c |
128 |
--- systemd-185/src/vconsole/vconsole-setup.c 2012-05-03 22:03:17.886325106 +0200 |
--- systemd-185/src/vconsole/vconsole-setup.c 2012-05-03 22:03:17.886325106 +0200 |
129 |
+++ systemd-185-magellan/src/vconsole/vconsole-setup.c 2012-06-26 16:16:08.339982793 +0200 |
+++ systemd-185-magellan/src/vconsole/vconsole-setup.c 2012-06-26 16:47:07.461982434 +0200 |
130 |
@@ -163,6 +163,20 @@ |
@@ -359,6 +359,20 @@ |
131 |
#ifdef TARGET_GENTOO |
if (r < 0 && r != -ENOENT) |
132 |
char *vc_unicode = NULL; |
log_warning("Failed to read /etc/conf.d/keymaps: %s", strerror(-r)); |
133 |
#endif |
|
134 |
+#ifdef TARGET_MAGELLAN |
+#elif defined(TARGET_MAGELLAN) |
135 |
+ if ((r = parse_env_file("/etc/conf.d/keymap", NEWLINE, |
+ if ((r = parse_env_file("/etc/conf.d/keymap", NEWLINE, |
136 |
+ "KEYMAP", &vc_keymap, |
+ "KEYMAP", &vc_keymap, |
137 |
+ NULL)) < 0) { |
+ NULL)) < 0) { |
138 |
+ if (r != -ENOENT) |
+ if (r != -ENOENT) |
139 |
+ log_warning("Failed to read /etc/conf.d/keymap: %s", strerror(-r)); |
+ log_warning("Failed to read /etc/conf.d/keymap: %s", strerror(-r)); |
140 |
+ } |
+ } |
141 |
+ if ((r = parse_env_file("/etc/conf.d/consolefont", NEWLINE, |
+ if ((r = parse_env_file("/etc/conf.d/consolefont", NEWLINE, |
142 |
+ "CONSOLEFONT", &vc_font, |
+ "CONSOLEFONT", &vc_font, |
143 |
+ NULL)) < 0) { |
+ NULL)) < 0) { |
144 |
+ if (r != -ENOENT) |
+ if (r != -ENOENT) |
145 |
+ log_warning("Failed to read /etc/conf.d/consolefont: %s", strerror(-r)); |
+ log_warning("Failed to read /etc/conf.d/consolefont: %s", strerror(-r)); |
146 |
+ } |
+ } |
147 |
+#endif |
+ |
148 |
#if defined(TARGET_MANDRIVA) || defined(TARGET_MAGEIA) |
#elif defined(TARGET_MANDRIVA) || defined (TARGET_MAGEIA) |
149 |
char *vc_keytable = NULL; |
|
150 |
#endif |
r = parse_env_file("/etc/sysconfig/i18n", NEWLINE, |