diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2019-03-13 17:11:19 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2019-03-13 23:12:43 +0100 |
| commit | 4cd386afae444f3ee603cd07d282b2eee3253555 (patch) | |
| tree | 048222e135ac36378bed3ced318fd0055f9fc4ea /gnu/build/linux-modules.scm | |
| parent | 59e80445882f8b0379e54916f89510c0deda6698 (diff) | |
| download | guix-patches-4cd386afae444f3ee603cd07d282b2eee3253555.tar guix-patches-4cd386afae444f3ee603cd07d282b2eee3253555.tar.gz | |
linux-modules: Factorize 'missing-modules'.
* gnu/build/linux-modules.scm (missing-modules): New procedure.
* gnu/system/mapped-devices.scm (check-device-initrd-modules): Use it.
Diffstat (limited to 'gnu/build/linux-modules.scm')
| -rw-r--r-- | gnu/build/linux-modules.scm | 27 |
1 files changed, 25 insertions, 2 deletions
diff --git a/gnu/build/linux-modules.scm b/gnu/build/linux-modules.scm index d99d1f01a4..c66ef97012 100644 --- a/gnu/build/linux-modules.scm +++ b/gnu/build/linux-modules.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2014, 2016, 2018 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2014, 2016, 2018, 2019 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com> ;;; ;;; This file is part of GNU Guix. @@ -47,7 +47,8 @@ device-module-aliases known-module-aliases - matching-modules)) + matching-modules + missing-modules)) ;;; Commentary: ;;; @@ -463,4 +464,26 @@ ALIAS is a string like \"scsi:t-0x00\" as returned by module))) known-aliases)) +(define* (missing-modules device modules-provided) + "Assuming MODULES-PROVIDED lists kernel modules that are already +provided--e.g., in the initrd, return the list of missing kernel modules that +are required to access DEVICE." + (define aliases + ;; Attempt to load 'modules.alias' from the current kernel, assuming we're + ;; on Guix System, and assuming that corresponds to the kernel we'll be + ;; installing. + (known-module-aliases)) + + (if aliases + (let* ((modules (delete-duplicates + (append-map (cut matching-modules <> aliases) + (device-module-aliases device)))) + + ;; Module names (not file names) are supposed to use underscores + ;; instead of hyphens. MODULES is a list of module names, whereas + ;; LINUX-MODULES is file names without '.ko', so normalize them. + (provided (map file-name->module-name modules-provided))) + (remove (cut member <> provided) modules)) + '())) + ;;; linux-modules.scm ends here |