--- trunk/systemd/patches/systemd-9-magellan.patch	2010/09/14 21:25:52	1131
+++ trunk/systemd/patches/systemd-9-magellan.patch	2010/09/14 21:33:49	1132
@@ -1,6 +1,6 @@
 diff -Naur systemd-9/configure.ac systemd-9-magellan/configure.ac
 --- systemd-9/configure.ac	2010-09-03 04:49:55.000000000 +0200
-+++ systemd-9-magellan/configure.ac	2010-09-14 23:09:35.000000000 +0200
++++ systemd-9-magellan/configure.ac	2010-09-14 23:37:21.000000000 +0200
 @@ -245,7 +245,7 @@
  
  AC_PATH_PROG([M4], [m4])
@@ -42,7 +42,7 @@
  AC_DEFINE_UNQUOTED(SPECIAL_SYSLOG_SERVICE, ["$SPECIAL_SYSLOG_SERVICE"], [Syslog service name])
 diff -Naur systemd-9/Makefile.am systemd-9-magellan/Makefile.am
 --- systemd-9/Makefile.am	2010-09-03 05:07:34.000000000 +0200
-+++ systemd-9-magellan/Makefile.am	2010-09-14 23:25:01.000000000 +0200
++++ systemd-9-magellan/Makefile.am	2010-09-14 23:37:21.000000000 +0200
 @@ -247,6 +247,15 @@
  	units/gentoo/xdm.service
  endif
@@ -76,8 +76,17 @@
  		rm -f fsck.target && \
 diff -Naur systemd-9/src/hostname-setup.c systemd-9-magellan/src/hostname-setup.c
 --- systemd-9/src/hostname-setup.c	2010-09-03 00:21:17.000000000 +0200
-+++ systemd-9-magellan/src/hostname-setup.c	2010-09-14 23:11:24.000000000 +0200
-@@ -137,7 +137,7 @@
++++ systemd-9-magellan/src/hostname-setup.c	2010-09-14 23:38:13.000000000 +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)
+@@ -137,7 +139,7 @@
          fclose(f);
          return r;
  
@@ -88,7 +97,7 @@
          return -ENOENT;
 diff -Naur systemd-9/src/util.c systemd-9-magellan/src/util.c
 --- systemd-9/src/util.c	2010-09-03 00:21:17.000000000 +0200
-+++ systemd-9-magellan/src/util.c	2010-09-14 23:17:34.000000000 +0200
++++ systemd-9-magellan/src/util.c	2010-09-14 23:37:21.000000000 +0200
 @@ -2835,6 +2835,17 @@
  
          status_printf("Welcome to \x1B[0;32m%s\x1B[0m!\n", r); /* Green for SUSE */
@@ -109,7 +118,7 @@
  #endif
 diff -Naur systemd-9/units/getty@.service.m4 systemd-9-magellan/units/getty@.service.m4
 --- systemd-9/units/getty@.service.m4	2010-08-26 02:57:31.000000000 +0200
