[git commit master 1/1] Modprobe: Make -l open the right file

Denys Vlasenko vda.linux at googlemail.com
Fri Jul 9 23:27:03 UTC 2010


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

Before: modprobe -l
modules.dep not found

No size change, just moved the chdir.

Signed-off-by: Lauri Kasanen <curaga at operamail.com>
Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
---
 modutils/modprobe.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/modutils/modprobe.c b/modutils/modprobe.c
index b4de65b..0a94242 100644
--- a/modutils/modprobe.c
+++ b/modutils/modprobe.c
@@ -483,6 +483,11 @@ int modprobe_main(int argc UNUSED_PARAM, char **argv)
 	opt = getopt32(argv, INSMOD_OPTS MODPROBE_OPTS INSMOD_ARGS);
 	argv += optind;
 
+	/* Goto modules location */
+	xchdir(CONFIG_DEFAULT_MODULES_DIR);
+	uname(&uts);
+	xchdir(uts.release);
+
 	if (opt & MODPROBE_OPT_LIST_ONLY) {
 		char name[MODULE_NAME_LEN];
 		char *colon, *tokens[2];
@@ -524,11 +529,6 @@ int modprobe_main(int argc UNUSED_PARAM, char **argv)
 		return EXIT_SUCCESS;
 	}
 
-	/* Goto modules location */
-	xchdir(CONFIG_DEFAULT_MODULES_DIR);
-	uname(&uts);
-	xchdir(uts.release);
-
 	/* Retrieve module names of already loaded modules */
 	{
 		char *s;
-- 
1.7.1



More information about the busybox-cvs mailing list