This patch changes libkmod so it honors the 'LINUX_MODULE_DIRECTORY'
environment variable, rather than looking for modules exclusively in
/lib/modules.

Patch by Shea Levy and Eelco Dolstra, from Nixpkgs; adjusted to
use 'LINUX_MODULE_DIRECTORY' rather than 'MODULE_DIR' as the variable
name.


--- kmod-7/libkmod/libkmod.c	2012-03-15 08:19:16.750010226 -0400
+++ kmod-7/libkmod/libkmod.c	2012-04-04 15:21:29.532074313 -0400
@@ -200,7 +200,7 @@
 static char *get_kernel_release(const char *dirname)
 {
 	struct utsname u;
-	char *p;
+	char *p, *dirname_prefix;
 
 	if (dirname != NULL)
 		return path_make_absolute_cwd(dirname);
@@ -208,7 +208,10 @@
 	if (uname(&u) < 0)
 		return NULL;
 
-	if (asprintf(&p, "%s/%s", dirname_default_prefix, u.release) < 0)
+	if ((dirname_prefix = getenv("LINUX_MODULE_DIRECTORY")) == NULL)
+		dirname_prefix = dirname_default_prefix;
+
+	if (asprintf(&p, "%s/%s", dirname_prefix, u.release) < 0)
 		return NULL;
 
 	return p;

--- kmod-17/tools/static-nodes.c	2013-12-17 22:05:42.159047316 +0100
+++ kmod-17/tools/static-nodes.c	2014-04-17 13:51:17.945974320 +0200
@@ -159,6 +159,7 @@
 	FILE *in = NULL, *out = NULL;
 	const struct static_nodes_format *format = &static_nodes_format_human;
 	int r, ret = EXIT_SUCCESS;
+	char *dirname_prefix;
 
 	for (;;) {
 		int c, idx = 0, valid;
@@ -211,16 +212,19 @@
 		goto finish;
 	}
 
-	snprintf(modules, sizeof(modules), "/lib/modules/%s/modules.devname", kernel.release);
+	if ((dirname_prefix = getenv("LINUX_MODULE_DIRECTORY")) == NULL)
+		dirname_prefix = "/lib/modules";
+
+	snprintf(modules, sizeof(modules), "%s/%s/modules.devname", dirname_prefix, kernel.release);
 	in = fopen(modules, "re");
 	if (in == NULL) {
 		if (errno == ENOENT) {
-			fprintf(stderr, "Warning: /lib/modules/%s/modules.devname not found - ignoring\n",
-				kernel.release);
+			fprintf(stderr, "Warning: %s/%s/modules.devname not found - ignoring\n",
+				dirname_prefix, kernel.release);
 			ret = EXIT_SUCCESS;
 		} else {
-			fprintf(stderr, "Error: could not open /lib/modules/%s/modules.devname - %m\n",
-				kernel.release);
+			fprintf(stderr, "Error: could not open %s/%s/modules.devname - %m\n",
+				dirname_prefix, kernel.release);
 			ret = EXIT_FAILURE;
 		}
 		goto finish;
a>/<a href='/guix/log/gnu/system/hurd.scm?id=8d19ff23052bffb1c43f0d39f543eb0b1e363074'>hurd.scm</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/gnu/system/hurd.scm?id=8d19ff23052bffb1c43f0d39f543eb0b1e363074&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2023-07-13 19:00:02 +0200'>2023-07-13</span></td><td><a href='/guix/commit/gnu/system/hurd.scm?id=cefcf0fb04c475c2c016e856f2b60a7c2ecdfcf5'>system: hurd: Add netdde to %base-packages/hurd.</a><span class='msg-avail'>...</span></td><td>Janneke Nieuwenhuizen</td></tr>
<tr><td><span title='2023-06-17 14:38:32 +0200'>2023-06-17</span></td><td><a href='/guix/commit/gnu/system/hurd.scm?id=ff690faf66d8f37ee6b679fcb7cf37e369624ee3'>gnu: Use target-hurd?, system-hurd? instead of hurd-target?, hurd-system?.</a><span class='msg-avail'>...</span></td><td>Janneke Nieuwenhuizen</td></tr>
<tr><td><span title='2023-03-30 12:44:20 +0200'>2023-03-30</span></td><td><a href='/guix/commit/gnu/system/hurd.scm?id=fda221c469f8d31cdc22bc5053e6b19017764c62'>system: hurd: Use shepherd-0.8 in the package list.</a><span class='msg-avail'>...</span></td><td>Josselin Poiret</td></tr>
<tr><td><span title='2023-03-03 17:55:32 +0100'>2023-03-03</span></td><td><a href='/guix/commit/gnu/system/hurd.scm?id=6edacf249110ce9e59dc44f330d7f03ecd7c60d8'>services: base: Deprecate 'syslog-service' procedure.</a><span class='msg-avail'>...</span></td><td>Bruno Victal</td></tr>
<tr><td><span title='2022-11-28 11:19:31 +0100'>2022-11-28</span></td><td><a href='/guix/commit/gnu/system/hurd.scm?id=e3c6575ee93741a43003cd1aa4663151dd90b9f5'>system: hurd: Create more ttys.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2022-04-08 18:14:35 +0200'>2022-04-08</span></td><td><a href='/guix/commit/gnu/system/hurd.scm?id=df473496edefbb88eaf2fbff7dda2665eb21b4d1'>system: hurd: Fix bogus 'initrd-modules' field.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2022-03-09 23:38:18 +0100'>2022-03-09</span></td><td><a href='/guix/commit/gnu/system/hurd.scm?id=a208a4e923797dcaf6d63dbf2403714d62de8e5a'>system: hurd: Move the Shepherd before the Hurd in %BASE-PACKAGES/HURD.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2021-12-12 23:20:50 +0100'>2021-12-12</span></td><td><a href='/guix/commit/gnu/system/hurd.scm?id=5967aee398c26a4814da1d8dba3f2dba84b06a4b'>services: Define '%loopback-static-networking'.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2021-12-12 23:20:49 +0100'>2021-12-12</span></td><td><a href='/guix/commit/gnu/system/hurd.scm?id=1644f4f1f8957f3f3a88037aed80d501fdceaae7'>services: Define '%qemu-static-networking'.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2021-12-12 23:20:49 +0100'>2021-12-12</span></td><td><a href='/guix/commit/gnu/system/hurd.scm?id=223f1b1eb3707f1d3ef91200dd616ee6c8b77db0'>services: static-networking: Change interface to mimic netlink.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2021-10-18 10:00:50 +0200'>2021-10-18</span></td><td><a href='/guix/commit/gnu/system/hurd.scm?id=d1053f8969f0d27308e9ae7b017804d147c42da4'>system: hurd: Add 'info-reader' to %BASE-PACKAGES/HURD.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>