[arch-commits] Commit in systemd/trunk (2 files)

[Dave Reisner]

    Date: Tuesday, December 24, 2013 @ 19:39:24
  Author: dreisner
Revision: 202684

upgpkg: systemd 208-7

- remove tmpfiles.d/console.conf (no longer needed)
- backport fix for FS#38123

Added:
  systemd/trunk/0001-Make-hibernation-test-work-for-swap-files.patch
Modified:
  systemd/trunk/PKGBUILD

------------------------------------------------------+
 0001-Make-hibernation-test-work-for-swap-files.patch |   28 +++++++++++++++++
 PKGBUILD                                             |    9 +++--
 2 files changed, 34 insertions(+), 3 deletions(-)

Added: 0001-Make-hibernation-test-work-for-swap-files.patch
===================================================================
--- 0001-Make-hibernation-test-work-for-swap-files.patch	                        (rev 0)
+++ 0001-Make-hibernation-test-work-for-swap-files.patch	2013-12-24 18:39:24 UTC (rev 202684)
@@ -0,0 +1,28 @@
+From 0c6f1f4ea4980ff719979d36f10bd6ea3e464c02 Mon Sep 17 00:00:00 2001
+From: Jan Janssen <medhefgo at web.de>
+Date: Thu, 31 Oct 2013 17:22:03 +0100
+Subject: [PATCH] Make hibernation test work for swap files
+
+Suspend to disk works for swap files too (even if it is located
+on an ecrypted file system):
+https://www.kernel.org/doc/Documentation/power/swsusp-and-swap-files.txt
+---
+ src/shared/sleep-config.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/shared/sleep-config.c b/src/shared/sleep-config.c
+index d068bfc..2bb0493 100644
+--- a/src/shared/sleep-config.c
++++ b/src/shared/sleep-config.c
+@@ -206,7 +206,7 @@ static int hibernation_partition_size(size_t *size, size_t *used) {
+                 if (!d)
+                         return -ENOMEM;
+ 
+-                if (!streq(type, "partition")) {
++                if (!streq(type, "partition") && !streq(type, "file")) {
+                         log_debug("Partition %s has type %s, ignoring.", d, type);
+                         continue;
+                 }
+-- 
+1.8.5.2
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-12-24 15:27:05 UTC (rev 202683)
+++ PKGBUILD	2013-12-24 18:39:24 UTC (rev 202684)
@@ -4,7 +4,7 @@
 pkgbase=systemd
 pkgname=('systemd' 'systemd-sysvcompat')
 pkgver=208
-pkgrel=6
+pkgrel=7
 arch=('i686' 'x86_64')
 url="http://www.freedesktop.org/wiki/Software/systemd"
 makedepends=('acl' 'cryptsetup' 'dbus-core' 'docbook-xsl' 'gobject-introspection' 'gperf'
@@ -15,6 +15,7 @@
         'initcpio-hook-udev'
         'initcpio-install-systemd'
         'initcpio-install-udev'
+        '0001-Make-hibernation-test-work-for-swap-files.patch'
         '0001-fix-lingering-references-to-var-lib-backlight-random.patch'
         '0001-mount-check-for-NULL-before-reading-pm-what.patch'
         '0001-shared-util-fix-off-by-one-error-in-tag_to_udev_node.patch'
@@ -31,6 +32,7 @@
          '29245f7a240bfba66e2b1783b63b6b40'
          '8b68b0218a3897d4d37a6ccf47914774'
          'bde43090d4ac0ef048e3eaee8202a407'
+         'a5c6564d5435ee99814effd2aa9baf93'
          '1b191c4e7a209d322675fd199e3abc66'
          'a693bef63548163ffc165f4c4801ebf7'
          'ccafe716d87df9c42af0d1960b5a4105'
@@ -46,6 +48,7 @@
 
 prepare() {
   cd "$pkgname-$pkgver"
+
   patch -Np1 < "$srcdir"/0001-fix-lingering-references-to-var-lib-backlight-random.patch
   patch -Np1 < "$srcdir"/0001-mount-check-for-NULL-before-reading-pm-what.patch
   patch -Np1 < "$srcdir"/0001-shared-util-fix-off-by-one-error-in-tag_to_udev_node.patch
@@ -63,6 +66,8 @@
   patch -Np1 < "$srcdir"/0007-fsck-root-only-run-when-requested-in-fstab.patch
   # Fix FS#38210 (result of the previous backport)
   patch -Np1 < "$srcdir"/0001-fstab-generator-Do-not-try-to-fsck-non-devices.patch
+  # Fix FS#38123
+  patch -Np1 < "$srcdir"/0001-Make-hibernation-test-work-for-swap-files.patch
 
   autoreconf
 }
@@ -121,8 +126,6 @@
 
   make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install
 
-  printf "d /run/console 0755 root root\n" > "$pkgdir/usr/lib/tmpfiles.d/console.conf"
-
   # fix .so links in manpage stubs
   find "$pkgdir/usr/share/man" -type f -name '*.[[:digit:]]' \
       -exec sed -ri '1s|^\.so (.*)\.([0-9]+)|.so man\2/\1.\2|' {} +