On 5/21/09, Andreas Robinson <[email protected]> wrote: > > Also remove fake placeholder modules in the test suite > e.g "echo Test > foo.ko && modprobe foo". > They don't work anymore. > > Signed-off-by: Andreas Robinson <[email protected]> > --- > modprobe.c | 16 ---------------- > tests/test-modprobe-indexed/10alias.sh | 9 +++++---- > tests/test-modprobe/10alias.sh | 9 +++++---- > tests/test-modprobe/26blacklist.sh | 7 ++++--- > 4 files changed, 14 insertions(+), 27 deletions(-) > > diff --git a/modprobe.c b/modprobe.c > index 4cb7397..9c7eda8 100644 > --- a/modprobe.c > +++ b/modprobe.c > @@ -668,21 +668,6 @@ static int insmod(struct list_head *list, > > module = grab_elf_file_fd(mod->filename, fd); > if (!module) { > - /* This is an ugly hack that maintains the logic where > - * init_module() sets errno = ENOEXEC if the file is > - * not an ELF object. > - */ > - if (errno == ENOEXEC) { > - struct stat st; > - optstring = add_extra_options(mod->modname, > - optstring, options); > - if (dry_run) > - goto out; > - fstat(fd, &st); > - ret = init_module(NULL, st.st_size, optstring); > - goto out_hack; > - } > - > error("Could not read '%s': %s\n", > mod->filename, strerror(errno));
This will change the error message to something less helpful. You should probably use insert_moderror() instead of strerror(). Thanks Alan -- To unsubscribe from this list: send the line "unsubscribe linux-modules" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
