From 9de69c024c7c47f3f8733dbc7c9522966fcd73a9 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Fri, 16 Jan 2015 13:53:05 +0100 Subject: modprobe: fix modprobe -r and parsing of /etc/modprobe.d 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 Signed-off-by: Denys Vlasenko --- modutils/modprobe.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 */ -- cgit v1.1