From: Karel Zak <kzak@redhat.com>
Date: Mon, 7 Apr 2014 09:59:30 +0000 (+0200)
Subject: umount: more robust success message for --all
X-Git-Tag: v2.25-rc1~317
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0ce2fe873817a75494afe1d78bf85e74ca4cd8ab;p=thirdparty%2Futil-linux.git

umount: more robust success message for --all

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/sys-utils/umount.c b/sys-utils/umount.c
index fe120dbaa1..188a53adbc 100644
--- a/sys-utils/umount.c
+++ b/sys-utils/umount.c
@@ -281,10 +281,12 @@ static int umount_all(struct libmnt_context *cxt)
 			if (mnt_context_is_verbose(cxt))
 				printf(_("%-25s: ignored\n"), tgt);
 		} else {
-			rc |= mk_exit_code(cxt, mntrc);
+			int xrc = mk_exit_code(cxt, mntrc);
 
-			if (mnt_context_is_verbose(cxt))
+			if (xrc == MOUNT_EX_SUCCESS
+			    && mnt_context_is_verbose(cxt))
 				printf("%-25s: successfully unmounted\n", tgt);
+			rc |= xrc;
 		}
 	}