Jan Engelhardt
d0a8f9a8ff
- Adjust to usermerge. On Tumbleweed /lib and /usr/lib are the same directory and the canonical location is in /usr. Document and read only /usr to prevent reading the same file twice. On earlier releases preserve compatibility for files placed in /lib and read both. + kmod-usrmerge.patch * Refresh usr-lib-modprobe.patch - Remove test patches included in release 29 - kmod-populate-modules-Use-more-bash-more-quotes.patch - kmod-testsuite-compress-modules-if-feature-is-enabled.patch - kmod-also-test-xz-compression.patch OBS-URL: https://build.opensuse.org/request/show/896081 OBS-URL: https://build.opensuse.org/package/show/Base:System/kmod?expand=0&rev=188
69 lines
2.1 KiB
Diff
69 lines
2.1 KiB
Diff
From 6572069f71045f304780cb63a5a090a275fc22dd Mon Sep 17 00:00:00 2001
|
|
From: Michal Suchanek <msuchanek@suse.de>
|
|
Date: Sat, 29 May 2021 08:10:36 +0200
|
|
Subject: [PATCH] modprobe.d, depmod.d: Only read from /usr/lib, not /lib.
|
|
|
|
With usrmerge /lib is linked to /usr/lib and the modprobe.d files would
|
|
be interpreted twice. It is possible to write non-idempotent modprobe.d
|
|
files leading to weird errors.
|
|
|
|
Signed-off-by: Michal Suchanek <msuchanek@suse.de>
|
|
---
|
|
libkmod/libkmod.c | 1 -
|
|
man/depmod.d.xml | 1 -
|
|
man/modprobe.d.xml | 1 -
|
|
tools/depmod.c | 1 -
|
|
4 files changed, 4 deletions(-)
|
|
|
|
diff --git a/libkmod/libkmod.c b/libkmod/libkmod.c
|
|
index ddf13fb3d822..262f5d1512c9 100644
|
|
--- a/libkmod/libkmod.c
|
|
+++ b/libkmod/libkmod.c
|
|
@@ -66,7 +66,6 @@ static const char *default_config_paths[] = {
|
|
"/run/modprobe.d",
|
|
"/usr/local/lib/modprobe.d",
|
|
PREFIX "/lib/modprobe.d",
|
|
- "/lib/modprobe.d",
|
|
NULL
|
|
};
|
|
|
|
diff --git a/man/depmod.d.xml b/man/depmod.d.xml
|
|
index 8a898cf4a9eb..b315e931d635 100644
|
|
--- a/man/depmod.d.xml
|
|
+++ b/man/depmod.d.xml
|
|
@@ -39,7 +39,6 @@
|
|
</refnamediv>
|
|
|
|
<refsynopsisdiv>
|
|
- <para><filename>/lib/depmod.d/*.conf</filename></para>
|
|
<para><filename>/usr/lib/depmod.d/*.conf</filename></para>
|
|
<para><filename>/usr/local/lib/depmod.d/*.conf</filename></para>
|
|
<para><filename>/run/depmod.d/*.conf</filename></para>
|
|
diff --git a/man/modprobe.d.xml b/man/modprobe.d.xml
|
|
index 8a7c696dcee1..08d789176dd3 100644
|
|
--- a/man/modprobe.d.xml
|
|
+++ b/man/modprobe.d.xml
|
|
@@ -40,7 +40,6 @@
|
|
</refnamediv>
|
|
|
|
<refsynopsisdiv>
|
|
- <para><filename>/lib/modprobe.d/*.conf</filename></para>
|
|
<para><filename>/usr/lib/modprobe.d/*.conf</filename></para>
|
|
<para><filename>/usr/local/lib/modprobe.d/*.conf</filename></para>
|
|
<para><filename>/run/modprobe.d/*.conf</filename></para>
|
|
diff --git a/tools/depmod.c b/tools/depmod.c
|
|
index 8f6a4f8cd7cb..3a4708316581 100644
|
|
--- a/tools/depmod.c
|
|
+++ b/tools/depmod.c
|
|
@@ -55,7 +55,6 @@ static const char *default_cfg_paths[] = {
|
|
"/run/depmod.d",
|
|
"/usr/local/lib/depmod.d",
|
|
PREFIX "/lib/depmod.d",
|
|
- "/lib/depmod.d",
|
|
NULL
|
|
};
|
|
|
|
--
|
|
2.26.2
|
|
|