diff options
author | Lauri Kasanen <curaga@operamail.com> | 2010-07-08 11:22:30 +0300 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2010-07-10 01:27:03 +0200 |
commit | a48a29f921d9d50598784047b40c97c6850bb8ec (patch) | |
tree | a05a2000bb897a26fb80e1cb3f6d3b9be2a2c995 | |
parent | 32a6baeefaf040fb04fee7be3ea7c6e60b95f5bd (diff) | |
download | busybox-w32-a48a29f921d9d50598784047b40c97c6850bb8ec.tar.gz busybox-w32-a48a29f921d9d50598784047b40c97c6850bb8ec.tar.bz2 busybox-w32-a48a29f921d9d50598784047b40c97c6850bb8ec.zip |
Modprobe: Make -l open the right file
Before: modprobe -l
modules.dep not found
No size change, just moved the chdir.
Signed-off-by: Lauri Kasanen <curaga@operamail.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r-- | modutils/modprobe.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/modutils/modprobe.c b/modutils/modprobe.c index b4de65b1f..0a9424293 100644 --- a/modutils/modprobe.c +++ b/modutils/modprobe.c | |||
@@ -483,6 +483,11 @@ int modprobe_main(int argc UNUSED_PARAM, char **argv) | |||
483 | opt = getopt32(argv, INSMOD_OPTS MODPROBE_OPTS INSMOD_ARGS); | 483 | opt = getopt32(argv, INSMOD_OPTS MODPROBE_OPTS INSMOD_ARGS); |
484 | argv += optind; | 484 | argv += optind; |
485 | 485 | ||
486 | /* Goto modules location */ | ||
487 | xchdir(CONFIG_DEFAULT_MODULES_DIR); | ||
488 | uname(&uts); | ||
489 | xchdir(uts.release); | ||
490 | |||
486 | if (opt & MODPROBE_OPT_LIST_ONLY) { | 491 | if (opt & MODPROBE_OPT_LIST_ONLY) { |
487 | char name[MODULE_NAME_LEN]; | 492 | char name[MODULE_NAME_LEN]; |
488 | char *colon, *tokens[2]; | 493 | char *colon, *tokens[2]; |
@@ -524,11 +529,6 @@ int modprobe_main(int argc UNUSED_PARAM, char **argv) | |||
524 | return EXIT_SUCCESS; | 529 | return EXIT_SUCCESS; |
525 | } | 530 | } |
526 | 531 | ||
527 | /* Goto modules location */ | ||
528 | xchdir(CONFIG_DEFAULT_MODULES_DIR); | ||
529 | uname(&uts); | ||
530 | xchdir(uts.release); | ||
531 | |||
532 | /* Retrieve module names of already loaded modules */ | 532 | /* Retrieve module names of already loaded modules */ |
533 | { | 533 | { |
534 | char *s; | 534 | char *s; |