Bug#574584: module-init-tools: modprobe is too chatty with parse_toplevel_config and parse_kcmdline

[md@xxxxxxxx (Marco d'Itri)]

Please advise.

----- Forwarded message from Chung-chieh Shan <ken@xxxxxxxxxxxxxxxxxxx> -----

Subject: Bug#574584: module-init-tools: modprobe is too chatty with
	parse_toplevel_config and parse_kcmdline
Reply-To: Chung-chieh Shan <ken@xxxxxxxxxxxxxxxxxxx>,
	574584@xxxxxxxxxxxxxxx
From: Chung-chieh Shan <ken@xxxxxxxxxxxxxxxxxxx>
To: Debian Bug Tracking System <submit@xxxxxxxxxxxxxxx>

Package: module-init-tools
Version: 3.12~pre2-1
Severity: normal
Tags: patch

After I added "i915.modeset=1" to my kernel cmdline today, modprobe
started printing "options i915 modeset=1" to stdout whenever it is
invoked (even just to add or remove a non-existent module, add an
already-loaded module, or remove a never-loaded module).  Further
investigation revealed that "modprobe -c" repeats the first few hundred
lines of its config output.  I am not so familiar with the internals
of modprobe, but perhaps the following patch is the right fix to both
problems?

--- modprobe.c.orig	2010-03-10 00:51:56.000000000 -0800
+++ modprobe.c	2010-03-18 23:35:08.000000000 -0700
@@ -1894,7 +1894,7 @@
 	parse_toplevel_config(configname, &conf, dump_config, flags & mit_remove);
 
 	/* Read module options from kernel command line */
-	parse_kcmdline(1, &conf.options);
+	parse_kcmdline(dump_config, &conf.options);
 	
 	if (dump_config) {
 		char *aliasfilename, *symfilename;
@@ -1903,9 +1903,6 @@
 		nofail_asprintf(&aliasfilename, "%s/modules.alias", dirname);
 		nofail_asprintf(&symfilename, "%s/modules.symbols", dirname);
 
-		parse_toplevel_config(configname, &conf, 1, 0);
-		/* Read module options from kernel command line */
-		parse_kcmdline(1, &conf.options);
 		read_aliases(aliasfilename, "", 1, &conf.aliases);
 		read_aliases(symfilename, "", 1, &conf.aliases);
 
----- End forwarded message -----

-- 
ciao,
Marco
--
To unsubscribe from this list: send the line "unsubscribe linux-modules" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html