aboutsummaryrefslogtreecommitdiff
path: root/modutils
diff options
context:
space:
mode:
authorGravatar Natanael Copa <ncopa@alpinelinux.org>2015-01-16 13:53:05 +0100
committerGravatar Denys Vlasenko <vda.linux@googlemail.com>2015-01-19 19:15:24 +0100
commit9de69c024c7c47f3f8733dbc7c9522966fcd73a9 (patch)
treeacd7ebbcc1c1131cd1c5aabb81ce8a743bbf7123 /modutils
parent76b2262b9b911e1741b9b6d04ed15fcf076b8d2d (diff)
downloadbusybox-9de69c024c7c47f3f8733dbc7c9522966fcd73a9.tar.gz
busybox-9de69c024c7c47f3f8733dbc7c9522966fcd73a9.tar.bz2
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 <ncopa@alpinelinux.org> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'modutils')
-rw-r--r--modutils/modprobe.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/modutils/modprobe.c b/modutils/modprobe.c
index ce8b0b886..0e8aa9e85 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 */