Sophie

Sophie

distrib > Mandriva > 2009.0 > x86_64 > media > main-testing-src > by-pkgid > 42621e9898b3e141ab282b54b77813f8 > files > 14

module-init-tools-3.5-2mdv2009.0.src.rpm

Index: module-init-tools-3.5/modprobe.c
===================================================================
--- module-init-tools-3.5.orig/modprobe.c
+++ module-init-tools-3.5/modprobe.c
@@ -1075,6 +1075,8 @@ static void handle_module(const char *mo
 		       strip_modversion, cmdline_opts);
 }
 
+#define PREFERRED_ALIASES "/lib/module-init-tools/ldetect-lst-modules.alias"
+
 static struct option options[] = { { "verbose", 0, NULL, 'v' },
 				   { "version", 0, NULL, 'V' },
 				   { "config", 1, NULL, 'C' },
@@ -1302,6 +1304,8 @@ int main(int argc, char *argv[])
 		read_toplevel_config(config, "", 1, 0,
 			     &modoptions, &commands, &aliases, &blacklist);
 		read_kcmdline(1, &modoptions);
+		read_config(PREFERRED_ALIASES, "", 1, 0,&modoptions, &commands,
+			    &aliases, &blacklist);
 		if (use_binary_indexes) {
 			read_config_file_bin(aliasfilename, "", 1, 0,
 			     &modoptions, &commands, &aliases, &blacklist);
@@ -1368,6 +1372,11 @@ int main(int argc, char *argv[])
 			if (list_empty(&list)
 			    && !find_command(modulearg, commands))
 			{
+				read_config(PREFERRED_ALIASES, modulearg, 0,
+					    remove, &modoptions, &commands,
+					    &aliases, &blacklist);
+				aliases = apply_blacklist(aliases, blacklist);
+
 				if (use_binary_indexes)
 					read_config_file_bin(aliasfilename,
 						modulearg, 0, remove,