From: Gustavo Sverzut Barbieri <barbieri@profusion.mobi>
Date: Sun, 8 Jan 2012 15:58:28 +0000 (-0200)
Subject: modprobe: show is independent from verbose level.
X-Git-Tag: v4~76
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=525fa07b8fc2544c57a5ff27ce3a36bc5c1202c3;p=thirdparty%2Fkmod.git

modprobe: show is independent from verbose level.

"modprobe --quiet --show-depends" now works.
---

diff --git a/tools/kmod-modprobe.c b/tools/kmod-modprobe.c
index 6ca94f29..eaf9346a 100644
--- a/tools/kmod-modprobe.c
+++ b/tools/kmod-modprobe.c
@@ -36,6 +36,7 @@ static int use_syslog = 0;
 
 #define DEFAULT_VERBOSE LOG_WARNING
 static int verbose = DEFAULT_VERBOSE;
+static int do_show = 0;
 static int dry_run = 0;
 static int ignore_loaded = 0;
 static int lookup_only = 0;
@@ -141,7 +142,7 @@ static inline void _show(const char *fmt, ...)
 {
 	va_list args;
 
-	if (verbose <= DEFAULT_VERBOSE)
+	if (!do_show && verbose <= DEFAULT_VERBOSE)
 		return;
 
 	va_start(args, fmt);
@@ -1162,7 +1163,7 @@ static int do_modprobe(int argc, char **orig_argv)
 		case 'D':
 			ignore_loaded = 1;
 			dry_run = 1;
-			verbose++;
+			do_show = 1;
 			break;
 		case 'c':
 			do_show_config = 1;