diff options
author | Denys Vlasenko | 2009-09-07 12:44:56 +0200 |
---|---|---|
committer | Denys Vlasenko | 2009-09-07 12:44:56 +0200 |
commit | 40c221334fca24acca35f372aef18c0c768c86cc (patch) | |
tree | a6e11e6bb521c04875b01486f6d2aabdc4896939 /include/usage.h | |
parent | 3de3f57c6d0200b49a5e31e80421e36272035e15 (diff) | |
parent | 0c6914e50c913b54632b7279dbe3544ca7e633d0 (diff) | |
download | busybox-40c221334fca24acca35f372aef18c0c768c86cc.zip busybox-40c221334fca24acca35f372aef18c0c768c86cc.tar.gz |
Merge branch 'master' of git+ssh://vda@busybox.net/var/lib/git/busybox
Diffstat (limited to 'include/usage.h')
-rw-r--r-- | include/usage.h | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/include/usage.h b/include/usage.h index e571d2b..036cf9d 100644 --- a/include/usage.h +++ b/include/usage.h @@ -2824,9 +2824,21 @@ "-rw------- 1 andersen andersen 0 Apr 25 17:10 /tmp/temp.mWiLjM\n" #define modprobe_trivial_usage \ - "[-knqrsv] MODULE [symbol=value...]" + IF_MODPROBE_SMALL("[-qfwrsv] MODULE [symbol=value...]") \ + IF_NOT_MODPROBE_SMALL("[-" \ + IF_FEATURE_2_4_MODULES("k")"nqrsv" \ + IF_FEATURE_MODPROBE_BLACKLIST("b")"] MODULE [symbol=value...]") #define modprobe_full_usage "\n\n" \ "Options:" \ + IF_MODPROBE_SMALL( \ + "\n -q Quiet" \ + "\n -f Force" \ + "\n -w Wait for unload" \ + "\n -r Remove module (stacks) or do autoclean" \ + "\n -s Report via syslog instead of stderr" \ + "\n -v Verbose" \ + ) \ + IF_NOT_MODPROBE_SMALL( \ IF_FEATURE_2_4_MODULES( \ "\n -k Make module autoclean-able" \ ) \ @@ -2837,7 +2849,8 @@ "\n -v Verbose" \ IF_FEATURE_MODPROBE_BLACKLIST( \ "\n -b Apply blacklist to module names too" \ - ) + ) \ + ) #define modprobe_notes_usage \ "modprobe can (un)load a stack of modules, passing each module options (when\n" \ |