systemd/patches/systemd-188-magellan.patch

diff -Naur systemd-188/configure.ac systemd-188-magellan/configure.ac
--- systemd-188/configure.ac	2012-08-08 21:44:45.705730960 +0200
+++ systemd-188-magellan/configure.ac	2012-08-15 16:34:56.503981165 +0200
@@ -509,7 +509,7 @@
 AC_PATH_PROG([XSLTPROC], [xsltproc])
 AM_CONDITIONAL(HAVE_XSLTPROC, test x"$XSLTPROC" != x)
 
-AC_ARG_WITH(distro, AS_HELP_STRING([--with-distro=DISTRO],[Specify the distribution to target: One of fedora, suse, debian, ubuntu, arch, gentoo, slackware, altlinux, mandriva, mageia, angstrom or other]))
+AC_ARG_WITH(distro, AS_HELP_STRING([--with-distro=DISTRO],[Specify the distribution to target: One of fedora, suse, debian, ubuntu, arch, gentoo, magellan, slackware, altlinux, mandriva, mageia, angstrom or other]))
 if test "z$with_distro" = "z"; then
         if test "$cross_compiling" = yes; then
                 AC_MSG_WARN([Target distribution cannot be reliably detected when cross-compiling. You should specify it with --with-distro (see $0 --help for recognized distros)])
@@ -562,6 +562,12 @@
                 AC_DEFINE(TARGET_GENTOO, [], [Target is Gentoo])
                 M4_DEFINES=-DTARGET_GENTOO=1
                 ;;
+        magellan)
+                SYSTEM_SYSVINIT_PATH=/etc/rc.d/init.d
+                SYSTEM_SYSVRCND_PATH=/etc/rc.d
+                AC_DEFINE(TARGET_MAGELLAN, [], [Target is Magellan])
+                M4_DEFINES=-DTARGET_MAGELLAN=1
+                ;;
         slackware)
                 SYSTEM_SYSVINIT_PATH=/etc/rc.d/init.d
                 AC_DEFINE(TARGET_SLACKWARE, [], [Target is Slackware])
@@ -638,6 +644,7 @@
 AM_CONDITIONAL(TARGET_DEBIAN_OR_UBUNTU, test x"$with_distro" = xdebian -o x"$with_distro" = xubuntu)
 AM_CONDITIONAL(TARGET_ARCH, test x"$with_distro" = xarch)
 AM_CONDITIONAL(TARGET_GENTOO, test x"$with_distro" = xgentoo)
+AM_CONDITIONAL(TARGET_MAGELLAN, test x"$with_distro" = xmagellan)
 AM_CONDITIONAL(TARGET_SLACKWARE, test x"$with_distro" = xslackware)
 AM_CONDITIONAL(TARGET_FRUGALWARE, test x"$with_distro" = xfrugalware)
 AM_CONDITIONAL(TARGET_ALTLINUX, test x"$with_distro" = xaltlinux)
diff -Naur systemd-188/Makefile.am systemd-188-magellan/Makefile.am
--- systemd-188/Makefile.am	2012-08-08 21:44:45.722730961 +0200
+++ systemd-188-magellan/Makefile.am	2012-08-15 16:36:02.905981106 +0200
@@ -161,6 +161,12 @@
 	-DKBD_SETFONT=\"/usr/bin/setfont\" \
 	-DDEFAULT_FONT=\"LatArCyrHeb-16\"
 else
+if TARGET_MAGELLAN
+AM_CPPFLAGS += \
+	-DKBD_LOADKEYS=\"/usr/bin/loadkeys\" \
+	-DKBD_SETFONT=\"/usr/bin/setfont\" \
+	-DDEFAULT_FONT=\"LatArCyrHeb-16\"
+else
 if TARGET_ARCH
 AM_CPPFLAGS += \
 	-DKBD_LOADKEYS=\"/usr/bin/loadkeys\" \
@@ -198,6 +204,7 @@
 endif
 endif
 endif
+endif
 endif
 endif
 endif
