aboutsummaryrefslogtreecommitdiff
path: root/util-linux
diff options
context:
space:
mode:
authorGravatar Rob Landley <rob@landley.net>2006-05-05 15:01:38 +0000
committerGravatar Rob Landley <rob@landley.net>2006-05-05 15:01:38 +0000
commit49159c7f9491c9e5ce300301b79f25db4bd017c7 (patch)
treecf277b2e68988106c5f3387c2beeabad8d7470cf /util-linux
parent0e413e53e9d77191ae3fd9663e5a90e906711fa6 (diff)
downloadbusybox-49159c7f9491c9e5ce300301b79f25db4bd017c7.tar.gz
busybox-49159c7f9491c9e5ce300301b79f25db4bd017c7.tar.bz2
Patch from Jason Schoon to make mount -a not abort on the first failure.
Diffstat (limited to 'util-linux')
-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)
// 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;
}
}
}