Clean up missing options

modprobe -D (short version of --show-deps) doesn't work, remove it from
the manpage.  Don't try to pass "-D" to commands either ("--show-deps"
sets dry_run, so we won't run any commands).

modprobe -Q is not valid, remove 'Q' from the getopt string.

In depmod, "r" was listed twice in the getopt string.

Signed-off-by: Alan Jenkins <alan-jenkins@tuffmail.co.uk>

3 files changed, 3 insertions, 4 deletions

diff --git a/depmod.c b/depmod.c
index 25be46f..116893d 100644
--- a/depmod.c
+++ b/depmod.c
@@ -1186,7 +1186,7 @@ int main(int argc, char *argv[])
 	/* Don't print out any errors just yet, we might want to exec
            backwards compat version. */
 	opterr = 0;
-	while ((opt = getopt_long(argc, argv, "aAb:C:F:euqrrvnhVwm", options, NULL))
+	while ((opt = getopt_long(argc, argv, "aAb:C:F:euqrvnhVwm", options, NULL))
 	       != -1) {
 		switch (opt) {
 		case 'a':
diff --git a/doc/modprobe.sgml b/doc/modprobe.sgml
index dd1311e..fc0d8eb 100644
--- a/doc/modprobe.sgml
+++ b/doc/modprobe.sgml
@@ -365,7 +365,7 @@
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term><option>-D</option> <option>--show-depends</option>
+        <term><option>--show-depends</option>
         </term>
         <listitem>
           <para>
diff --git a/modprobe.c b/modprobe.c
index 872663e..926ded8 100644
--- a/modprobe.c
+++ b/modprobe.c
@@ -1344,7 +1344,7 @@ int main(int argc, char *argv[])
 	argv = merge_args(getenv("MODPROBE_OPTIONS"), argv, &argc);
 
 	uname(&buf);
-	while ((opt = getopt_long(argc, argv, "Vvqsnd:C:o:rwclt:aQibf", options, NULL)) != -1){
+	while ((opt = getopt_long(argc, argv, "Vvqsnd:C:o:rwclt:aibf", options, NULL)) != -1){
 		switch (opt) {
 		case 'V':
 			puts(PACKAGE " version " VERSION);
@@ -1382,7 +1382,6 @@ int main(int argc, char *argv[])
 			dry_run = 1;
 			ignore_proc = 1;
 			verbose = 1;
-			add_to_env_var("-D");
 			break;
 		case 'o':
 			newname = optarg;