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

[Thomas Bächler]

    Date: Sunday, December 22, 2013 @ 09:37:56
  Author: thomas
Revision: 202446

upgpkg: systemd 208-5

Added:
  systemd/trunk/0001-fstab-generator-Do-not-try-to-fsck-non-devices.patch
Modified:
  systemd/trunk/PKGBUILD

-----------------------------------------------------------+
 0001-fstab-generator-Do-not-try-to-fsck-non-devices.patch |   33 ++++++++++++
 PKGBUILD                                                  |   10 ++-
 2 files changed, 40 insertions(+), 3 deletions(-)

Added: 0001-fstab-generator-Do-not-try-to-fsck-non-devices.patch
===================================================================
--- 0001-fstab-generator-Do-not-try-to-fsck-non-devices.patch	                        (rev 0)
+++ 0001-fstab-generator-Do-not-try-to-fsck-non-devices.patch	2013-12-22 08:37:56 UTC (rev 202446)
@@ -0,0 +1,33 @@
+From 92e94a2b145eb3bee7035907cd8482285bb680ef Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Thomas=20B=C3=A4chler?= <thomas at archlinux.org>
+Date: Sun, 22 Dec 2013 09:17:14 +0100
+Subject: [PATCH] fstab-generator: Do not try to fsck non-devices
+
+This fixes a regression introduced in 64e70e4 where the mount fails
+when fstab is misconfigured with fs_passno > 0 on a virtual file
+system like nfs, and the type is specified as "auto".
+
+This is a backport of e2f123b97, but it since not all fsck-related patches
+have been backported to this version, the implementation is a bit different.
+---
+ src/fstab-generator/fstab-generator.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/fstab-generator/fstab-generator.c b/src/fstab-generator/fstab-generator.c
+index c0c2992..cf8b371 100644
+--- a/src/fstab-generator/fstab-generator.c
++++ b/src/fstab-generator/fstab-generator.c
+@@ -210,7 +210,9 @@ static int add_mount(
+                         post);
+ 
+         if (passno > 0) {
+-                if (streq(where, "/")) {
++                if(!is_device_path(what)) {
++                        log_warning("Checking was requested for \"%s\", but it is not a device.", what);
++                } else if (streq(where, "/")) {
+                         lnk = strjoin(arg_dest, "/", SPECIAL_LOCAL_FS_TARGET, ".wants/", "systemd-fsck-root.service", NULL);
+                         if (!lnk)
+                                 return log_oom();
+-- 
+1.8.5.2
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-12-22 07:44:29 UTC (rev 202445)
+++ PKGBUILD	2013-12-22 08:37:56 UTC (rev 202446)
@@ -4,7 +4,7 @@
 pkgbase=systemd
 pkgname=('systemd' 'systemd-sysvcompat')
 pkgver=208
-pkgrel=4
+pkgrel=5
 arch=('i686' 'x86_64')
 url="http://www.freedesktop.org/wiki/Software/systemd"
 makedepends=('acl' 'cryptsetup' 'dbus-core' 'docbook-xsl' 'gobject-introspection' 'gperf'
@@ -25,7 +25,8 @@
         '0004-Remove-FsckPassNo-from-systemd-fsck-root.service.patch'
         '0005-mount-service-drop-FsckPassNo-support.patch'
         '0006-efi-boot-generator-hookup-to-fsck.patch'
-        '0007-fsck-root-only-run-when-requested-in-fstab.patch')
+        '0007-fsck-root-only-run-when-requested-in-fstab.patch'
+        '0001-fstab-generator-Do-not-try-to-fsck-non-devices.patch')
 md5sums=('df64550d92afbffb4f67a434193ee165'
          '29245f7a240bfba66e2b1783b63b6b40'
          '8b68b0218a3897d4d37a6ccf47914774'
@@ -40,7 +41,8 @@
          '2096f33bd36dfa0a7f0431d0a429787a'
          'd2481a6ea199b581e243a950125b0ca6'
          'c2aee634a3a6c50778968f0d5c756f40'
-         'ef8b8212d504bb73c10bf4e85f0703b2')
+         'ef8b8212d504bb73c10bf4e85f0703b2'
+         '4ba2317bf4d7708fca406f49482b1bf3')
 
 prepare() {
   cd "$pkgname-$pkgver"
@@ -59,6 +61,8 @@
   patch -Np1 < "$srcdir"/0005-mount-service-drop-FsckPassNo-support.patch
   patch -Np1 < "$srcdir"/0006-efi-boot-generator-hookup-to-fsck.patch
   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
 
   autoreconf
 }