diff -Naur systemd-188/src/core/hostname-setup.c systemd-188-magellan/src/core/hostname-setup.c
--- systemd-188/src/core/hostname-setup.c	2012-07-09 16:37:46.585038729 +0200
+++ systemd-188-magellan/src/core/hostname-setup.c	2012-08-15 16:37:04.539981148 +0200
@@ -34,6 +34,8 @@
 #define FILENAME "/etc/sysconfig/network"
 #elif defined(TARGET_SUSE) || defined(TARGET_SLACKWARE)
 #define FILENAME "/etc/HOSTNAME"
+#elif defined(TARGET_MAGELLAN)
+#define FILENAME "/etc/hostname"
 #elif defined(TARGET_ARCH)
 #define FILENAME "/etc/rc.conf"
 #elif defined(TARGET_GENTOO)
@@ -117,7 +119,7 @@
         fclose(f);
         return r;
 
-#elif defined(TARGET_SUSE) || defined(TARGET_SLACKWARE)
+#elif defined(TARGET_SUSE) || defined(TARGET_SLACKWARE) || defined(TARGET_MAGELLAN)
         return read_and_strip_hostname(FILENAME, hn);
 #else
         return -ENOENT;
diff -Naur systemd-188/src/core/locale-setup.c systemd-188-magellan/src/core/locale-setup.c
--- systemd-188/src/core/locale-setup.c	2012-07-09 16:37:46.586038729 +0200
+++ systemd-188-magellan/src/core/locale-setup.c	2012-08-15 16:37:37.067979972 +0200
@@ -173,7 +173,7 @@
                         log_warning("Failed to read /etc/rc.conf: %s", strerror(-r));
         }
 
-#elif defined(TARGET_GENTOO)
+#elif defined(TARGET_GENTOO) || defined(TARGET_MAGELLAN)
         /* Gentoo's openrc expects locale variables in /etc/env.d/
          * These files are later compiled by env-update into shell
          * export commands at /etc/profile.env, with variables being
diff -Naur systemd-188/src/fsck/fsck.c systemd-188-magellan/src/fsck/fsck.c
--- systemd-188/src/fsck/fsck.c	2012-07-26 12:45:14.484061294 +0200
+++ systemd-188-magellan/src/fsck/fsck.c	2012-08-15 16:38:54.915980846 +0200
@@ -128,7 +128,7 @@
                         arg_skip = true;
                 else if (startswith(w, "fsck"))
                         log_warning("Invalid fsck parameter. Ignoring.");
-#if defined(TARGET_FEDORA) || defined(TARGET_MANDRIVA) || defined(TARGET_MAGEIA)
+#if defined(TARGET_FEDORA) || defined(TARGET_MANDRIVA) || defined(TARGET_MAGEIA) || defined(TARGET_MAGELLAN)
                 else if (strneq(w, "fastboot", l))
                         arg_skip = true;
                 else if (strneq(w, "forcefsck", l))
diff -Naur systemd-188/src/quotacheck/quotacheck.c systemd-188-magellan/src/quotacheck/quotacheck.c
--- systemd-188/src/quotacheck/quotacheck.c	2012-06-22 09:37:42.823398626 +0200
+++ systemd-188-magellan/src/quotacheck/quotacheck.c	2012-08-15 16:39:40.668981260 +0200
@@ -54,7 +54,7 @@
                         arg_skip = true;
                 else if (startswith(w, "quotacheck"))
                         log_warning("Invalid quotacheck parameter. Ignoring.");
-#if defined(TARGET_FEDORA) || defined(TARGET_MANDRIVA) || defined(TARGET_MAGEIA)
+#if defined(TARGET_FEDORA) || defined(TARGET_MANDRIVA) || defined(TARGET_MAGEIA) || defined(TARGET_MAGELLAN)
                 else if (strneq(w, "forcequotacheck", l))
                         arg_force = true;
 #endif
@@ -65,8 +65,8 @@
 }
 
 static void test_files(void) {
-#if defined(TARGET_FEDORA) || defined(TARGET_MANDRIVA) || defined(TARGET_MAGEIA)
-        /* This exists only on Fedora, Mandriva or Mageia */
+#if defined(TARGET_FEDORA) || defined(TARGET_MANDRIVA) || defined(TARGET_MAGEIA) || defined(TARGET_MAGELLAN)
+        /* This exists only on Fedora, Mandriva, Mageia or Magellan */
         if (access("/forcequotacheck", F_OK) >= 0)
                 arg_force = true;
 #endif
