projects
/
oweals
/
busybox.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
38d3e64
)
modprobe: it's not an error if module is already loaded. Closes bug 833
author
Denys Vlasenko
<vda.linux@googlemail.com>
Sun, 10 Jan 2010 03:52:45 +0000
(
04:52
+0100)
committer
Denys Vlasenko
<vda.linux@googlemail.com>
Sun, 10 Jan 2010 03:52:45 +0000
(
04:52
+0100)
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
modutils/modprobe.c
patch
|
blob
|
history
diff --git
a/modutils/modprobe.c
b/modutils/modprobe.c
index ca85ee76ba55ceb317b2b5a89a753da7fe85f260..2860ae05ddfe107fcbc99bab40110e38e90f3558 100644
(file)
--- 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",