This fits nicely in sysctl/kernel.rst, merge it (and rephrase it)
instead of linking to it.
Signed-off-by: Stephen Kitt <[email protected]>
---
Documentation/admin-guide/sysctl/kernel.rst | 16 ++++++++++++++-
Documentation/debugging-modules.txt | 22 ---------------------
2 files changed, 15 insertions(+), 23 deletions(-)
delete mode 100644 Documentation/debugging-modules.txt
diff --git a/Documentation/admin-guide/sysctl/kernel.rst b/Documentation/admin-guide/sysctl/kernel.rst
index 1de8f0b199b1..1aacd7a24f5a 100644
--- a/Documentation/admin-guide/sysctl/kernel.rst
+++ b/Documentation/admin-guide/sysctl/kernel.rst
@@ -388,7 +388,21 @@ This flag controls the L2 cache of G3 processor boards. If
modprobe
========
-See Documentation/debugging-modules.txt.
+This gives the full path of the modprobe command which the kernel will
+use to load modules. This can be used to debug module loading
+requests:
+
+::
+
+ echo '#! /bin/sh' > /tmp/modprobe
+ echo 'echo "$@" >> /tmp/modprobe.log' >> /tmp/modprobe
+ echo 'exec /sbin/modprobe "$@"' >> /tmp/modprobe
+ chmod a+x /tmp/modprobe
+ echo /tmp/modprobe > /proc/sys/kernel/modprobe
+
+This only applies when the *kernel* is requesting that the module be
+loaded; it won’t have any effect if the module is being loaded
+explicitly using ``modprobe`` from userspace.
modules_disabled
diff --git a/Documentation/debugging-modules.txt b/Documentation/debugging-modules.txt
deleted file mode 100644
index 172ad4aec493..000000000000
--- a/Documentation/debugging-modules.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-Debugging Modules after 2.6.3
------------------------------
-
-In almost all distributions, the kernel asks for modules which don't
-exist, such as "net-pf-10" or whatever. Changing "modprobe -q" to
-"succeed" in this case is hacky and breaks some setups, and also we
-want to know if it failed for the fallback code for old aliases in
-fs/char_dev.c, for example.
-
-In the past a debugging message which would fill people's logs was
-emitted. This debugging message has been removed. The correct way
-of debugging module problems is something like this:
-
-echo '#! /bin/sh' > /tmp/modprobe
-echo 'echo "$@" >> /tmp/modprobe.log' >> /tmp/modprobe
-echo 'exec /sbin/modprobe "$@"' >> /tmp/modprobe
-chmod a+x /tmp/modprobe
-echo /tmp/modprobe > /proc/sys/kernel/modprobe
-
-Note that the above applies only when the *kernel* is requesting
-that the module be loaded -- it won't have any effect if that module
-is being loaded explicitly using "modprobe" from userspace.
--
2.24.1
On Thu, 13 Feb 2020 18:46:57 +0100
Stephen Kitt <[email protected]> wrote:
> This fits nicely in sysctl/kernel.rst, merge it (and rephrase it)
> instead of linking to it.
>
> Signed-off-by: Stephen Kitt <[email protected]>
> ---
> Documentation/admin-guide/sysctl/kernel.rst | 16 ++++++++++++++-
> Documentation/debugging-modules.txt | 22 ---------------------
> 2 files changed, 15 insertions(+), 23 deletions(-)
> delete mode 100644 Documentation/debugging-modules.txt
One quick comment here:
> diff --git a/Documentation/admin-guide/sysctl/kernel.rst b/Documentation/admin-guide/sysctl/kernel.rst
> index 1de8f0b199b1..1aacd7a24f5a 100644
> --- a/Documentation/admin-guide/sysctl/kernel.rst
> +++ b/Documentation/admin-guide/sysctl/kernel.rst
> @@ -388,7 +388,21 @@ This flag controls the L2 cache of G3 processor boards. If
> modprobe
> ========
>
> -See Documentation/debugging-modules.txt.
> +This gives the full path of the modprobe command which the kernel will
> +use to load modules. This can be used to debug module loading
> +requests:
> +
> +::
This can be more readably written as just:
requests::
No need for the separate "::" line.
Thanks,
jon