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

[Tom Gundersen]

    Date: Monday, February 27, 2012 @ 13:49:46
  Author: tomegun
Revision: 151586

upgpkg: util-linux 2.21-3

fix https://bugs.archlinux.org/task/28682

Added:
  util-linux/trunk/libmount-use-mount.-type-s-for-NFS-only.patch
Modified:
  util-linux/trunk/PKGBUILD

-----------------------------------------------+
 PKGBUILD                                      |    9 ++++--
 libmount-use-mount.-type-s-for-NFS-only.patch |   34 ++++++++++++++++++++++++
 2 files changed, 40 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-02-27 18:44:01 UTC (rev 151585)
+++ PKGBUILD	2012-02-27 18:49:46 UTC (rev 151586)
@@ -4,7 +4,7 @@
 
 pkgname=util-linux
 pkgver=2.21
-pkgrel=2
+pkgrel=3
 pkgdesc="Miscellaneous system utilities for Linux"
 url="http://www.kernel.org/pub/linux/utils/util-linux/"
 arch=('i686' 'x86_64')
@@ -18,7 +18,8 @@
 	libmount-canonicalize-all-paths-from-fs-tab.patch
 	lib-canonicalize-always-remove-tailing-slash.patch
 	libmount-canonicalize-targets-from-fstab-on-mount-a.patch
-	mount-new-cleanup-mount-a-return-codes.patch)
+	mount-new-cleanup-mount-a-return-codes.patch
+	libmount-use-mount.-type-s-for-NFS-only.patch)
 optdepends=('perl: for chkdupexe support')
 
 build() {
@@ -31,6 +32,7 @@
   patch -p1 -i ../lib-canonicalize-always-remove-tailing-slash.patch
   patch -p1 -i ../libmount-canonicalize-targets-from-fstab-on-mount-a.patch
   patch -p1 -i ../mount-new-cleanup-mount-a-return-codes.patch 
+  patch -p1 -i ../libmount-use-mount.-type-s-for-NFS-only.patch
 
   ./configure --prefix=/usr \
               --libdir=/usr/lib \
@@ -58,4 +60,5 @@
          'c4011222a19b020d9b8465c3c7e443f6'
          '8c1bf7b10e22e2b835441e6ae2d804d6'
          '7b92423c588ed35229a9a166349c29a9'
-         'c483ab2d52609b5857d096b256a5075c')
+         'c483ab2d52609b5857d096b256a5075c'
+         'e31037773db7f3244b71db434f60e6f0')

Added: libmount-use-mount.-type-s-for-NFS-only.patch
===================================================================
--- libmount-use-mount.-type-s-for-NFS-only.patch	                        (rev 0)
+++ libmount-use-mount.-type-s-for-NFS-only.patch	2012-02-27 18:49:46 UTC (rev 151586)
@@ -0,0 +1,34 @@
+From 9bf9690114b7432144caf815e149e35640bc3ad0 Mon Sep 17 00:00:00 2001
+From: Karel Zak <kzak at redhat.com>
+Date: Mon, 27 Feb 2012 16:43:12 +0100
+Subject: [PATCH] libmount: use mount.<type> -s for NFS only
+
+Unfortunately, it seems that for example mount.cifs don't care about
+the API, so we need exception like the original mount(8).
+
+Signed-off-by: Karel Zak <kzak at redhat.com>
+---
+ libmount/src/context_mount.c |    7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/libmount/src/context_mount.c b/libmount/src/context_mount.c
+index 8cbc25b..a0c5951 100644
+--- a/libmount/src/context_mount.c
++++ b/libmount/src/context_mount.c
+@@ -369,7 +369,12 @@ static int exec_helper(struct libmnt_context *cxt)
+ 		args[i++] = mnt_fs_get_srcpath(cxt->fs);/* 2 */
+ 		args[i++] = mnt_fs_get_target(cxt->fs);	/* 3 */
+ 
+-		if (mnt_context_is_sloppy(cxt))
++		/*
++		 * TODO: remove the exception for "nfs", -s is documented
++		 *       for years should be usable everywhere.
++		 */
++		if (mnt_context_is_sloppy(cxt) &&
++		    type && startswith(type, "nfs"))
+ 			args[i++] = "-s";		/* 4 */
+ 		if (mnt_context_is_fake(cxt))
+ 			args[i++] = "-f";		/* 5 */
+-- 
+1.7.9.2
+