[git commit] modprobe: fix modprobe -r and parsing of /etc/modprobe.d

Denys Vlasenko vda.linux at googlemail.com
Mon Jan 19 18:15:24 UTC 2015


commit: http://git.busybox.net/busybox/commit/?id=9de69c024c7c47f3f8733dbc7c9522966fcd73a9
branch: http://git.busybox.net/busybox/commit/?id=refs/heads/master

This fixes a regression introduced with commit 78854520 (modprobe:
revert checking for /, stop doing basename() on modprobe args,
2015-01-01) that broke modprobe options stored in /etc/modprobe.conf and
/etc/modprobe.d/*.conf.

This also fixes modprobe -r

Signed-off-by: Natanael Copa <ncopa at alpinelinux.org>
Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
---
 modutils/modprobe.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/modutils/modprobe.c b/modutils/modprobe.c
index ce8b0b8..0e8aa9e 100644
--- a/modutils/modprobe.c
+++ b/modutils/modprobe.c
@@ -425,7 +425,7 @@ static int do_modprobe(struct module_entry *m)
 
 		rc = 0;
 		fn = llist_pop(&m->deps); /* we leak it */
-		m2 = get_or_add_modentry(fn);
+		m2 = get_or_add_modentry(bb_get_last_path_component_nostrip(fn));
 
 		if (option_mask32 & OPT_REMOVE) {
 			/* modprobe -r */


More information about the busybox-cvs mailing list