[git commit master] modprobe: it's not an error if module is already loaded. Closes bug 833

Denys Vlasenko vda.linux at googlemail.com
Sun Jan 10 03:52:45 UTC 2010


commit: http://git.busybox.net/busybox/commit/?id=725b5a387a392f6282756c649adf411e30535eb5
branch: http://git.busybox.net/busybox/commit/?id=refs/heads/master

Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
---
 modutils/modprobe.c |    2 ++
 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",
-- 
1.6.3.3



More information about the busybox-cvs mailing list