From: Karel Zak <kzak@redhat.com>
Date: Wed, 17 Aug 2011 14:40:05 +0000 (+0200)
Subject: losetup: allow to use --verbose with --all
X-Git-Tag: v2.20~34
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b71e4c30b653094755b3f272aea96d237f53c5ae;p=thirdparty%2Futil-linux.git

losetup: allow to use --verbose with --all

Reported-by: Bernhard Voelker <mail@bernhard-voelker.de>
Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/mount/lomount.c b/mount/lomount.c
index 7570137346..34d151ac14 100644
--- a/mount/lomount.c
+++ b/mount/lomount.c
@@ -1134,7 +1134,8 @@ main(int argc, char **argv) {
 		if (capacity || all || assoc || argc < optind || argc > optind+1)
 			usage(stderr);
 	} else if (all) {
-		if (argc > 2)
+		/* only -v is allowed */
+		if ((argc == 3 && verbose == 0) || argc > 3)
 			usage(stderr);
 	} else if (assoc) {
 		if (capacity || encryption || showdev || passfd || ro)