Fix the exit status of umount -a, a casualty of the TRUE/FALSE normalization.

Thanks to Francois-R Boyer <boyerf@IRO.UMontreal.CA> for the report.


git-svn-id: svn://busybox.net/trunk/busybox@1599 69ca8d6d-28ef-0310-b511-8ec308f3f277

2 files changed, 8 insertions, 8 deletions

diff --git a/umount.c b/umount.c
index 0867118c0..40d25f90a 100644
--- a/umount.c
+++ b/umount.c
@@ -212,18 +212,18 @@ static int umount_all(int useMtab)
                 /* Never umount /proc on a umount -a */
                 if (strstr(mountpt, "proc")!= NULL)
                         continue;
-                status = do_umount(mountpt, useMtab);
-                if (status != 0) {
+                if (!do_umount(mountpt, useMtab)) {
                         /* Don't bother retrying the umount on busy devices */
                         if (errno == EBUSY) {
                                 perror_msg("%s", mountpt);
+                                status = FALSE;
                                 continue;
                         }
-                        status = do_umount(mountpt, useMtab);
-                        if (status != 0) {
+                        if (!do_umount(mountpt, useMtab)) {
                                 printf("Couldn't umount %s on %s: %s\n",
                                            mountpt, mtab_getinfo(mountpt, MTAB_GETDEVICE),
                                            strerror(errno));
+                                status = FALSE;
                         }
                 }
         }
diff --git a/util-linux/umount.c b/util-linux/umount.c
index 0867118c0..40d25f90a 100644
--- a/util-linux/umount.c
+++ b/util-linux/umount.c
@@ -212,18 +212,18 @@ static int umount_all(int useMtab)
                 /* Never umount /proc on a umount -a */
                 if (strstr(mountpt, "proc")!= NULL)
                         continue;
-                status = do_umount(mountpt, useMtab);
-                if (status != 0) {
+                if (!do_umount(mountpt, useMtab)) {
                         /* Don't bother retrying the umount on busy devices */
                         if (errno == EBUSY) {
                                 perror_msg("%s", mountpt);
+                                status = FALSE;
                                 continue;
                         }
-                        status = do_umount(mountpt, useMtab);
-                        if (status != 0) {
+                        if (!do_umount(mountpt, useMtab)) {
                                 printf("Couldn't umount %s on %s: %s\n",
                                            mountpt, mtab_getinfo(mountpt, MTAB_GETDEVICE),
                                            strerror(errno));
+                                status = FALSE;
                         }
                 }
         }