diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2018-07-29 18:31:42 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2018-07-29 18:50:28 +0200 |
| commit | fcd068e984078ab74c6842af2525bf88096cd262 (patch) | |
| tree | 01a18470cb88a13a6c9d2dbc33cd098dfa93c083 /gnu/system/mapped-devices.scm | |
| parent | d2a1cf45f74f4be67bd51068fc531a1b8ae54536 (diff) | |
| download | patches-fcd068e984078ab74c6842af2525bf88096cd262.tar patches-fcd068e984078ab74c6842af2525bf88096cd262.tar.gz | |
linux-initrd: Try several file names when looking up modules.
Fixes <https://bugs.gnu.org/31714>.
Reported by Tonton <tonton@riseup.net>.
* gnu/build/linux-modules.scm (find-module-file): New procedure.
* gnu/system/linux-initrd.scm (flat-linux-module-directory)[build-exp]:
Remove 'lookup' procedure and use 'find-module-file' instead.
* gnu/system/mapped-devices.scm (check-device-initrd-modules): Add
comment.
Diffstat (limited to 'gnu/system/mapped-devices.scm')
| -rw-r--r-- | gnu/system/mapped-devices.scm | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/gnu/system/mapped-devices.scm b/gnu/system/mapped-devices.scm index aec49322e7..384b1aaf7d 100644 --- a/gnu/system/mapped-devices.scm +++ b/gnu/system/mapped-devices.scm @@ -137,6 +137,10 @@ DEVICE must be a \"/dev\" file name." ;; LINUX-MODULES is file names without '.ko', so normalize them. (provided (map file-name->module-name linux-modules))) (unless (every (cut member <> provided) modules) + ;; Note: What we suggest here is a list of module names (e.g., + ;; "usb_storage"), not file names (e.g., "usb-storage.ko"). This is + ;; OK because we have machinery that accepts both the hyphen and the + ;; underscore version. (raise (condition (&message (message (format #f (G_ "you may need these modules \ |