[git commit] modprobe: when reading modules.builtin, use basenames of files from it

Denys Vlasenko vda.linux at googlemail.com
Tue Jun 29 22:49:24 UTC 2021


commit: https://git.busybox.net/busybox/commit/?id=f99800758e24ff159808ca0b44064f548ed77a26
branch: https://git.busybox.net/busybox/commit/?id=refs/heads/master

function                                             old     new   delta
modprobe_main                                        798     803      +5

Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
---
 modutils/modprobe.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modutils/modprobe.c b/modutils/modprobe.c
index c334186b8..235706fd5 100644
--- a/modutils/modprobe.c
+++ b/modutils/modprobe.c
@@ -629,8 +629,9 @@ int modprobe_main(int argc UNUSED_PARAM, char **argv)
 		config_close(parser);
 
 		parser = config_open2("modules.builtin", fopen_for_read);
+		/* this file contains lines like "kernel/fs/binfmt_script.ko" */
 		while (config_read(parser, &s, 1, 1, "# \t", PARSE_NORMAL))
-			get_or_add_modentry(s)->flags |= MODULE_FLAG_BUILTIN;
+			get_or_add_modentry(bb_basename(s))->flags |= MODULE_FLAG_BUILTIN;
 		config_close(parser);
 	}
 


More information about the busybox-cvs mailing list