diff options
| author | Lucas De Marchi <lucas.demarchi@intel.com> | 2021-01-18 18:22:31 -0800 |
|---|---|---|
| committer | Lucas De Marchi <lucas.demarchi@intel.com> | 2021-01-18 18:26:36 -0800 |
| commit | 9319b0f4cba5be851ae6ceced394f445b30bf07d (patch) | |
| tree | 7588abc8238c03d5dcc5f3d77a8f810b5d09c5dd | |
| parent | 1c10f3248378af987243049e0220964e3bdbbac0 (diff) | |
| download | kmod-9319b0f4cba5be851ae6ceced394f445b30bf07d.tar.gz kmod-9319b0f4cba5be851ae6ceced394f445b30bf07d.tar.bz2 kmod-9319b0f4cba5be851ae6ceced394f445b30bf07d.zip | |
Support /usr/local for configuration files
Add /usr/local to the search path for configuration files. These are
intended for local installs, provided /usr/local is given as prefix.
| -rw-r--r-- | libkmod/libkmod.c | 10 | ||||
| -rw-r--r-- | man/depmod.d.xml | 1 | ||||
| -rw-r--r-- | man/modprobe.d.xml | 1 | ||||
| -rw-r--r-- | tools/depmod.c | 1 |
4 files changed, 9 insertions, 4 deletions
diff --git a/libkmod/libkmod.c b/libkmod/libkmod.c index 25655b9..7c2b889 100644 --- a/libkmod/libkmod.c +++ b/libkmod/libkmod.c @@ -64,6 +64,7 @@ static struct _index_files { static const char *default_config_paths[] = { SYSCONFDIR "/modprobe.d", "/run/modprobe.d", + "/usr/local/lib/modprobe.d", "/lib/modprobe.d", NULL }; @@ -234,10 +235,11 @@ static char *get_kernel_release(const char *dirname) * Otherwise, give an absolute dirname. * @config_paths: ordered array of paths (directories or files) where * to load from user-defined configuration parameters such as - * alias, blacklists, commands (install, remove). If - * NULL defaults to /etc/modprobe.d, /run/modprobe.d and - * /lib/modprobe.d. Give an empty vector if configuration should - * not be read. This array must be null terminated. + * alias, blacklists, commands (install, remove). If NULL + * defaults to /etc/modprobe.d, /run/modprobe.d, + * /usr/local/lib/modprobe.d and /lib/modprobe.d. Give an empty + * vector if configuration should not be read. This array must + * be null terminated. * * Create kmod library context. This reads the kmod configuration * and fills in the default values. diff --git a/man/depmod.d.xml b/man/depmod.d.xml index 6472bda..b315e93 100644 --- a/man/depmod.d.xml +++ b/man/depmod.d.xml @@ -40,6 +40,7 @@ <refsynopsisdiv> <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> <para><filename>/etc/depmod.d/*.conf</filename></para> </refsynopsisdiv> diff --git a/man/modprobe.d.xml b/man/modprobe.d.xml index a674d69..0ab3e91 100644 --- a/man/modprobe.d.xml +++ b/man/modprobe.d.xml @@ -41,6 +41,7 @@ <refsynopsisdiv> <para><filename>/lib/modprobe.d/*.conf</filename></para> + <para><filename>/usr/local/lib/modprobe.d/*.conf</filename></para> <para><filename>/run/modprobe.d/*.conf</filename></para> <para><filename>/etc/modprobe.d/*.conf</filename></para> </refsynopsisdiv> diff --git a/tools/depmod.c b/tools/depmod.c index 8e1d9ec..170a1d8 100644 --- a/tools/depmod.c +++ b/tools/depmod.c @@ -53,6 +53,7 @@ static const char CFG_EXTERNAL_KEY[] = "external"; static const char *default_cfg_paths[] = { SYSCONFDIR "/depmod.d", "/run/depmod.d", + "/usr/local/lib/depmod.d", "/lib/depmod.d", NULL }; |