/[pkg-src]/trunk/systemd/patches/systemd-185-magellan.patch

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

Parent Directory | Revision Log | View Patch Patch

-revision 1811 by niro,
Tue Jun 26 13:34:57 2012 UTC
+revision 1812 by niro,
Tue Jun 26 13:45:01 2012 UTC
 Line 1
  diff -Naur systemd-185/configure.ac systemd-185-magellan/configure.ac
  --- systemd-185/configure.ac	2012-06-04 20:06:13.704620269 +0200
- +++ systemd-185-magellan/configure.ac	2012-06-26 16:03:20.226982674 +0200
+ +++ systemd-185-magellan/configure.ac	2012-06-26 16:45:21.419979202 +0200
  @@ -494,7 +494,7 @@
   AC_PATH_PROG([XSLTPROC], [xsltproc])
   AM_CONDITIONAL(HAVE_XSLTPROC, test x"$XSLTPROC" != x)
 Line 34 
 diff -Naur systemd-185/configure.ac syst
   AM_CONDITIONAL(TARGET_ALTLINUX, test x"$with_distro" = xaltlinux)
  diff -Naur systemd-185/Makefile.am systemd-185-magellan/Makefile.am
  --- systemd-185/Makefile.am	2012-06-04 20:14:57.703501056 +0200
- +++ systemd-185-magellan/Makefile.am	2012-06-26 16:04:38.444982768 +0200
+ +++ systemd-185-magellan/Makefile.am	2012-06-26 16:45:21.420979286 +0200
  @@ -153,6 +153,12 @@
   	-DKBD_SETFONT=\"/usr/bin/setfont\" \
   	-DDEFAULT_FONT=\"LatArCyrHeb-16\"
 Line 58 
 diff -Naur systemd-185/Makefile.am syste
   endif
  diff -Naur systemd-185/src/core/hostname-setup.c systemd-185-magellan/src/core/hostname-setup.c
  --- systemd-185/src/core/hostname-setup.c	2012-05-21 19:23:02.751293222 +0200
- +++ systemd-185-magellan/src/core/hostname-setup.c	2012-06-26 16:08:41.560982822 +0200
+ +++ systemd-185-magellan/src/core/hostname-setup.c	2012-06-26 16:45:21.420979286 +0200
  @@ -34,6 +34,8 @@
   #define FILENAME "/etc/sysconfig/network"
   #elif defined(TARGET_SUSE) || defined(TARGET_SLACKWARE)
 Line 79 
 diff -Naur systemd-185/src/core/hostname
           return -ENOENT;
  diff -Naur systemd-185/src/core/locale-setup.c systemd-185-magellan/src/core/locale-setup.c
  --- systemd-185/src/core/locale-setup.c	2012-04-12 01:04:30.612222912 +0200
- +++ systemd-185-magellan/src/core/locale-setup.c	2012-06-26 16:11:06.075983329 +0200
+ +++ systemd-185-magellan/src/core/locale-setup.c	2012-06-26 16:45:21.420979286 +0200
  @@ -173,7 +173,7 @@
                           log_warning("Failed to read /etc/rc.conf: %s", strerror(-r));
           }
 Line 91 
 diff -Naur systemd-185/src/core/locale-s
            * export commands at /etc/profile.env, with variables being
  diff -Naur systemd-185/src/fsck/fsck.c systemd-185-magellan/src/fsck/fsck.c
  --- systemd-185/src/fsck/fsck.c	2012-04-12 17:54:42.016667199 +0200
- +++ systemd-185-magellan/src/fsck/fsck.c	2012-06-26 16:06:03.926982686 +0200
+ +++ systemd-185-magellan/src/fsck/fsck.c	2012-06-26 16:45:21.421979382 +0200
  @@ -127,7 +127,7 @@
                           arg_skip = true;
                   else if (startswith(w, "fsck.mode"))
 Line 103 
 diff -Naur systemd-185/src/fsck/fsck.c s
                   else if (strneq(w, "forcefsck", l))
  diff -Naur systemd-185/src/quotacheck/quotacheck.c systemd-185-magellan/src/quotacheck/quotacheck.c
  --- systemd-185/src/quotacheck/quotacheck.c	2012-04-12 17:54:42.017667199 +0200
- +++ systemd-185-magellan/src/quotacheck/quotacheck.c	2012-06-26 16:13:20.141982550 +0200
+ +++ systemd-185-magellan/src/quotacheck/quotacheck.c	2012-06-26 16:45:21.421979382 +0200
  @@ -54,7 +54,7 @@
                           arg_skip = true;
                   else if (startswith(w, "quotacheck.mode"))
 Line 126 
 diff -Naur systemd-185/src/quotacheck/qu
   #endif
  diff -Naur systemd-185/src/vconsole/vconsole-setup.c systemd-185-magellan/src/vconsole/vconsole-setup.c
  --- systemd-185/src/vconsole/vconsole-setup.c	2012-05-03 22:03:17.886325106 +0200
- +++ systemd-185-magellan/src/vconsole/vconsole-setup.c	2012-06-26 16:16:08.339982793 +0200
+ +++ systemd-185-magellan/src/vconsole/vconsole-setup.c	2012-06-26 16:47:07.461982434 +0200
- @@ -163,6 +163,20 @@
+ @@ -359,6 +359,20 @@
-  #ifdef TARGET_GENTOO
+                  if (r < 0 && r != -ENOENT)
-          char *vc_unicode = NULL;
+                          log_warning("Failed to read /etc/conf.d/keymaps: %s", strerror(-r));
-  #endif
- +#ifdef TARGET_MAGELLAN
+ +#elif defined(TARGET_MAGELLAN)
- +        if ((r = parse_env_file("/etc/conf.d/keymap", NEWLINE,
+ +                if ((r = parse_env_file("/etc/conf.d/keymap", NEWLINE,
- +                "KEYMAP", &vc_keymap,
+ +                                        "KEYMAP", &vc_keymap,
- +                NULL)) < 0) {
+ +                                        NULL)) < 0) {
  +                        if (r != -ENOENT)
  +                                log_warning("Failed to read /etc/conf.d/keymap: %s", strerror(-r));
  +                }
- +        if ((r = parse_env_file("/etc/conf.d/consolefont", NEWLINE,
+ +                if ((r = parse_env_file("/etc/conf.d/consolefont", NEWLINE,
- +                "CONSOLEFONT", &vc_font,
+ +                                        "CONSOLEFONT", &vc_font,
- +                NULL)) < 0) {
+ +                                        NULL)) < 0) {
  +                        if (r != -ENOENT)
  +                                log_warning("Failed to read /etc/conf.d/consolefont: %s", strerror(-r));
  +                }
- +#endif
+ +
-  #if defined(TARGET_MANDRIVA) || defined(TARGET_MAGEIA)
+  #elif defined(TARGET_MANDRIVA) || defined (TARGET_MAGEIA)
-          char *vc_keytable = NULL;
-  #endif
+                  r = parse_env_file("/etc/sysconfig/i18n", NEWLINE,

 Legend:



Removed from v.1811
 


changed lines


 
Added in v.1812
 Legend:



Removed from v.1811
 


changed lines


 
Added in v.1812
-Removed from v.1811
+Added in v.1812