rmmod: Deprecate --wait option

Remove --wait from usage() and give a message + sleep(10) if user is in
fact using it.

diff --git a/TODO b/TODO
index 286eeda4e433542e41cd80a4ed6d061afd95e7b8..0987c430847d62ffb8f20f2ab013a0f6005baa85 100644 (file)
--- a/TODO
+++ b/TODO
@@ -35,9 +35,9 @@ Features:
 
 * Implement actions in kmod tool like 'insert', 'remove', 'info', etc
 
-* Deprecate "rmmod -w", friends and KMOD_REMOVE_NOWAIT from libkmod.
-  The blocking delete_module will be removed from the kernel. Deprecate it and
-  print a warning to the user because he shouldn't be using it.
+* Finish removal of "rmmod -w" when it's gone from kernel.
+
+* Deprecate not using KMOD_REMOVE_NOWAIT on libkmod.
 
 Things to be added/removed in kernel (check what is really needed):
 ===================================================================

diff --git a/tools/rmmod.c b/tools/rmmod.c
index 0aa6fb6f28b2ac9d3a2a3389c97e287a7c501054..843c4f54df17b3290760ae94e73045c3a0a1a251 100644 (file)
--- a/tools/rmmod.c
+++ b/tools/rmmod.c
@@ -52,8 +52,6 @@ static void help(const char *progname)
                "\t-s, --syslog      print to syslog, not stderr\n"
                "\t-v, --verbose     enables more messages\n"
                "\t-V, --version     show version\n"
-               "\t-w, --wait        begins module removal even if it is used and\n"
-               "\t                  will stop new users from accessing it.\n"
                "\t-h, --help        show this help\n",
                progname);
 }
@@ -161,6 +159,8 @@ static int do_rmmod(int argc, char *argv[])
                        verbose++;
                        break;
                case 'w':
+                       fprintf(stderr, "'Wait' behavior is targeted for removal from kernel.\nWe will now sleep for 10s, and then continue.\n");
+                       sleep(10);
                        flags &= ~KMOD_REMOVE_NOWAIT;
                        break;
                case 'h':