-+++ systemd-9-magellan/units/getty@.service.m4	2010-09-14 23:19:47.000000000 +0200
++++ systemd-9-magellan/units/getty@.service.m4	2010-09-14 23:37:21.000000000 +0200
 @@ -9,6 +9,7 @@
  m4_ifdef(`TARGET_SUSE', `m4_define(`GETTY', `/sbin/mingetty')')m4_dnl
  m4_ifdef(`TARGET_DEBIAN', `m4_define(`GETTY', `/sbin/getty 38400')')m4_dnl
@@ -120,7 +129,7 @@
  [Unit]
 diff -Naur systemd-9/units/graphical.target.m4 systemd-9-magellan/units/graphical.target.m4
 --- systemd-9/units/graphical.target.m4	2010-08-30 23:03:58.000000000 +0200
-+++ systemd-9-magellan/units/graphical.target.m4	2010-09-14 23:22:10.000000000 +0200
++++ systemd-9-magellan/units/graphical.target.m4	2010-09-14 23:37:21.000000000 +0200
 @@ -20,6 +20,9 @@
  m4_ifdef(`TARGET_SUSE',
  Names=runlevel5.target
@@ -133,7 +142,7 @@
  [Install]
 diff -Naur systemd-9/units/magellan/halt.service systemd-9-magellan/units/magellan/halt.service
 --- systemd-9/units/magellan/halt.service	1970-01-01 01:00:00.000000000 +0100
-+++ systemd-9-magellan/units/magellan/halt.service	2010-09-14 22:59:13.000000000 +0200
++++ systemd-9-magellan/units/magellan/halt.service	2010-09-14 23:37:21.000000000 +0200
 @@ -0,0 +1,19 @@
 +#  This file is part of systemd.
 +#
@@ -156,7 +165,7 @@
 +StandardOutput=tty
 diff -Naur systemd-9/units/magellan/poweroff.service systemd-9-magellan/units/magellan/poweroff.service
 --- systemd-9/units/magellan/poweroff.service	1970-01-01 01:00:00.000000000 +0100
-+++ systemd-9-magellan/units/magellan/poweroff.service	2010-09-14 23:00:25.000000000 +0200
++++ systemd-9-magellan/units/magellan/poweroff.service	2010-09-14 23:37:21.000000000 +0200
 @@ -0,0 +1,19 @@
 +#  This file is part of systemd.
 +#
@@ -179,7 +188,7 @@
 +StandardOutput=tty
 diff -Naur systemd-9/units/magellan/reboot.service systemd-9-magellan/units/magellan/reboot.service
 --- systemd-9/units/magellan/reboot.service	1970-01-01 01:00:00.000000000 +0100
-+++ systemd-9-magellan/units/magellan/reboot.service	2010-09-14 23:02:28.000000000 +0200
++++ systemd-9-magellan/units/magellan/reboot.service	2010-09-14 23:37:21.000000000 +0200
 @@ -0,0 +1,19 @@
 +#  This file is part of systemd.
 +#
@@ -202,7 +211,7 @@
 +StandardOutput=tty
 diff -Naur systemd-9/units/magellan/sendsignals.service systemd-9-magellan/units/magellan/sendsignals.service
 --- systemd-9/units/magellan/sendsignals.service	1970-01-01 01:00:00.000000000 +0100
-+++ systemd-9-magellan/units/magellan/sendsignals.service	2010-09-14 22:58:27.000000000 +0200
++++ systemd-9-magellan/units/magellan/sendsignals.service	2010-09-14 23:37:21.000000000 +0200
 @@ -0,0 +1,18 @@
 +#  This file is part of systemd.
 +#
@@ -224,7 +233,7 @@
 +StandardOutput=tty
 diff -Naur systemd-9/units/magellan/xdm.service systemd-9-magellan/units/magellan/xdm.service
 --- systemd-9/units/magellan/xdm.service	1970-01-01 01:00:00.000000000 +0100
-+++ systemd-9-magellan/units/magellan/xdm.service	2010-09-14 23:01:18.000000000 +0200
++++ systemd-9-magellan/units/magellan/xdm.service	2010-09-14 23:37:21.000000000 +0200
 @@ -0,0 +1,17 @@
 +#  This file is part of systemd.
 +#
@@ -245,7 +254,7 @@
 +WantedBy=graphical.target
 diff -Naur systemd-9/units/multi-user.target.m4 systemd-9-magellan/units/multi-user.target.m4
 --- systemd-9/units/multi-user.target.m4	2010-08-30 23:03:58.000000000 +0200
-+++ systemd-9-magellan/units/multi-user.target.m4	2010-09-14 23:21:53.000000000 +0200
++++ systemd-9-magellan/units/multi-user.target.m4	2010-09-14 23:37:21.000000000 +0200
 @@ -20,6 +20,10 @@
  m4_ifdef(`TARGET_SUSE',
  Names=runlevel3.target