svn commit: trunk/busybox/util-linux

[landley at busybox.net]

Author: landley
Date: 2006-05-05 08:01:38 -0700 (Fri, 05 May 2006)
New Revision: 15005

Log:
Patch from Jason Schoon to make mount -a not abort on the first failure.


Modified:
   trunk/busybox/util-linux/mount.c


Changeset:
Modified: trunk/busybox/util-linux/mount.c
===================================================================
--- trunk/busybox/util-linux/mount.c	2006-05-05 14:05:21 UTC (rev 15004)
+++ trunk/busybox/util-linux/mount.c	2006-05-05 15:01:38 UTC (rev 15005)
@@ -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;
 			}
 		}
 	}