aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlan Jenkins <alan-jenkins@tuffmail.co.uk>2010-03-16 14:55:50 +0000
committerAlan Jenkins <alan-jenkins@tuffmail.co.uk>2010-03-17 10:24:57 +0000
commited058af3b963c5cf404b8a589d0a3058cf8b9b28 (patch)
treef57b3fd3453345c43d57abde12c4cdcea5c926a3
parent30df3f6e68487c877af9ce71cb1d932480f9cddd (diff)
downloadmodule-init-tools-ed058af3b963c5cf404b8a589d0a3058cf8b9b28.tar.gz
modprobe: remove some redundant softdep code
If we can't find a module, we don't need to check for a softdep. The initial softdep design allowed you to define "fake" modules, in the same way as with install commands. But we decided this had only bad effects, so the feature was removed.
-rw-r--r--modprobe.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/modprobe.c b/modprobe.c
index 6f2a532..b4424ed 100644
--- a/modprobe.c
+++ b/modprobe.c
@@ -1532,19 +1532,11 @@ static int handle_module(const char *modname,
modprobe_flags_t flags)
{
if (list_empty(todo_list)) {
- const struct module_softdep *softdep;
const char *command;
/* The dependencies have to be real modules, but
handle case where the first is completely bogus. */
- softdep = find_softdep(modname, conf->softdeps);
- if (softdep && !(flags & mit_ignore_commands)) {
- do_softdep(softdep, cmdline_opts, conf, dirname,
- error, flags & (mit_remove | mit_dry_run));
- return 0;
- }
-
command = find_command(modname, conf->commands);
if (command && !(flags & mit_ignore_commands)) {
do_command(modname, command, flags & mit_dry_run, error,