diff options
| author | Lucas De Marchi <lucas.demarchi@profusion.mobi> | 2012-10-17 18:32:56 -0300 |
|---|---|---|
| committer | Lucas De Marchi <lucas.demarchi@profusion.mobi> | 2012-10-17 18:43:17 -0300 |
| commit | cc833644b2193d661e4a9c06c047d1a527f3ecf4 (patch) | |
| tree | 92a587b1ae84e694ee3ad1b0b510d00683d1505c | |
| parent | 1faec2c1344fd2725152a6944dc5ac2525999ec6 (diff) | |
| download | kmod-cc833644b2193d661e4a9c06c047d1a527f3ecf4.tar.gz | |
rmmod: Deprecate --wait option
Remove --wait from usage() and give a message + sleep(10) if user is in
fact using it.
| -rw-r--r-- | TODO | 6 | ||||
| -rw-r--r-- | tools/rmmod.c | 4 |
2 files changed, 5 insertions, 5 deletions
@@ -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 0aa6fb6..843c4f5 100644 --- 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': |