From: Gustavo Sverzut Barbieri <barbieri@profusion.mobi>
Date: Mon, 19 Dec 2011 15:02:15 +0000 (-0200)
Subject: kmod-modprobe: improve --help output.
X-Git-Tag: v2~38
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ab70dce181bc7fa1d29e37912ab64fa784d09092;p=thirdparty%2Fkmod.git

kmod-modprobe: improve --help output.
---

diff --git a/tools/kmod-modprobe.c b/tools/kmod-modprobe.c
index f7fbaff2..7f069da9 100644
--- a/tools/kmod-modprobe.c
+++ b/tools/kmod-modprobe.c
@@ -96,34 +96,38 @@ static void help(const char *progname)
 		"\t%s [options] -c\n"
 		"\t%s [options] --dump-modversions filename\n"
 		"Management Options:\n"
-		"\t-a, --all                   \n"
-		"\t-r, --remove                \n"
-		"\t    --remove-dependencies   \n"
-		"\t-R, --resolve-alias         \n"
-		"\t    --first-time            \n"
-		"\t-i, --ignore-install        \n"
-		"\t-i, --ignore-remove         \n"
-		"\t-b, --use-blacklist         \n"
-		"\t-f, --force                 \n"
-		"\t    --force-modversion      \n"
-		"\t    --force-vermagic        \n"
+		"\t-a, --all                   Consider every non-argument to\n"
+		"\t                            be a module name to be inserted\n"
+		"\t                            or removed (-r)\n"
+		"\t-r, --remove                Remove modules instead of inserting\n"
+		"\t    --remove-dependencies   Also remove modules depending on it\n"
+		"\t-R, --resolve-alias         Only lookup and print alias and exit\n"
+		"\t    --first-time            Fail if module already inserted or removed\n"
+		"\t-i, --ignore-install        Ignore install commands\n"
+		"\t-i, --ignore-remove         Ignore remove commands\n"
+		"\t-b, --use-blacklist         Apply blacklist to resolved alias.\n"
+		"\t-f, --force                 Force module insertion or removal.\n"
+		"\t                            implies --force-modversions and\n"
+		"\t                            --force-vermagic\n"
+		"\t    --force-modversion      Ignore module's version\n"
+		"\t    --force-vermagic        Ignore module's version magic\n"
 		"\n"
 		"Query Options:\n"
-		"\t-t, --type=DIR              \n"
-		"\t-l, --list                  \n"
-		"\t-D, --show-depends          \n"
-		"\t-c, --showconfig            \n"
-		"\t-c, --show-config           \n"
-		"\t    --show-modversions      \n"
-		"\t    --dump-modversions      \n"
+		"\t-t, --type=DIR              Limit type used by --list\n"
+		"\t-l, --list                  List known modules\n"
+		"\t-D, --show-depends          Only print module dependencies and exit\n"
+		"\t-c, --showconfig            Print out known configuration and exit\n"
+		"\t-c, --show-config           Same as --showconfig\n"
+		"\t    --show-modversions      Dump module symbol version and exit\n"
+		"\t    --dump-modversions      Same as --show-modversions\n"
 		"\n"
 		"General Options:\n"
-		"\t-n, --dry-run               \n"
-		"\t-n, --show                  \n"
+		"\t-n, --dry-run               Do not execute operations, just print out\n"
+		"\t-n, --show                  Same as --dry-run\n"
 
-		"\t-C, --config=FILE           \n"
-		"\t-d, --dirname=DIR           \n"
-		"\t-S, --set-version=VERSION   \n"
+		"\t-C, --config=FILE           Use FILE instead of /etc/modprobe.d\n"
+		"\t-d, --dirname=DIR           Use DIR as filesystem root for /lib/modules\n"
+		"\t-S, --set-version=VERSION   Use VERSION instead of `uname -r`\n"
 
 		"\t-s, --syslog                print to syslog, not stderr\n"
 		"\t-q, --quiet                 disable messages\n"