Magellan Linux

  • Back to homepage
    • /[pkg-src]/trunk/systemd/patches/systemd-9-magellan.patch

    Diff of /trunk/systemd/patches/systemd-9-magellan.patch

    Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

    revision 1131 by niro, Tue Sep 14 21:25:52 2010 UTC revision 1132 by niro, Tue Sep 14 21:33:49 2010 UTC
    # Line 1  Line 1 
    1  diff -Naur systemd-9/configure.ac systemd-9-magellan/configure.ac  diff -Naur systemd-9/configure.ac systemd-9-magellan/configure.ac
    2  --- systemd-9/configure.ac 2010-09-03 04:49:55.000000000 +0200  --- systemd-9/configure.ac 2010-09-03 04:49:55.000000000 +0200
    3  +++ 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
    4  @@ -245,7 +245,7 @@  @@ -245,7 +245,7 @@
    5    
    6   AC_PATH_PROG([M4], [m4])   AC_PATH_PROG([M4], [m4])
    # Line 42  diff -Naur systemd-9/configure.ac system Line 42  diff -Naur systemd-9/configure.ac system
    42   AC_DEFINE_UNQUOTED(SPECIAL_SYSLOG_SERVICE, ["$SPECIAL_SYSLOG_SERVICE"], [Syslog service name])   AC_DEFINE_UNQUOTED(SPECIAL_SYSLOG_SERVICE, ["$SPECIAL_SYSLOG_SERVICE"], [Syslog service name])
    43  diff -Naur systemd-9/Makefile.am systemd-9-magellan/Makefile.am  diff -Naur systemd-9/Makefile.am systemd-9-magellan/Makefile.am
    44  --- systemd-9/Makefile.am 2010-09-03 05:07:34.000000000 +0200  --- systemd-9/Makefile.am 2010-09-03 05:07:34.000000000 +0200
    45  +++ 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
    46  @@ -247,6 +247,15 @@  @@ -247,6 +247,15 @@
    47   units/gentoo/xdm.service   units/gentoo/xdm.service
    48   endif   endif
    # Line 76  diff -Naur systemd-9/Makefile.am systemd Line 76  diff -Naur systemd-9/Makefile.am systemd
    76   rm -f fsck.target && \   rm -f fsck.target && \
    77  diff -Naur systemd-9/src/hostname-setup.c systemd-9-magellan/src/hostname-setup.c  diff -Naur systemd-9/src/hostname-setup.c systemd-9-magellan/src/hostname-setup.c
    78  --- systemd-9/src/hostname-setup.c 2010-09-03 00:21:17.000000000 +0200  --- systemd-9/src/hostname-setup.c 2010-09-03 00:21:17.000000000 +0200
    79  +++ systemd-9-magellan/src/hostname-setup.c 2010-09-14 23:11:24.000000000 +0200  +++ systemd-9-magellan/src/hostname-setup.c 2010-09-14 23:38:13.000000000 +0200
    80  @@ -137,7 +137,7 @@  @@ -34,6 +34,8 @@
    81     #define FILENAME "/etc/sysconfig/network"
    82     #elif defined(TARGET_SUSE) || defined(TARGET_SLACKWARE)
    83     #define FILENAME "/etc/HOSTNAME"
    84    +#elif defined(TARGET_MAGELLAN)
    85    +#define FILENAME "/etc/hostname"
    86     #elif defined(TARGET_ARCH)
    87     #define FILENAME "/etc/rc.conf"
    88     #elif defined(TARGET_GENTOO)
    89    @@ -137,7 +139,7 @@
    90           fclose(f);           fclose(f);
    91           return r;           return r;
    92    
    # Line 88  diff -Naur systemd-9/src/hostname-setup. Line 97  diff -Naur systemd-9/src/hostname-setup.
    97           return -ENOENT;           return -ENOENT;
    98  diff -Naur systemd-9/src/util.c systemd-9-magellan/src/util.c  diff -Naur systemd-9/src/util.c systemd-9-magellan/src/util.c
    99  --- systemd-9/src/util.c 2010-09-03 00:21:17.000000000 +0200  --- systemd-9/src/util.c 2010-09-03 00:21:17.000000000 +0200
    100  +++ 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
    101  @@ -2835,6 +2835,17 @@  @@ -2835,6 +2835,17 @@
    102    
    103           status_printf("Welcome to \x1B[0;32m%s\x1B[0m!\n", r); /* Green for SUSE */           status_printf("Welcome to \x1B[0;32m%s\x1B[0m!\n", r); /* Green for SUSE */
    # Line 109  diff -Naur systemd-9/src/util.c systemd- Line 118  diff -Naur systemd-9/src/util.c systemd-
    118   #endif   #endif
    119  diff -Naur systemd-9/units/getty@.service.m4 systemd-9-magellan/units/getty@.service.m4  diff -Naur systemd-9/units/getty@.service.m4 systemd-9-magellan/units/getty@.service.m4
    120  --- systemd-9/units/getty@.service.m4 2010-08-26 02:57:31.000000000 +0200  --- systemd-9/units/getty@.service.m4 2010-08-26 02:57:31.000000000 +0200
    121  +++ 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
    122  @@ -9,6 +9,7 @@  @@ -9,6 +9,7 @@
    123   m4_ifdef(`TARGET_SUSE', `m4_define(`GETTY', `/sbin/mingetty')')m4_dnl   m4_ifdef(`TARGET_SUSE', `m4_define(`GETTY', `/sbin/mingetty')')m4_dnl
    124   m4_ifdef(`TARGET_DEBIAN', `m4_define(`GETTY', `/sbin/getty 38400')')m4_dnl   m4_ifdef(`TARGET_DEBIAN', `m4_define(`GETTY', `/sbin/getty 38400')')m4_dnl
    # Line 120  diff -Naur systemd-9/units/getty@.servic Line 129  diff -Naur systemd-9/units/getty@.servic
    129   [Unit]   [Unit]
    130  diff -Naur systemd-9/units/graphical.target.m4 systemd-9-magellan/units/graphical.target.m4  diff -Naur systemd-9/units/graphical.target.m4 systemd-9-magellan/units/graphical.target.m4
    131  --- systemd-9/units/graphical.target.m4 2010-08-30 23:03:58.000000000 +0200  --- systemd-9/units/graphical.target.m4 2010-08-30 23:03:58.000000000 +0200
    132  +++ 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
    133  @@ -20,6 +20,9 @@  @@ -20,6 +20,9 @@
    134   m4_ifdef(`TARGET_SUSE',   m4_ifdef(`TARGET_SUSE',
    135   Names=runlevel5.target   Names=runlevel5.target
    # Line 133  diff -Naur systemd-9/units/graphical.tar Line 142  diff -Naur systemd-9/units/graphical.tar
    142   [Install]   [Install]
    143  diff -Naur systemd-9/units/magellan/halt.service systemd-9-magellan/units/magellan/halt.service  diff -Naur systemd-9/units/magellan/halt.service systemd-9-magellan/units/magellan/halt.service
    144  --- systemd-9/units/magellan/halt.service 1970-01-01 01:00:00.000000000 +0100  --- systemd-9/units/magellan/halt.service 1970-01-01 01:00:00.000000000 +0100
    145  +++ 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
    146  @@ -0,0 +1,19 @@  @@ -0,0 +1,19 @@
    147  +#  This file is part of systemd.  +#  This file is part of systemd.
    148  +#  +#
    # Line 156  diff -Naur systemd-9/units/magellan/halt Line 165  diff -Naur systemd-9/units/magellan/halt
    165  +StandardOutput=tty  +StandardOutput=tty
    166  diff -Naur systemd-9/units/magellan/poweroff.service systemd-9-magellan/units/magellan/poweroff.service  diff -Naur systemd-9/units/magellan/poweroff.service systemd-9-magellan/units/magellan/poweroff.service
    167  --- systemd-9/units/magellan/poweroff.service 1970-01-01 01:00:00.000000000 +0100  --- systemd-9/units/magellan/poweroff.service 1970-01-01 01:00:00.000000000 +0100
    168  +++ 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
    169  @@ -0,0 +1,19 @@  @@ -0,0 +1,19 @@
    170  +#  This file is part of systemd.  +#  This file is part of systemd.
    171  +#  +#
    # Line 179  diff -Naur systemd-9/units/magellan/powe Line 188  diff -Naur systemd-9/units/magellan/powe
    188  +StandardOutput=tty  +StandardOutput=tty
    189  diff -Naur systemd-9/units/magellan/reboot.service systemd-9-magellan/units/magellan/reboot.service  diff -Naur systemd-9/units/magellan/reboot.service systemd-9-magellan/units/magellan/reboot.service
    190  --- systemd-9/units/magellan/reboot.service 1970-01-01 01:00:00.000000000 +0100  --- systemd-9/units/magellan/reboot.service 1970-01-01 01:00:00.000000000 +0100
    191  +++ 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
    192  @@ -0,0 +1,19 @@  @@ -0,0 +1,19 @@
    193  +#  This file is part of systemd.  +#  This file is part of systemd.
    194  +#  +#
    # Line 202  diff -Naur systemd-9/units/magellan/rebo Line 211  diff -Naur systemd-9/units/magellan/rebo
    211  +StandardOutput=tty  +StandardOutput=tty
    212  diff -Naur systemd-9/units/magellan/sendsignals.service systemd-9-magellan/units/magellan/sendsignals.service  diff -Naur systemd-9/units/magellan/sendsignals.service systemd-9-magellan/units/magellan/sendsignals.service
    213  --- systemd-9/units/magellan/sendsignals.service 1970-01-01 01:00:00.000000000 +0100  --- systemd-9/units/magellan/sendsignals.service 1970-01-01 01:00:00.000000000 +0100
    214  +++ 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
    215  @@ -0,0 +1,18 @@  @@ -0,0 +1,18 @@
    216  +#  This file is part of systemd.  +#  This file is part of systemd.
    217  +#  +#
    # Line 224  diff -Naur systemd-9/units/magellan/send Line 233  diff -Naur systemd-9/units/magellan/send
    233  +StandardOutput=tty  +StandardOutput=tty
    234  diff -Naur systemd-9/units/magellan/xdm.service systemd-9-magellan/units/magellan/xdm.service  diff -Naur systemd-9/units/magellan/xdm.service systemd-9-magellan/units/magellan/xdm.service
    235  --- systemd-9/units/magellan/xdm.service 1970-01-01 01:00:00.000000000 +0100  --- systemd-9/units/magellan/xdm.service 1970-01-01 01:00:00.000000000 +0100
    236  +++ 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
    237  @@ -0,0 +1,17 @@  @@ -0,0 +1,17 @@
    238  +#  This file is part of systemd.  +#  This file is part of systemd.
    239  +#  +#
    # Line 245  diff -Naur systemd-9/units/magellan/xdm. Line 254  diff -Naur systemd-9/units/magellan/xdm.
    254  +WantedBy=graphical.target  +WantedBy=graphical.target
    255  diff -Naur systemd-9/units/multi-user.target.m4 systemd-9-magellan/units/multi-user.target.m4  diff -Naur systemd-9/units/multi-user.target.m4 systemd-9-magellan/units/multi-user.target.m4
    256  --- systemd-9/units/multi-user.target.m4 2010-08-30 23:03:58.000000000 +0200  --- systemd-9/units/multi-user.target.m4 2010-08-30 23:03:58.000000000 +0200
    257  +++ 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
    258  @@ -20,6 +20,10 @@  @@ -20,6 +20,10 @@
    259   m4_ifdef(`TARGET_SUSE',   m4_ifdef(`TARGET_SUSE',
    260   Names=runlevel3.target   Names=runlevel3.target
    Legend:
    Removed from v.1131  
    changed lines
      Added in v.1132