aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernhard Reutner-Fischer <rep.dot.nop@gmail.com>2006-05-19 10:45:16 +0000
committerBernhard Reutner-Fischer <rep.dot.nop@gmail.com>2006-05-19 10:45:16 +0000
commit1de534114f26a385487f98707abd609f5ab84bac (patch)
tree4fa797323c28d50c541f505181a3ab64c3aa2bff
parent0e37af831d707494a86111755a3530b707d1035c (diff)
downloadbusybox-w32-1de534114f26a385487f98707abd609f5ab84bac.tar.gz
busybox-w32-1de534114f26a385487f98707abd609f5ab84bac.tar.bz2
busybox-w32-1de534114f26a385487f98707abd609f5ab84bac.zip
Patch from Jason Schoon to make mount -a not abort on the first failure.
(r15005 from trunk)
-rw-r--r--util-linux/mount.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/util-linux/mount.c b/util-linux/mount.c
index 68f483555..61ceba829 100644
--- a/util-linux/mount.c
+++ b/util-linux/mount.c
@@ -533,11 +533,13 @@ int mount_main(int argc, char **argv)
533 533
534 // Mount this thing. 534 // Mount this thing.
535 535
536 rc = singlemount(mtcur); 536 if (singlemount(mtcur)) {
537 if (rc) {
538 // Don't whine about already mounted fs when mounting all. 537 // Don't whine about already mounted fs when mounting all.
539 if (errno == EBUSY) rc = 0; 538 // Note: we should probably change return value to indicate
540 else break; 539 // failure, without causing a duplicate error message.
540 if (errno != EBUSY) bb_perror_msg("Mounting %s on %s failed",
541 mtcur->mnt_fsname, mtcur->mnt_dir);
542 rc = 0;
541 } 543 }
542 } 544 }
543 } 545 }