diff options
Diffstat (limited to 'testing/kmod/0001-split-usr-read-configs-from-lib-depmod.d-modprobe.d.patch')
-rw-r--r-- | testing/kmod/0001-split-usr-read-configs-from-lib-depmod.d-modprobe.d.patch | 50 |
1 files changed, 50 insertions, 0 deletions
diff --git a/testing/kmod/0001-split-usr-read-configs-from-lib-depmod.d-modprobe.d.patch b/testing/kmod/0001-split-usr-read-configs-from-lib-depmod.d-modprobe.d.patch new file mode 100644 index 000000000..bf2c3501f --- /dev/null +++ b/testing/kmod/0001-split-usr-read-configs-from-lib-depmod.d-modprobe.d.patch @@ -0,0 +1,50 @@ +From 666ba68a0635048aea0db70cd9ec61aea9b61ed2 Mon Sep 17 00:00:00 2001 +From: Tom Gundersen <teg@jklm.no> +Date: Sat, 3 Mar 2012 12:37:06 +0100 +Subject: [PATCH 1/2] split usr: read configs from /lib/{depmod.d,modprobe.d} + +This allows rootprefix to be set to /usr, even if not all other packages +have been fixed to read from this dir. +--- + libkmod/libkmod.c | 5 +++-- + tools/kmod-depmod.c | 1 + + 2 files changed, 4 insertions(+), 2 deletions(-) + +diff --git a/libkmod/libkmod.c b/libkmod/libkmod.c +index 36ca629..12c1112 100644 +--- a/libkmod/libkmod.c ++++ b/libkmod/libkmod.c +@@ -62,6 +62,7 @@ static const char *default_config_paths[] = { + SYSCONFDIR "/modprobe.d", + "/run/modprobe.d", + ROOTPREFIX "/lib/modprobe.d", ++ "/lib/modprobe.d", + NULL + }; + +@@ -223,8 +224,8 @@ static char *get_kernel_release(const char *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 /run/modprobe.d, /etc/modprobe.d and +- * $rootprefix/lib/modprobe.d. Give an empty vector if ++ * NULL defaults to /run/modprobe.d, /etc/modprobe.d, ++ * $rootprefix/lib/modprobe.d and /lib/modprobe.d. Give an empty vector if + * configuration should not be read. This array must be null + * terminated. + * +diff --git a/tools/kmod-depmod.c b/tools/kmod-depmod.c +index 1871e18..7bb1c5d 100644 +--- a/tools/kmod-depmod.c ++++ b/tools/kmod-depmod.c +@@ -58,6 +58,7 @@ static const char *default_cfg_paths[] = { + "/run/depmod.d", + SYSCONFDIR "/depmod.d", + ROOTPREFIX "/lib/depmod.d", ++ "/lib/depmod.d", + NULL + }; + +-- +1.7.9.5 + |