Magellan Linux

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

    Diff of /trunk/systemd/patches/systemd-28-magellan-2.patch

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

    revision 1339 by niro, Thu Jun 2 18:58:38 2011 UTC revision 1340 by niro, Thu Jun 2 19:33:50 2011 UTC
    # Line 126  diff -Naur systemd-28/src/locale-setup.c Line 126  diff -Naur systemd-28/src/locale-setup.c
    126               (r = parse_env_file("/etc/sysconfig/i18n", NEWLINE,               (r = parse_env_file("/etc/sysconfig/i18n", NEWLINE,
    127  diff -Naur systemd-28/src/util.c systemd-28-magellan/src/util.c  diff -Naur systemd-28/src/util.c systemd-28-magellan/src/util.c
    128  --- systemd-28/src/util.c 2011-05-25 17:57:49.000000000 +0200  --- systemd-28/src/util.c 2011-05-25 17:57:49.000000000 +0200
    129  +++ systemd-28-magellan/src/util.c 2011-06-01 21:40:03.000000000 +0200  +++ systemd-28-magellan/src/util.c 2011-06-02 21:31:39.000000000 +0200
    130  @@ -3356,6 +3356,19 @@  @@ -3356,6 +3356,28 @@
    131           if (!ansi_color)           if (!ansi_color)
    132                   const_color = "1;34"; /* Light Blue for Gentoo */                   const_color = "1;34"; /* Light Blue for Gentoo */
    133    
    134  +#elif defined(TARGET_MAGELLAN)  +#elif defined(TARGET_MAGELLAN)
    135  +  +
    136  +        if (!pretty_name) {  +        if (!pretty_name) {
    137  +                if ((r = read_one_line_file("/etc/mageversion", &pretty_name)) < 0) {  +                char *version;
    138    +
    139    +                if ((r = read_one_line_file("/etc/mageversion", &version)) < 0) {
    140  +  +
    141  +                        if (r != -ENOENT)  +                        if (r != -ENOENT)
    142  +                                log_warning("Failed to read /etc/mageversion: %s", strerror(-r));  +                                log_warning("Failed to read /etc/mageversion: %s", strerror(-r));
    143    +                } else {
    144    +                        pretty_name = strappend("Magellan-Linux (v", version);
    145    +                        pretty_name = strappend(pretty_name, ")");
    146    +                        free(version);
    147    +
    148    +                        if (!pretty_name)
    149    +                                log_warning("Failed to allocate Debian version string.");
    150  +                }  +                }
    151  +        }  +        }
    152  +  +
    Legend:
    Removed from v.1339  
    changed lines
      Added in v.1340