diff options
| author | root <root@rshg054.dnsready.net> | 2012-03-02 00:01:28 +0000 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2012-03-02 00:01:28 +0000 |
| commit | 9ff97db6951550a28a70b27491a446da9d736176 (patch) | |
| tree | 482d46078cf0367200908e8e26bb335e54429b5b /testing/util-linux | |
| parent | 6f297b1cf462a11227d811a87124006c55911d63 (diff) | |
Fri Mar 2 00:01:27 UTC 2012
Diffstat (limited to 'testing/util-linux')
| -rw-r--r-- | testing/util-linux/PKGBUILD | 11 | ||||
| -rw-r--r-- | testing/util-linux/libmount-allow-empty-source-for-mount-2-syscall.patch | 48 |
2 files changed, 55 insertions, 4 deletions
diff --git a/testing/util-linux/PKGBUILD b/testing/util-linux/PKGBUILD index 9b871e433..c8d71e48e 100644 --- a/testing/util-linux/PKGBUILD +++ b/testing/util-linux/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 151587 2012-02-27 18:50:38Z tomegun $ +# $Id: PKGBUILD 151651 2012-02-29 16:49:07Z tomegun $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: judd <jvinet@zeroflux.org> pkgname=util-linux pkgver=2.21 -pkgrel=3 +pkgrel=4 pkgdesc="Miscellaneous system utilities for Linux" url="http://www.kernel.org/pub/linux/utils/util-linux/" arch=('i686' 'x86_64') @@ -19,7 +19,8 @@ source=(ftp://ftp.kernel.org/pub/linux/utils/${pkgname}/v${pkgver}/${pkgname}-${ lib-canonicalize-always-remove-tailing-slash.patch libmount-canonicalize-targets-from-fstab-on-mount-a.patch mount-new-cleanup-mount-a-return-codes.patch - libmount-use-mount.-type-s-for-NFS-only.patch) + libmount-use-mount.-type-s-for-NFS-only.patch + libmount-allow-empty-source-for-mount-2-syscall.patch) optdepends=('perl: for chkdupexe support') build() { @@ -33,6 +34,7 @@ build() { 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 + patch -p1 -i ../libmount-allow-empty-source-for-mount-2-syscall.patch ./configure --prefix=/usr \ --libdir=/usr/lib \ @@ -61,4 +63,5 @@ md5sums=('208aa058f4117759d2939d1be7d662fc' '8c1bf7b10e22e2b835441e6ae2d804d6' '7b92423c588ed35229a9a166349c29a9' 'c483ab2d52609b5857d096b256a5075c' - 'e31037773db7f3244b71db434f60e6f0') + 'e31037773db7f3244b71db434f60e6f0' + '2de5ae7916e79970e90bf06542e43d86') diff --git a/testing/util-linux/libmount-allow-empty-source-for-mount-2-syscall.patch b/testing/util-linux/libmount-allow-empty-source-for-mount-2-syscall.patch new file mode 100644 index 000000000..97f5dc925 --- /dev/null +++ b/testing/util-linux/libmount-allow-empty-source-for-mount-2-syscall.patch @@ -0,0 +1,48 @@ +From 772cce373f693096c2ae6f156306acf9e20c09e8 Mon Sep 17 00:00:00 2001 +From: Karel Zak <kzak@redhat.com> +Date: Tue, 28 Feb 2012 00:02:30 +0100 +Subject: [PATCH] libmount: allow empty source for mount(2) syscall + +Addresses: https://bugzilla.redhat.com/show_bug.cgi?id=797438 +Signed-off-by: Karel Zak <kzak@redhat.com> +--- + libmount/src/context_mount.c | 4 +++- + sys-utils/mount.c | 6 +++++- + 2 files changed, 8 insertions(+), 2 deletions(-) + +diff --git a/libmount/src/context_mount.c b/libmount/src/context_mount.c +index a0c5951..098243b 100644 +--- a/libmount/src/context_mount.c ++++ b/libmount/src/context_mount.c +@@ -451,8 +451,10 @@ static int do_mount(struct libmnt_context *cxt, const char *try_type) + src = mnt_fs_get_srcpath(cxt->fs); + target = mnt_fs_get_target(cxt->fs); + +- if (!src || !target) ++ if (!target) + return -EINVAL; ++ if (!src) ++ src = "none"; + + type = try_type ? : mnt_fs_get_fstype(cxt->fs); + +diff --git a/sys-utils/mount.c b/sys-utils/mount.c +index 3fbac04..23abc91 100644 +--- a/sys-utils/mount.c ++++ b/sys-utils/mount.c +@@ -347,7 +347,11 @@ try_readonly: + return MOUNT_EX_USAGE; + } + +- if (src == NULL || tgt == NULL) { ++ /* ++ * TODO: add mnt_context_fstab_applied() to check if we found ++ * target/source in the file. ++ */ ++ if (!tgt) { + if (mflags & MS_REMOUNT) + warnx(_("%s not mounted"), src ? src : tgt); + else +-- +1.7.9.2 + |