svn commit: branches/busybox_1_1_stable/util-linux

aldot at busybox.net aldot at busybox.net
Tue Apr 4 08:24:00 UTC 2006


Author: aldot
Date: 2006-04-04 01:23:59 -0700 (Tue, 04 Apr 2006)
New Revision: 14742

Log:
- fix one-argument mount in cases where fstab or mtab contain overlapping
  entries.  (Such as "mount -o remount,rw /" where you're not on rootfs.).
  (r14723 from trunk)


Modified:
   branches/busybox_1_1_stable/util-linux/mount.c


Changeset:
Modified: branches/busybox_1_1_stable/util-linux/mount.c
===================================================================
--- branches/busybox_1_1_stable/util-linux/mount.c	2006-04-04 08:21:36 UTC (rev 14741)
+++ branches/busybox_1_1_stable/util-linux/mount.c	2006-04-04 08:23:59 UTC (rev 14742)
@@ -477,8 +477,9 @@
 
 		// Get next fstab entry
 
-		if (!getmntent_r(fstab, mtcur, bb_common_bufsiz1,
-					sizeof(bb_common_bufsiz1)))
+		if (!getmntent_r(fstab, mtcur, bb_common_bufsiz1
+					+ (mtcur==mtpair ? sizeof(bb_common_bufsiz1)/2 : 0),
+				sizeof(bb_common_bufsiz1)/2))
 		{
 			// Were we looking for something specific?
 




More information about the busybox-cvs mailing list