diff -Naur systemd-188/src/vconsole/vconsole-setup.c systemd-188-magellan/src/vconsole/vconsole-setup.c
--- systemd-188/src/vconsole/vconsole-setup.c	2012-07-26 12:45:14.501061296 +0200
+++ systemd-188-magellan/src/vconsole/vconsole-setup.c	2012-08-15 16:42:25.304980067 +0200
@@ -378,6 +378,20 @@
                 if (r < 0 && r != -ENOENT)
                         log_warning("Failed to read /etc/conf.d/keymaps: %s", strerror(-r));
 
+#elif defined(TARGET_MAGELLAN)
+                if ((r = parse_env_file("/etc/conf.d/keymap", NEWLINE,
+                                        "KEYMAP", &vc_keymap,
+                                        NULL)) < 0) {
+                        if (r < 0 && r != -ENOENT)
+                                log_warning("Failed to read /etc/conf.d/keymap: %s", strerror(-r));
+                }
+                if ((r = parse_env_file("/etc/conf.d/consolefont", NEWLINE,
+                                        "CONSOLEFONT", &vc_font,
+                                        NULL)) < 0) {
+                        if (r < 0 && r != -ENOENT)
+                                log_warning("Failed to read /etc/conf.d/consolefont: %s", strerror(-r));
+                }
+
 #elif defined(TARGET_MANDRIVA) || defined (TARGET_MAGEIA)
 
                 r = parse_env_file("/etc/sysconfig/i18n", NEWLINE,
1	niro	1876	diff -Naur systemd-188/configure.ac systemd-188-magellan/configure.ac
2			--- systemd-188/configure.ac 2012-08-08 21:44:45.705730960 +0200
3			+++ systemd-188-magellan/configure.ac 2012-08-15 16:34:56.503981165 +0200
4			@@ -509,7 +509,7 @@
5			AC_PATH_PROG([XSLTPROC], [xsltproc])
6			AM_CONDITIONAL(HAVE_XSLTPROC, test x"$XSLTPROC" != x)
7
8			-AC_ARG_WITH(distro, AS_HELP_STRING([--with-distro=DISTRO],[Specify the distribution to target: One of fedora, suse, debian, ubuntu, arch, gentoo, slackware, altlinux, mandriva, mageia, angstrom or other]))
9			+AC_ARG_WITH(distro, AS_HELP_STRING([--with-distro=DISTRO],[Specify the distribution to target: One of fedora, suse, debian, ubuntu, arch, gentoo, magellan, slackware, altlinux, mandriva, mageia, angstrom or other]))
10			if test "z$with_distro" = "z"; then
11			if test "$cross_compiling" = yes; then
12			AC_MSG_WARN([Target distribution cannot be reliably detected when cross-compiling. You should specify it with --with-distro (see $0 --help for recognized distros)])
13			@@ -562,6 +562,12 @@
14			AC_DEFINE(TARGET_GENTOO, [], [Target is Gentoo])
15			M4_DEFINES=-DTARGET_GENTOO=1
16			;;
17			+ magellan)
18			+ SYSTEM_SYSVINIT_PATH=/etc/rc.d/init.d
19			+ SYSTEM_SYSVRCND_PATH=/etc/rc.d
20			+ AC_DEFINE(TARGET_MAGELLAN, [], [Target is Magellan])
21			+ M4_DEFINES=-DTARGET_MAGELLAN=1
22			+ ;;
23			slackware)
24			SYSTEM_SYSVINIT_PATH=/etc/rc.d/init.d
25			AC_DEFINE(TARGET_SLACKWARE, [], [Target is Slackware])
26			@@ -638,6 +644,7 @@
27			AM_CONDITIONAL(TARGET_DEBIAN_OR_UBUNTU, test x"$with_distro" = xdebian -o x"$with_distro" = xubuntu)
28			AM_CONDITIONAL(TARGET_ARCH, test x"$with_distro" = xarch)
29			AM_CONDITIONAL(TARGET_GENTOO, test x"$with_distro" = xgentoo)
30			+AM_CONDITIONAL(TARGET_MAGELLAN, test x"$with_distro" = xmagellan)
31			AM_CONDITIONAL(TARGET_SLACKWARE, test x"$with_distro" = xslackware)
32			AM_CONDITIONAL(TARGET_FRUGALWARE, test x"$with_distro" = xfrugalware)
33			AM_CONDITIONAL(TARGET_ALTLINUX, test x"$with_distro" = xaltlinux)
34			diff -Naur systemd-188/Makefile.am systemd-188-magellan/Makefile.am
35			--- systemd-188/Makefile.am 2012-08-08 21:44:45.722730961 +0200
36			+++ systemd-188-magellan/Makefile.am 2012-08-15 16:36:02.905981106 +0200
37			@@ -161,6 +161,12 @@
38			-DKBD_SETFONT=\"/usr/bin/setfont\" \
39			-DDEFAULT_FONT=\"LatArCyrHeb-16\"
40			else
41			+if TARGET_MAGELLAN
42			+AM_CPPFLAGS += \
43			+ -DKBD_LOADKEYS=\"/usr/bin/loadkeys\" \
44			+ -DKBD_SETFONT=\"/usr/bin/setfont\" \
45			+ -DDEFAULT_FONT=\"LatArCyrHeb-16\"
46			+else
47			if TARGET_ARCH
48			AM_CPPFLAGS += \
49			-DKBD_LOADKEYS=\"/usr/bin/loadkeys\" \
50			@@ -198,6 +204,7 @@
51			endif
52			endif
53			endif
54			+endif
55			endif
56			endif
57			endif
58			diff -Naur systemd-188/src/core/hostname-setup.c systemd-188-magellan/src/core/hostname-setup.c
59			--- systemd-188/src/core/hostname-setup.c 2012-07-09 16:37:46.585038729 +0200
60			+++ systemd-188-magellan/src/core/hostname-setup.c 2012-08-15 16:37:04.539981148 +0200
61			@@ -34,6 +34,8 @@
62			#define FILENAME "/etc/sysconfig/network"
63			#elif defined(TARGET_SUSE) \|\| defined(TARGET_SLACKWARE)
64			#define FILENAME "/etc/HOSTNAME"
65			+#elif defined(TARGET_MAGELLAN)
66			+#define FILENAME "/etc/hostname"
67			#elif defined(TARGET_ARCH)
68			#define FILENAME "/etc/rc.conf"
69			#elif defined(TARGET_GENTOO)
70			@@ -117,7 +119,7 @@
71			fclose(f);
72			return r;
73
74			-#elif defined(TARGET_SUSE) \|\| defined(TARGET_SLACKWARE)
75			+#elif defined(TARGET_SUSE) \|\| defined(TARGET_SLACKWARE) \|\| defined(TARGET_MAGELLAN)
76			return read_and_strip_hostname(FILENAME, hn);
77			#else
78			return -ENOENT;
79			diff -Naur systemd-188/src/core/locale-setup.c systemd-188-magellan/src/core/locale-setup.c
80			--- systemd-188/src/core/locale-setup.c 2012-07-09 16:37:46.586038729 +0200
81			+++ systemd-188-magellan/src/core/locale-setup.c 2012-08-15 16:37:37.067979972 +0200
82			@@ -173,7 +173,7 @@
83			log_warning("Failed to read /etc/rc.conf: %s", strerror(-r));
84			}
85
86			-#elif defined(TARGET_GENTOO)
87			+#elif defined(TARGET_GENTOO) \|\| defined(TARGET_MAGELLAN)
88			/* Gentoo's openrc expects locale variables in /etc/env.d/
89			* These files are later compiled by env-update into shell
90			* export commands at /etc/profile.env, with variables being
91			diff -Naur systemd-188/src/fsck/fsck.c systemd-188-magellan/src/fsck/fsck.c
92			--- systemd-188/src/fsck/fsck.c 2012-07-26 12:45:14.484061294 +0200
93			+++ systemd-188-magellan/src/fsck/fsck.c 2012-08-15 16:38:54.915980846 +0200
94			@@ -128,7 +128,7 @@
95			arg_skip = true;
96			else if (startswith(w, "fsck"))
97			log_warning("Invalid fsck parameter. Ignoring.");
98			-#if defined(TARGET_FEDORA) \|\| defined(TARGET_MANDRIVA) \|\| defined(TARGET_MAGEIA)
99			+#if defined(TARGET_FEDORA) \|\| defined(TARGET_MANDRIVA) \|\| defined(TARGET_MAGEIA) \|\| defined(TARGET_MAGELLAN)
100			else if (strneq(w, "fastboot", l))
101			arg_skip = true;
102			else if (strneq(w, "forcefsck", l))
103			diff -Naur systemd-188/src/quotacheck/quotacheck.c systemd-188-magellan/src/quotacheck/quotacheck.c
104			--- systemd-188/src/quotacheck/quotacheck.c 2012-06-22 09:37:42.823398626 +0200
105			+++ systemd-188-magellan/src/quotacheck/quotacheck.c 2012-08-15 16:39:40.668981260 +0200
106			@@ -54,7 +54,7 @@
107			arg_skip = true;
108			else if (startswith(w, "quotacheck"))
109			log_warning("Invalid quotacheck parameter. Ignoring.");
110			-#if defined(TARGET_FEDORA) \|\| defined(TARGET_MANDRIVA) \|\| defined(TARGET_MAGEIA)
111			+#if defined(TARGET_FEDORA) \|\| defined(TARGET_MANDRIVA) \|\| defined(TARGET_MAGEIA) \|\| defined(TARGET_MAGELLAN)
112			else if (strneq(w, "forcequotacheck", l))
113			arg_force = true;
114			#endif
115			@@ -65,8 +65,8 @@
116			}
117
118			static void test_files(void) {
119			-#if defined(TARGET_FEDORA) \|\| defined(TARGET_MANDRIVA) \|\| defined(TARGET_MAGEIA)
120			- /* This exists only on Fedora, Mandriva or Mageia */
121			+#if defined(TARGET_FEDORA) \|\| defined(TARGET_MANDRIVA) \|\| defined(TARGET_MAGEIA) \|\| defined(TARGET_MAGELLAN)
122			+ /* This exists only on Fedora, Mandriva, Mageia or Magellan */
123			if (access("/forcequotacheck", F_OK) >= 0)
124			arg_force = true;
125			#endif
126			diff -Naur systemd-188/src/vconsole/vconsole-setup.c systemd-188-magellan/src/vconsole/vconsole-setup.c
127			--- systemd-188/src/vconsole/vconsole-setup.c 2012-07-26 12:45:14.501061296 +0200
128			+++ systemd-188-magellan/src/vconsole/vconsole-setup.c 2012-08-15 16:42:25.304980067 +0200
129			@@ -378,6 +378,20 @@
130			if (r < 0 && r != -ENOENT)
131			log_warning("Failed to read /etc/conf.d/keymaps: %s", strerror(-r));
132
133			+#elif defined(TARGET_MAGELLAN)
134			+ if ((r = parse_env_file("/etc/conf.d/keymap", NEWLINE,
135			+ "KEYMAP", &vc_keymap,
136			+ NULL)) < 0) {
137			+ if (r < 0 && r != -ENOENT)
138			+ log_warning("Failed to read /etc/conf.d/keymap: %s", strerror(-r));
139			+ }
140			+ if ((r = parse_env_file("/etc/conf.d/consolefont", NEWLINE,
141			+ "CONSOLEFONT", &vc_font,
142			+ NULL)) < 0) {
143			+ if (r < 0 && r != -ENOENT)
144			+ log_warning("Failed to read /etc/conf.d/consolefont: %s", strerror(-r));
145			+ }
146			+
147			#elif defined(TARGET_MANDRIVA) \|\| defined (TARGET_MAGEIA)
148
149			r = parse_env_file("/etc/sysconfig/i18n", NEWLINE,