util-linux/patches/util-linux-2.12q-update-mtab-when-moving.patch

Running `mount --move /foo /bar` would leave the old /foo entry in /etc/mtab 
and create a new /bar entry with wrong info.

http://bugs.gentoo.org/104697

--- 1/mount/mount.c
+++ 2/mount/mount.c
@@ -665,6 +665,25 @@
 		else {
 			mntFILE *mfp;
 
+			/* when moving a mount point, we have to make sure the mtab
+			 * gets updated properly.  We get info about the old mount
+			 * point, copy it to the new mount point, and then delete
+			 * the old mount point. */
+			if (flags & MS_MOVE) {
+				const char *olddir = mnt.mnt_fsname;
+				struct mntentchn *oldmc = oldmc = getmntfile(olddir);
+				if (oldmc != NULL) {
+					mnt.mnt_fsname = xstrdup(oldmc->m.mnt_fsname);
+					mnt.mnt_type = oldmc->m.mnt_type;
+					mnt.mnt_opts = oldmc->m.mnt_opts;
+					mnt.mnt_freq = oldmc->m.mnt_freq;
+					mnt.mnt_passno = oldmc->m.mnt_passno;
+				}
+				update_mtab(olddir, NULL);
+				if (oldmc != NULL)
+					my_free(olddir);
+			}
+
 			lock_mtab();
 			mfp = my_setmntent(MOUNTED, "a+");
 			if (mfp == NULL || mfp->mntent_fp == NULL) {
1	Running `mount --move /foo /bar` would leave the old /foo entry in /etc/mtab
2	and create a new /bar entry with wrong info.
3
4	http://bugs.gentoo.org/104697
5
6	--- 1/mount/mount.c
7	+++ 2/mount/mount.c
8	@@ -665,6 +665,25 @@
9	else {
10	mntFILE *mfp;
11
12	+ /* when moving a mount point, we have to make sure the mtab
13	+ * gets updated properly. We get info about the old mount
14	+ * point, copy it to the new mount point, and then delete
15	+ * the old mount point. */
16	+ if (flags & MS_MOVE) {
17	+ const char *olddir = mnt.mnt_fsname;
18	+ struct mntentchn *oldmc = oldmc = getmntfile(olddir);
19	+ if (oldmc != NULL) {
20	+ mnt.mnt_fsname = xstrdup(oldmc->m.mnt_fsname);
21	+ mnt.mnt_type = oldmc->m.mnt_type;
22	+ mnt.mnt_opts = oldmc->m.mnt_opts;
23	+ mnt.mnt_freq = oldmc->m.mnt_freq;
24	+ mnt.mnt_passno = oldmc->m.mnt_passno;
25	+ }
26	+ update_mtab(olddir, NULL);
27	+ if (oldmc != NULL)
28	+ my_free(olddir);
29	+ }
30	+
31	lock_mtab();
32	mfp = my_setmntent(MOUNTED, "a+");
33	if (mfp == NULL \|\| mfp->mntent_fp == NULL) {