Add some fixes for -f handling.

Package-Manager: portage-2.0.51.22-r2

4 files changed, 40 insertions, 7 deletions

diff --git a/sys-apps/util-linux/ChangeLog b/sys-apps/util-linux/ChangeLog
index 0a05593202fa..3d7d80f854a0 100644
--- a/sys-apps/util-linux/ChangeLog
+++ b/sys-apps/util-linux/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/util-linux
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.105 2005/08/18 02:02:02 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.106 2005/09/03 02:24:24 vapier Exp $
+
+  03 Sep 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/util-linux-2.12q-more-fake-checks.patch,
+  util-linux-2.12q-r1.ebuild:
+  Add some fixes for -f handling.
 
   18 Aug 2005; Mike Frysinger <vapier@gentoo.org>
   +files/util-linux-2.12q-dont-umask.patch, util-linux-2.12q-r1.ebuild:
diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index f509243e4ccd..925d8b5110ec 100644
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -3,16 +3,17 @@ Hash: SHA1
 
 MD5 40353e338343ed2b6a8f23259c881e49 util-linux-2.12q.ebuild 4785
 MD5 3539732064102ec9896b7ae3b90e8e99 util-linux-2.12p-r1.ebuild 4396
-MD5 83057b1431cfef41473d6c4f4e8d0f86 util-linux-2.12q-r1.ebuild 4916
+MD5 1281e5b67b05e64bf029a780be510073 util-linux-2.12q-r1.ebuild 5011
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 MD5 af4d9067188d2b9be9ff65f0a2482a1f util-linux-2.12i-r1.ebuild 3846
-MD5 aff25132cd73e5efc244eae984f220d3 ChangeLog 17983
+MD5 c63170dca767a50edd38e3d9db1fe9d9 ChangeLog 18148
 MD5 519d6757067c4ee7c634c8b60f9abeb3 files/util-linux-2.12p-swapon-check-symlinks.patch 864
 MD5 e3697bc8fd6a344e8cba1c7d32e34790 files/util-linux-2.11z-parallel-make.patch 369
 MD5 28b1a8ed38823851eafadacef8ce11ec files/util-linux-2.12q-no-m68k-fdisk.patch 239
 MD5 33ddd96078cf91030b80f73eb70f5371 files/util-linux-2.12i-swapon-check-symlinks.patch 875
 MD5 8d4f1146f0699deb1e6872e1c81293e3 files/util-linux-2.12-selinux.diff.bz2 2558
 MD5 a33ff00c09f558d4273360a581880c23 files/digest-util-linux-2.12q-r1 292
+MD5 6eba0a390d20cd25c0d23e3155755f31 files/util-linux-2.12q-more-fake-checks.patch 612
 MD5 d448f3b1b3ea21db4c2c4f303b48c1c8 files/digest-util-linux-2.12p-r1 294
 MD5 65f42fbf981464410f7d5d84a429e920 files/util-linux-no-kill.patch 642
 MD5 a43d2b8c70c5f40a195721dc536abace files/util-linux-2.12-swapon-unistd.patch 289
@@ -37,7 +38,7 @@ MD5 cfa3960fd97ca16c85b0d1b87e6ba226 files/digest-util-linux-2.12i-r1 156
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDA+w6gIKl8Uu19MoRAhF1AJsG6c4xWKuxpaemwjzcpLPy1h4z+ACfbbQm
-A7+VLLnVtmIUUM0v/GyrfAI=
-=hrg0
+iD8DBQFDGQl9gIKl8Uu19MoRAs3JAJ9evpJU3+bm0legJBzigLj/zk6bAwCdGyWQ
+dZ7lDDFwOOGzS7Dw00LkMO4=
+=ZtDK
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/util-linux/files/util-linux-2.12q-more-fake-checks.patch b/sys-apps/util-linux/files/util-linux-2.12q-more-fake-checks.patch
new file mode 100644
index 000000000000..fdf6a4303c0b
--- /dev/null
+++ b/sys-apps/util-linux/files/util-linux-2.12q-more-fake-checks.patch
@@ -0,0 +1,24 @@
+Running `mount -fv /mnt/pnt` incorrectly updates /etc/mtab
+
+Running `mount -afvt type` incorrectly warns that 'nothing was mounted'
+
+--- mount/mount.c
++++ mount/mount.c
+@@ -659,7 +659,7 @@
+ 	if (verbose)
+ 		print_one (&mnt);
+ 
+-	if (!nomtab && mtab_is_writable()) {
++	if (!fake && !nomtab && mtab_is_writable()) {
+ 		if (flags & MS_REMOUNT)
+ 			update_mtab (mnt.mnt_dir, &mnt);
+ 		else {
+@@ -1629,7 +1629,7 @@
+ 	case 0:
+ 		/* mount -a */
+ 		result = do_mount_all (types, options, test_opts);
+-		if (result == 0 && verbose)
++		if (result == 0 && verbose && !fake)
+ 			error(_("nothing was mounted"));
+ 		break;
+ 
diff --git a/sys-apps/util-linux/util-linux-2.12q-r1.ebuild b/sys-apps/util-linux/util-linux-2.12q-r1.ebuild
index 656b9bb6259a..9c1935715d4a 100644
--- a/sys-apps/util-linux/util-linux-2.12q-r1.ebuild
+++ b/sys-apps/util-linux/util-linux-2.12q-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.12q-r1.ebuild,v 1.4 2005/08/18 02:02:02 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.12q-r1.ebuild,v 1.5 2005/09/03 02:24:24 vapier Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -51,6 +51,9 @@ src_unpack() {
 	# Fix rare failures with -j4 or higher
 	epatch ${FILESDIR}/${PN}-2.11z-parallel-make.patch
 
+	# Fix -f usage with -a and in general
+	epatch ${FILESDIR}/${PN}-2.12q-more-fake-checks.patch
+
 	# Fix unreadable df output when using devfs ... this check is kind of 
 	# a hack, but whatever, the output isnt critical at all :P
 	[[ -e /dev/.devfsd ]] && epatch ${FILESDIR}/no-symlink-resolve.patch