me/guix
Archived
1
0
Fork 0
Code Activity

linux-initrd: Improve check of initrd modules.

Browse source 
Previously we would not strip the ".ko" suffix if present.

* gnu/build/linux-modules.scm (file-name->module-name): Export.
* gnu/system/mapped-devices.scm (check-device-initrd-modules): Use
'file-name->module-name' instead of 'normalize-module-name'.
This commit is contained in:
Ludovic Courtès 2018-07-29 17:53:12 +02:00
parent 5b68239072
commit d2a1cf45f7
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
gnu/build/linux-modules.scm
View file

@ -33,6 +33,7 @@
module-aliases module-aliases
module-dependencies module-dependencies
normalize-module-name normalize-module-name
file-name->module-name
recursive-module-dependencies recursive-module-dependencies
modules-loaded modules-loaded
module-loaded? module-loaded?

6
gnu/system/mapped-devices.scm
View file

@ -21,7 +21,7 @@
(define-module (gnu system mapped-devices) (define-module (gnu system mapped-devices)
#:use-module (guix gexp) #:use-module (guix gexp)
#:use-module (guix records) #:use-module (guix records)
#:use-module (guix modules) #:use-module ((guix modules) #:hide (file-name->module-name))
#:use-module (guix i18n) #:use-module (guix i18n)
#:use-module ((guix utils) #:use-module ((guix utils)
#:select (source-properties->location #:select (source-properties->location
@ -33,7 +33,7 @@
#:autoload (gnu build file-systems) (find-partition-by-luks-uuid) #:autoload (gnu build file-systems) (find-partition-by-luks-uuid)
#:autoload (gnu build linux-modules) #:autoload (gnu build linux-modules)
(device-module-aliases matching-modules known-module-aliases (device-module-aliases matching-modules known-module-aliases
normalize-module-name) normalize-module-name file-name->module-name)
#:autoload (gnu packages cryptsetup) (cryptsetup-static) #:autoload (gnu packages cryptsetup) (cryptsetup-static)
#:autoload (gnu packages linux) (mdadm-static) #:autoload (gnu packages linux) (mdadm-static)
#:use-module (srfi srfi-1) #:use-module (srfi srfi-1)
@ -135,7 +135,7 @@ DEVICE must be a \"/dev\" file name."
;; Module names (not file names) are supposed to use underscores ;; Module names (not file names) are supposed to use underscores
;; instead of hyphens. MODULES is a list of module names, whereas ;; instead of hyphens. MODULES is a list of module names, whereas
;; LINUX-MODULES is file names without '.ko', so normalize them. ;; LINUX-MODULES is file names without '.ko', so normalize them.
(provided (map normalize-module-name linux-modules))) (provided (map file-name->module-name linux-modules)))
(unless (every (cut member <> provided) modules) (unless (every (cut member <> provided) modules)
(raise (condition (raise (condition
(&message (&message