From: Elan Ruusamäe <glen@pld-linux.org>
Date: Wed, 21 Sep 2005 16:59:34 +0000 (+0000)
Subject: - CAN-2005-2876; patch taken from gentoo portage
X-Git-Tag: auto/ac/util-linux-2_12q-4~1
X-Git-Url: http://git.pld-linux.org/?p=packages%2Futil-linux.git;a=commitdiff_plain;h=b2dedeaa040527b660af542a33e49113e3b978ad;hp=c0b36f46d65ca9b10f850344e3e277f02a9a9b92

- CAN-2005-2876; patch taken from gentoo portage

Changed files:
    util-linux-2.12q-use-update_mtab-for-fake.patch -> 1.1
---

diff --git a/util-linux-2.12q-use-update_mtab-for-fake.patch b/util-linux-2.12q-use-update_mtab-for-fake.patch
new file mode 100644
index 0000000..5d0b436
--- /dev/null
+++ b/util-linux-2.12q-use-update_mtab-for-fake.patch
@@ -0,0 +1,16 @@
+Use update_mtab() to update /etc/mtab on fake mounts (mount -f), else we get
+dup entries in /etc/mtab.
+
+Patch by Mike Frysinger <vapier@gentoo.org>
+
+--- util-linux-2.12q/mount/mount.c	2005-09-14 15:37:43.000000000 +0200
++++ util-linux-2.12q.az/mount/mount.c	2005-09-14 15:27:14.000000000 +0200
+@@ -662,7 +662,7 @@ update_mtab_entry(const char *spec, cons
+ 		print_one (&mnt);
+ 
+ 	if (!nomtab && mtab_is_writable()) {
+-		if (flags & MS_REMOUNT)
++		if (fake || (flags & MS_REMOUNT))
+ 			update_mtab (mnt.mnt_dir, &mnt);
+ 		else {
+ 			mntFILE *mfp;