summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2010-01-10 03:52:45 (GMT)
committer Denys Vlasenko <vda.linux@googlemail.com>2010-01-10 03:52:45 (GMT)
commit725b5a387a392f6282756c649adf411e30535eb5 (patch)
treefd9bdbb6f0e5cb4f1b0370d14b6814b3acc40279
parent38d3e64d2593aa5bc6bb578e1cd9a73a2d4b26fa (diff)
downloadbusybox-725b5a387a392f6282756c649adf411e30535eb5.tar.gz
busybox-725b5a387a392f6282756c649adf411e30535eb5.tar.bz2
modprobe: it's not an error if module is already loaded. Closes bug 833
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--modutils/modprobe.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/modutils/modprobe.c b/modutils/modprobe.c
index ca85ee7..2860ae0 100644
--- a/modutils/modprobe.c
+++ b/modutils/modprobe.c
@@ -290,6 +290,8 @@ static int do_modprobe(struct module_entry *m)
options = gather_options_str(options, G.cmdline_mopts);
rc = bb_init_module(fn, options);
DBG("loaded %s '%s', rc:%d", fn, options, rc);
+ if (rc == EEXIST)
+ rc = 0;
free(options);
if (rc) {
bb_error_msg("failed to load module %s (%s): %s",