diff -Naur systemd-196/configure.ac systemd-196-magellan/configure.ac --- systemd-196/configure.ac 2012-11-21 00:41:19.920510613 +0100 +++ systemd-196-magellan/configure.ac 2012-11-22 19:03:45.114640492 +0100 @@ -640,7 +640,7 @@ # ------------------------------------------------------------------------------ -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)]) @@ -693,6 +693,13 @@ 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 + AC_DEFINE_UNQUOTED(TTY_GID, [4], [Using GID '4' for the 'tty' group]) + ;; slackware) SYSTEM_SYSVINIT_PATH=/etc/rc.d/init.d AC_DEFINE(TARGET_SLACKWARE, [], [Target is Slackware]) @@ -769,6 +776,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-196/Makefile.am systemd-196-magellan/Makefile.am --- systemd-196/Makefile.am 2012-11-21 02:15:47.990885766 +0100 +++ systemd-196-magellan/Makefile.am 2012-11-22 19:04:53.980639949 +0100 @@ -172,6 +172,11 @@ -DKBD_LOADKEYS=\"/usr/bin/loadkeys\" \ -DKBD_SETFONT=\"/usr/bin/setfont\" else +if TARGET_MAGELLAN +AM_CPPFLAGS += \ + -DKBD_LOADKEYS=\"/usr/bin/loadkeys\" \ + -DKBD_SETFONT=\"/usr/bin/setfont\" \ +else if TARGET_ARCH AM_CPPFLAGS += \ -DKBD_LOADKEYS=\"/usr/bin/loadkeys\" \ @@ -203,6 +208,7 @@ endif endif endif +endif endif endif endif diff -Naur systemd-196/src/core/hostname-setup.c systemd-196-magellan/src/core/hostname-setup.c --- systemd-196/src/core/hostname-setup.c 2012-11-09 15:55:35.887582229 +0100 +++ systemd-196-magellan/src/core/hostname-setup.c 2012-11-22 19:06:06.389639430 +0100 @@ -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_GENTOO) #define FILENAME "/etc/conf.d/hostname" #endif @@ -114,7 +116,7 @@ finish: 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-196/src/core/locale-setup.c systemd-196-magellan/src/core/locale-setup.c --- systemd-196/src/core/locale-setup.c 2012-11-09 15:55:35.888582232 +0100 +++ systemd-196-magellan/src/core/locale-setup.c 2012-11-22 19:06:33.733639284 +0100 @@ -163,7 +163,7 @@ log_warning("Failed to read /etc/default/locale: %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-196/src/fsck/fsck.c systemd-196-magellan/src/fsck/fsck.c --- systemd-196/src/fsck/fsck.c 2012-07-26 12:45:14.484061294 +0200 +++ systemd-196-magellan/src/fsck/fsck.c 2012-11-22 19:07:01.398639058 +0100 @@ -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-196/src/quotacheck/quotacheck.c systemd-196-magellan/src/quotacheck/quotacheck.c --- systemd-196/src/quotacheck/quotacheck.c 2012-06-22 09:37:42.823398626 +0200 +++ systemd-196-magellan/src/quotacheck/quotacheck.c 2012-11-22 19:07:41.119638797 +0100 @@ -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-196/src/vconsole/vconsole-setup.c systemd-196-magellan/src/vconsole/vconsole-setup.c --- systemd-196/src/vconsole/vconsole-setup.c 2012-11-09 15:55:35.893582249 +0100 +++ systemd-196-magellan/src/vconsole/vconsole-setup.c 2012-11-22 19:08:32.104638426 +0100 @@ -304,6 +304,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,