aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2017-01-30 19:21:12 +0100
committerDenys Vlasenko <vda.linux@googlemail.com>2017-01-30 19:21:12 +0100
commitca659f84b20ae63e0d11d9b1bfa2f9d610e05faa (patch)
tree1352000ff45f5b0cc50752ab7a0fc1a4ff827492
parent065e988e7ae66b3f36d280ed6ca580e29cb6358d (diff)
downloadbusybox-w32-ca659f84b20ae63e0d11d9b1bfa2f9d610e05faa.tar.gz
busybox-w32-ca659f84b20ae63e0d11d9b1bfa2f9d610e05faa.tar.bz2
busybox-w32-ca659f84b20ae63e0d11d9b1bfa2f9d610e05faa.zip
modprobe-small: fix --help texts, they are from "big" modutils
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--modutils/lsmod.c2
-rw-r--r--modutils/modprobe-small.c37
2 files changed, 8 insertions, 31 deletions
diff --git a/modutils/lsmod.c b/modutils/lsmod.c
index 24589420a..9ab49f35b 100644
--- a/modutils/lsmod.c
+++ b/modutils/lsmod.c
@@ -34,7 +34,7 @@
34//usage:#define lsmod_trivial_usage 34//usage:#define lsmod_trivial_usage
35//usage: "" 35//usage: ""
36//usage:#define lsmod_full_usage "\n\n" 36//usage:#define lsmod_full_usage "\n\n"
37//usage: "List the currently loaded kernel modules" 37//usage: "List loaded kernel modules"
38//usage:#endif 38//usage:#endif
39 39
40#include "libbb.h" 40#include "libbb.h"
diff --git a/modutils/modprobe-small.c b/modutils/modprobe-small.c
index e44feeefa..49c06d759 100644
--- a/modutils/modprobe-small.c
+++ b/modutils/modprobe-small.c
@@ -893,46 +893,23 @@ The following options are useful for people managing distributions:
893//usage:#define lsmod_trivial_usage 893//usage:#define lsmod_trivial_usage
894//usage: "" 894//usage: ""
895//usage:#define lsmod_full_usage "\n\n" 895//usage:#define lsmod_full_usage "\n\n"
896//usage: "List the currently loaded kernel modules" 896//usage: "List loaded kernel modules"
897 897
898//usage:#define insmod_trivial_usage 898//usage:#define insmod_trivial_usage
899//usage: IF_FEATURE_2_4_MODULES("[OPTIONS] MODULE ") 899//usage: "FILE" IF_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE(" [SYMBOL=VALUE]...")
900//usage: IF_NOT_FEATURE_2_4_MODULES("FILE ")
901//usage: "[SYMBOL=VALUE]..."
902//usage:#define insmod_full_usage "\n\n" 900//usage:#define insmod_full_usage "\n\n"
903//usage: "Load kernel module" 901//usage: "Load kernel module"
904//usage: IF_FEATURE_2_4_MODULES( "\n"
905//usage: "\n -f Force module to load into the wrong kernel version"
906//usage: "\n -k Make module autoclean-able"
907//usage: "\n -v Verbose"
908//usage: "\n -q Quiet"
909//usage: "\n -L Lock: prevent simultaneous loads"
910//usage: IF_FEATURE_INSMOD_LOAD_MAP(
911//usage: "\n -m Output load map to stdout"
912//usage: )
913//usage: "\n -x Don't export externs"
914//usage: )
915 902
916//usage:#define rmmod_trivial_usage 903//usage:#define rmmod_trivial_usage
917//usage: "[-wfa] [MODULE]..." 904//usage: "MODULE..."
918//usage:#define rmmod_full_usage "\n\n" 905//usage:#define rmmod_full_usage "\n\n"
919//usage: "Unload kernel modules\n" 906//usage: "Unload kernel modules"
920//usage: "\n -w Wait until the module is no longer used"
921//usage: "\n -f Force unload"
922//usage: "\n -a Remove all unused modules (recursively)"
923//usage:
924//usage:#define rmmod_example_usage
925//usage: "$ rmmod tulip\n"
926 907
927//usage:#define modprobe_trivial_usage 908//usage:#define modprobe_trivial_usage
928//usage: "[-qfwrsv] MODULE [SYMBOL=VALUE]..." 909//usage: "[-rq] MODULE" IF_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE(" [SYMBOL=VALUE]...")
929//usage:#define modprobe_full_usage "\n\n" 910//usage:#define modprobe_full_usage "\n\n"
930//usage: " -r Remove MODULE (stacks) or do autoclean" 911//usage: " -r Remove MODULE"
931//usage: "\n -q Quiet" 912//usage: "\n -q Quiet"
932//usage: "\n -v Verbose"
933//usage: "\n -f Force"
934//usage: "\n -w Wait for unload"
935//usage: "\n -s Report via syslog instead of stderr"
936 913
937//usage:#endif 914//usage:#endif
938 915
@@ -964,7 +941,7 @@ int modprobe_main(int argc UNUSED_PARAM, char **argv)
964 941
965 /* depmod? */ 942 /* depmod? */
966 if ((MOD_APPLET_CNT == 2 && ENABLE_DEPMOD && ENABLE_LSMOD) 943 if ((MOD_APPLET_CNT == 2 && ENABLE_DEPMOD && ENABLE_LSMOD)
967 /* ^^^^only depmod and lsmod is configured^^^^^^^^^^^^^^^ */ 944 /* ^^^"only depmod and lsmod is configured"^^^^^^^^^^^^^^ */
968 /* note: we already know here it is not lsmod (handled before) */ 945 /* note: we already know here it is not lsmod (handled before) */
969 || is_depmod 946 || is_depmod
970 ) { 947 ) {