diff options
| author | Rob Landley <rob@landley.net> | 2006-05-05 15:01:38 +0000 |
|---|---|---|
| committer | Rob Landley <rob@landley.net> | 2006-05-05 15:01:38 +0000 |
| commit | 49159c7f9491c9e5ce300301b79f25db4bd017c7 (patch) | |
| tree | cf277b2e68988106c5f3387c2beeabad8d7470cf /util-linux/mount.c | |
| parent | 0e413e53e9d77191ae3fd9663e5a90e906711fa6 (diff) | |
| download | busybox-w32-49159c7f9491c9e5ce300301b79f25db4bd017c7.tar.gz busybox-w32-49159c7f9491c9e5ce300301b79f25db4bd017c7.tar.bz2 busybox-w32-49159c7f9491c9e5ce300301b79f25db4bd017c7.zip | |
Patch from Jason Schoon to make mount -a not abort on the first failure.
Diffstat (limited to 'util-linux/mount.c')
| -rw-r--r-- | util-linux/mount.c | 10 |
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 | } |