diff options
| author | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2024-03-09 22:31:25 +0100 |
|---|---|---|
| committer | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2024-03-10 00:05:58 +0100 |
| commit | 2ee54513196bad8e663e78ac695b6ffa0da49051 (patch) | |
| tree | 4686b32c86fd484da0acfa35da69454659504cf7 /gnu/system | |
| parent | fe2b2f860e1fd7dfdc333f65893e65f131e290c7 (diff) | |
| parent | 7b9a23ea315d2b4efde755c3bd0b1db3cacba9c2 (diff) | |
| download | guix-2ee54513196bad8e663e78ac695b6ffa0da49051.tar guix-2ee54513196bad8e663e78ac695b6ffa0da49051.tar.gz | |
Merge branch 'master' into gnome-team
Diffstat (limited to 'gnu/system')
| -rw-r--r-- | gnu/system/linux-initrd.scm | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/gnu/system/linux-initrd.scm b/gnu/system/linux-initrd.scm index 58e95a1312..6236d25b9d 100644 --- a/gnu/system/linux-initrd.scm +++ b/gnu/system/linux-initrd.scm @@ -132,15 +132,27 @@ MODULES and taken from LINUX." #~(begin (use-modules (gnu build linux-modules) (guix build utils) + (rnrs io ports) (srfi srfi-1) (srfi srfi-26)) (define module-dir (string-append #$linux "/lib/modules")) + (define builtin-modules + (call-with-input-file + (first (find-files module-dir "modules.builtin$")) + (lambda (port) + (map file-name->module-name + (string-tokenize + (get-string-all port)))))) + + (define modules-to-lookup + (lset-difference string=? '#$modules builtin-modules)) + (define modules (let* ((lookup (cut find-module-file module-dir <>)) - (modules (map lookup '#$modules))) + (modules (map lookup modules-to-lookup))) (append modules (recursive-module-dependencies modules |