svn commit: branches/busybox_1_1_stable/util-linux

aldot at busybox.net aldot at busybox.net
Fri May 19 10:45:18 UTC 2006


Author: aldot
Date: 2006-05-19 03:45:16 -0700 (Fri, 19 May 2006)
New Revision: 15112

Log:
Patch from Jason Schoon to make mount -a not abort on the first failure.
(r15005 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-05-19 10:43:32 UTC (rev 15111)
+++ branches/busybox_1_1_stable/util-linux/mount.c	2006-05-19 10:45:16 UTC (rev 15112)
@@ -533,11 +533,13 @@
 
 			// Mount this thing.
 
-			rc = singlemount(mtcur);
-			if (rc) {
+			if (singlemount(mtcur)) {
 				// Don't whine about already mounted fs when mounting all.
-				if (errno == EBUSY) rc = 0;
-				else break;
+				// Note: we should probably change return value to indicate 
+				// failure, without causing a duplicate error message.
+				if (errno != EBUSY) bb_perror_msg("Mounting %s on %s failed",
+						mtcur->mnt_fsname, mtcur->mnt_dir);
+				rc = 0;
 			}
 		}
 	}




More information about the busybox-cvs mailing list