Jan Engelhardt
3e7521ddc2
- Remove "rmmod -w" documentation and getopt entry - modprobe: Recognize --allow-unsupported-modules on commandline (fate#316971) - libkmod-config: Recognize allow_unsupported_modules in the configuration (fate#316971) - Drop the non-upstream kmod-no-static.diff; the size difference is negligible. OBS-URL: https://build.opensuse.org/request/show/223975 OBS-URL: https://build.opensuse.org/package/show/Base:System/kmod?expand=0&rev=63
97 lines
3.2 KiB
Diff
97 lines
3.2 KiB
Diff
From f81194e28e56dd57588edb5f19c5a3b1f38d1eb8 Mon Sep 17 00:00:00 2001
|
|
From: Stephen Kitt <steve@sk2.org>
|
|
Date: Sun, 26 Jan 2014 18:00:23 -0200
|
|
Subject: [PATCH 1/3] Remove "rmmod -w" documentation and getopt entry
|
|
|
|
This patch removes the cmdopts declaration and the documentation. They
|
|
were leftover from the -w removal.
|
|
|
|
(cherry picked from commit a4bd1441e5c7e8903a9ae065801d4f06f13d06e9)
|
|
[mmarek: regenerated man/rmmod.8]
|
|
---
|
|
man/rmmod.8 | 12 +-----------
|
|
man/rmmod.xml | 17 -----------------
|
|
tools/rmmod.c | 1 -
|
|
3 files changed, 1 insertion(+), 29 deletions(-)
|
|
|
|
diff --git a/man/rmmod.8 b/man/rmmod.8
|
|
index cd97efa..e5d879a 100644
|
|
--- a/man/rmmod.8
|
|
+++ b/man/rmmod.8
|
|
@@ -31,7 +31,7 @@
|
|
rmmod \- Simple program to remove a module from the Linux Kernel
|
|
.SH "SYNOPSIS"
|
|
.HP \w'\fBrmmod\fR\ 'u
|
|
-\fBrmmod\fR [\fB\-f\fR] [\fB\-w\fR] [\fB\-s\fR] [\fB\-v\fR] [\fImodulename\fR]
|
|
+\fBrmmod\fR [\fB\-f\fR] [\fB\-s\fR] [\fB\-v\fR] [\fImodulename\fR]
|
|
.SH "DESCRIPTION"
|
|
.PP
|
|
\fBrmmod\fR
|
|
@@ -55,16 +55,6 @@ This option can be extremely dangerous: it has no effect unless CONFIG_MODULE_FO
|
|
\fBlsmod\fR(8))\&.
|
|
.RE
|
|
.PP
|
|
-\fB\-w\fR \fB\-\-wait\fR
|
|
-.RS 4
|
|
-Normally,
|
|
-\fBrmmod\fR
|
|
-will refuse to unload modules which are in use\&. With this option,
|
|
-\fBrmmod\fR
|
|
-will isolate the module, and wait until the module is no longer used\&. Nothing new will be able to use the module, but it\*(Aqs up to you to make sure the current users eventually finish with it\&. See
|
|
-\fBlsmod\fR(8)) for information on usage counts\&.
|
|
-.RE
|
|
-.PP
|
|
\fB\-s\fR, \fB\-\-syslog\fR
|
|
.RS 4
|
|
Send errors to syslog instead of standard error\&.
|
|
diff --git a/man/rmmod.xml b/man/rmmod.xml
|
|
index 3605068..5023fb0 100644
|
|
--- a/man/rmmod.xml
|
|
+++ b/man/rmmod.xml
|
|
@@ -39,7 +39,6 @@
|
|
<cmdsynopsis>
|
|
<command>rmmod</command>
|
|
<arg><option>-f</option></arg>
|
|
- <arg><option>-w</option></arg>
|
|
<arg><option>-s</option></arg>
|
|
<arg><option>-v</option></arg>
|
|
<arg><replaceable>modulename</replaceable></arg>
|
|
@@ -94,22 +93,6 @@
|
|
</listitem>
|
|
</varlistentry>
|
|
<varlistentry>
|
|
- <term><option>-w</option> <option>--wait</option>
|
|
- </term>
|
|
- <listitem>
|
|
- <para>
|
|
- Normally, <command>rmmod</command> will refuse to unload modules
|
|
- which are in use. With this option, <command>rmmod</command> will
|
|
- isolate the module, and wait until the module is no longer used.
|
|
- Nothing new will be able to use the module, but it's up to you to
|
|
- make sure the current users eventually finish with it. See
|
|
- <citerefentry>
|
|
- <refentrytitle>lsmod</refentrytitle><manvolnum>8</manvolnum>
|
|
- </citerefentry>) for information on usage counts.
|
|
- </para>
|
|
- </listitem>
|
|
- </varlistentry>
|
|
- <varlistentry>
|
|
<term>
|
|
<option>-s</option>
|
|
</term>
|
|
diff --git a/tools/rmmod.c b/tools/rmmod.c
|
|
index fd0fac5..df2f041 100644
|
|
--- a/tools/rmmod.c
|
|
+++ b/tools/rmmod.c
|
|
@@ -40,7 +40,6 @@ static const struct option cmdopts[] = {
|
|
{"syslog", no_argument, 0, 's'},
|
|
{"verbose", no_argument, 0, 'v'},
|
|
{"version", no_argument, 0, 'V'},
|
|
- {"wait", no_argument, 0, 'w'},
|
|
{"help", no_argument, 0, 'h'},
|
|
{NULL, 0, 0, 0}
|
|
};
|
|
--
|
|
1.8.4.5
|
|
|