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; 72db5e'>packages/zile.scm
/td>
AgeCommit message (Expand)Author
2021-12-13gnu: Simplify package inputs....This commit was obtained by running: ./pre-inst-env guix style without any additional argument. Ludovic Courtès
machine: ssh: Validate 'system' field....* gnu/machine/ssh.scm (<machine-ssh-configuration>)[system]: Add 'sanitize' property. (validate-system-type): New macro. Ludovic Courtès
2022-11-09machine/digital-ocean: Pull operating system definition out of string....* gnu/machine/digital-ocean.scm (guix-infect): Define the operating system declaration as an s-expression and paste it into the generated Bash script to simplify editing. Ricardo Wurmus
2022-11-09machine/digital-ocean: Set load path to Guile 3.0 directories....* gnu/machine/digital-ocean.scm (guix-infect, add-static-networking): Set GUILE_LOAD_PATH and GUILE_LOAD_COMPILED_PATH to directories for Guile 3.0 instead of 2.2. Ricardo Wurmus
2022-11-09machine/digital-ocean: Use static-networking-service-type....* gnu/machine/digital-ocean.scm (ip+netmask->cidr): New procedure. (guix-infect, add-static-networking): Use static-networking-service-type instead of the deprecated static-networking-service. Ricardo Wurmus
2022-11-09machine/digital-ocean: Use nightly Guix....* gnu/machine/digital-ocean.scm (guix-infect): Fetch latest Guix build from ci.guix.gnu.org. Ricardo Wurmus
2022-10-17guix: Fix typos....These typos were found and reported through weblate. * gnu/packages/audio.scm (wildmidi)[description]: Fix typo. * gnu/packages/games.scm (cgoban)[description]: Fix typo. * gnu/services/version-control.scm (gitolite-service-type)[description]: Fix typo. * gnu/installer/newt/substitutes.scm (run-substitutes-page): Remove full stop at end of title. * gnu/machine/ssh.scm (machine-ssh-configuration-system): Move punctuation outside of quotes. * guix/scripts/home.scm (process-action): Remove trailing space before newline. * guix/scripts/system.scm (show-help): Fix typo. * guix/scripts/environment.scm (with-store/maybe): Fix typo. Julien Lepiller
2022-09-26machine: ssh: Parameterize '%current-system' early on....Fixes <https://issues.guix.gnu.org/58084>. Reported by Maxim Cournoyer <maxim.cournoyer@gmail.com>. Previously, "sanity checks" and other operations would happen in a context where '%current-system' has its default value. Thus, running 'guix deploy' on x86_64-linux machine for an aarch64-linux one would lead things like '%base-initrd-modules' to see "x86_64-linux" as the '%current-system' value, in turn making the wrong choices. * gnu/machine/ssh.scm (check-deployment-sanity)[assertions]: Wrap in 'parameterize'. (deploy-managed-host): Likewise for the 'mlet' body. Ludovic Courtès
2022-09-04Fix misspelling of GUIX_DIGITAL_OCEAN_TOKEN....* gnu/machine/digital-ocean.scm (maybe-raise-missing-api-key-error): Fix misspelling of GUIX_DIGITAL_OCEAN_TOKEN. Signed-off-by: Mathieu Othacehe <othacehe@gnu.org> Matthew James Kraai