summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernhard Reutner-Fischer2006-05-19 10:45:16 +0000
committerBernhard Reutner-Fischer2006-05-19 10:45:16 +0000
commit1de534114f26a385487f98707abd609f5ab84bac (patch)
tree4fa797323c28d50c541f505181a3ab64c3aa2bff
parent0e37af831d707494a86111755a3530b707d1035c (diff)
downloadbusybox-1de534114f26a385487f98707abd609f5ab84bac.zip
busybox-1de534114f26a385487f98707abd609f5ab84bac.tar.gz
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 68f4835..61ceba8 100644
--- a/util-linux/mount.c
+++ b/util-linux/mount.c
@@ -533,11 +533,13 @@ int mount_main(int argc, char **argv)
// 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;
}
}
}