Magellan Linux

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

    Annotation of /trunk/systemd/patches/systemd-195-magellan.patch

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 1964 - (hide annotations) (download)
    Mon Nov 19 13:41:02 2012 UTC (11 years, 5 months ago) by niro
    File size: 7614 byte(s) 
    -updated magellan patch to use gid 4 as tty group
    1 niro 1964 diff -Naur systemd-195/configure.ac systemd-195-magellan/configure.ac
    2     --- systemd-195/configure.ac 2012-10-23 00:12:33.125008955 +0200
    3     +++ systemd-195-magellan/configure.ac 2012-11-19 18:45:47.354762080 +0100
    4     @@ -646,7 +646,7 @@
    5    
    6     # ------------------------------------------------------------------------------
    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     @@ -699,6 +699,13 @@
    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     + AC_DEFINE_UNQUOTED(TTY_GID, [4], [Using GID '4' for the 'tty' group])
    23     + ;;
    24     slackware)
    25     SYSTEM_SYSVINIT_PATH=/etc/rc.d/init.d
    26     AC_DEFINE(TARGET_SLACKWARE, [], [Target is Slackware])
    27     @@ -775,6 +782,7 @@
    28     AM_CONDITIONAL(TARGET_DEBIAN_OR_UBUNTU, test x"$with_distro" = xdebian -o x"$with_distro" = xubuntu)
    29     AM_CONDITIONAL(TARGET_ARCH, test x"$with_distro" = xarch)
    30     AM_CONDITIONAL(TARGET_GENTOO, test x"$with_distro" = xgentoo)
    31     +AM_CONDITIONAL(TARGET_MAGELLAN, test x"$with_distro" = xmagellan)
    32     AM_CONDITIONAL(TARGET_SLACKWARE, test x"$with_distro" = xslackware)
    33     AM_CONDITIONAL(TARGET_FRUGALWARE, test x"$with_distro" = xfrugalware)
    34     AM_CONDITIONAL(TARGET_ALTLINUX, test x"$with_distro" = xaltlinux)
    35     diff -Naur systemd-195/Makefile.am systemd-195-magellan/Makefile.am
    36     --- systemd-195/Makefile.am 2012-10-23 00:12:33.119008942 +0200
    37     +++ systemd-195-magellan/Makefile.am 2012-11-19 18:43:35.339762978 +0100
    38     @@ -164,6 +164,12 @@
    39     -DKBD_LOADKEYS=\"/usr/bin/loadkeys\" \
    40     -DKBD_SETFONT=\"/usr/bin/setfont\"
    41     else
    42     +if TARGET_MAGELLAN
    43     +AM_CPPFLAGS += \
    44     + -DKBD_LOADKEYS=\"/usr/bin/loadkeys\" \
    45     + -DKBD_SETFONT=\"/usr/bin/setfont\" \
    46     + -DDEFAULT_FONT=\"LatArCyrHeb-16\"
    47     +else
    48     if TARGET_ARCH
    49     AM_CPPFLAGS += \
    50     -DKBD_LOADKEYS=\"/usr/bin/loadkeys\" \
    51     @@ -195,6 +201,7 @@
    52     endif
    53     endif
    54     endif
    55     +endif
    56     endif
    57     endif
    58     endif
    59     diff -Naur systemd-195/src/core/hostname-setup.c systemd-195-magellan/src/core/hostname-setup.c
    60     --- systemd-195/src/core/hostname-setup.c 2012-09-13 22:20:11.849827740 +0200
    61     +++ systemd-195-magellan/src/core/hostname-setup.c 2012-11-19 18:43:35.339762978 +0100
    62     @@ -34,6 +34,8 @@
    63     #define FILENAME "/etc/sysconfig/network"
    64     #elif defined(TARGET_SUSE) || defined(TARGET_SLACKWARE)
    65     #define FILENAME "/etc/HOSTNAME"
    66     +#elif defined(TARGET_MAGELLAN)
    67     +#define FILENAME "/etc/hostname"
    68     #elif defined(TARGET_ARCH)
    69     #define FILENAME "/etc/rc.conf"
    70     #elif defined(TARGET_GENTOO)
    71     @@ -116,7 +118,7 @@
    72     finish:
    73     return r;
    74    
    75     -#elif defined(TARGET_SUSE) || defined(TARGET_SLACKWARE)
    76     +#elif defined(TARGET_SUSE) || defined(TARGET_SLACKWARE) || defined(TARGET_MAGELLAN)
    77     return read_and_strip_hostname(FILENAME, hn);
    78     #else
    79     return -ENOENT;
    80     diff -Naur systemd-195/src/core/locale-setup.c systemd-195-magellan/src/core/locale-setup.c
    81     --- systemd-195/src/core/locale-setup.c 2012-07-09 16:37:46.586038729 +0200
    82     +++ systemd-195-magellan/src/core/locale-setup.c 2012-11-19 18:43:35.340762977 +0100
    83     @@ -173,7 +173,7 @@
    84     log_warning("Failed to read /etc/rc.conf: %s", strerror(-r));
    85     }
    86    
    87     -#elif defined(TARGET_GENTOO)
    88     +#elif defined(TARGET_GENTOO) || defined(TARGET_MAGELLAN)
    89     /* Gentoo's openrc expects locale variables in /etc/env.d/
    90     * These files are later compiled by env-update into shell
    91     * export commands at /etc/profile.env, with variables being
    92     diff -Naur systemd-195/src/fsck/fsck.c systemd-195-magellan/src/fsck/fsck.c
    93     --- systemd-195/src/fsck/fsck.c 2012-07-26 12:45:14.484061294 +0200
    94     +++ systemd-195-magellan/src/fsck/fsck.c 2012-11-19 18:43:35.340762977 +0100
    95     @@ -128,7 +128,7 @@
    96     arg_skip = true;
    97     else if (startswith(w, "fsck"))
    98     log_warning("Invalid fsck parameter. Ignoring.");
    99     -#if defined(TARGET_FEDORA) || defined(TARGET_MANDRIVA) || defined(TARGET_MAGEIA)
    100     +#if defined(TARGET_FEDORA) || defined(TARGET_MANDRIVA) || defined(TARGET_MAGEIA) || defined(TARGET_MAGELLAN)
    101     else if (strneq(w, "fastboot", l))
    102     arg_skip = true;
    103     else if (strneq(w, "forcefsck", l))
    104     diff -Naur systemd-195/src/quotacheck/quotacheck.c systemd-195-magellan/src/quotacheck/quotacheck.c
    105     --- systemd-195/src/quotacheck/quotacheck.c 2012-06-22 09:37:42.823398626 +0200
    106     +++ systemd-195-magellan/src/quotacheck/quotacheck.c 2012-11-19 18:43:35.340762977 +0100
    107     @@ -54,7 +54,7 @@
    108     arg_skip = true;
    109     else if (startswith(w, "quotacheck"))
    110     log_warning("Invalid quotacheck parameter. Ignoring.");
    111     -#if defined(TARGET_FEDORA) || defined(TARGET_MANDRIVA) || defined(TARGET_MAGEIA)
    112     +#if defined(TARGET_FEDORA) || defined(TARGET_MANDRIVA) || defined(TARGET_MAGEIA) || defined(TARGET_MAGELLAN)
    113     else if (strneq(w, "forcequotacheck", l))
    114     arg_force = true;
    115     #endif
    116     @@ -65,8 +65,8 @@
    117     }
    118    
    119     static void test_files(void) {
    120     -#if defined(TARGET_FEDORA) || defined(TARGET_MANDRIVA) || defined(TARGET_MAGEIA)
    121     - /* This exists only on Fedora, Mandriva or Mageia */
    122     +#if defined(TARGET_FEDORA) || defined(TARGET_MANDRIVA) || defined(TARGET_MAGEIA) || defined(TARGET_MAGELLAN)
    123     + /* This exists only on Fedora, Mandriva, Mageia or Magellan */
    124     if (access("/forcequotacheck", F_OK) >= 0)
    125     arg_force = true;
    126     #endif
    127     diff -Naur systemd-195/src/vconsole/vconsole-setup.c systemd-195-magellan/src/vconsole/vconsole-setup.c
    128     --- systemd-195/src/vconsole/vconsole-setup.c 2012-10-03 17:55:37.905259616 +0200
    129     +++ systemd-195-magellan/src/vconsole/vconsole-setup.c 2012-11-19 18:43:35.341762976 +0100
    130     @@ -370,6 +370,20 @@
    131     if (r < 0 && r != -ENOENT)
    132     log_warning("Failed to read /etc/conf.d/keymaps: %s", strerror(-r));
    133    
    134     +#elif defined(TARGET_MAGELLAN)
    135     + if ((r = parse_env_file("/etc/conf.d/keymap", NEWLINE,
    136     + "KEYMAP", &vc_keymap,
    137     + NULL)) < 0) {
    138     + if (r < 0 && r != -ENOENT)
    139     + log_warning("Failed to read /etc/conf.d/keymap: %s", strerror(-r));
    140     + }
    141     + if ((r = parse_env_file("/etc/conf.d/consolefont", NEWLINE,
    142     + "CONSOLEFONT", &vc_font,
    143     + NULL)) < 0) {
    144     + if (r < 0 && r != -ENOENT)
    145     + log_warning("Failed to read /etc/conf.d/consolefont: %s", strerror(-r));
    146     + }
    147     +
    148     #elif defined(TARGET_MANDRIVA) || defined (TARGET_MAGEIA)
    149    
    150     r = parse_env_file("/etc/sysconfig/i18n", NEWLINE,