From d2a1cf45f74f4be67bd51068fc531a1b8ae54536 Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludo@gnu.org>
Date: Sun, 29 Jul 2018 17:53:12 +0200
Subject: linux-initrd: Improve check of initrd modules.

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'.
---
 gnu/build/linux-modules.scm   | 1 +
 gnu/system/mapped-devices.scm | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/gnu/build/linux-modules.scm b/gnu/build/linux-modules.scm
index 2ee2f1771f..b06c576441 100644
--- a/gnu/build/linux-modules.scm
+++ b/gnu/build/linux-modules.scm
@@ -33,6 +33,7 @@
             module-aliases
             module-dependencies
             normalize-module-name
+            file-name->module-name
             recursive-module-dependencies
             modules-loaded
             module-loaded?
diff --git a/gnu/system/mapped-devices.scm b/gnu/system/mapped-devices.scm
index c452bdd894..aec49322e7 100644
--- a/gnu/system/mapped-devices.scm
+++ b/gnu/system/mapped-devices.scm
@@ -21,7 +21,7 @@
 (define-module (gnu system mapped-devices)
   #:use-module (guix gexp)
   #:use-module (guix records)
-  #:use-module (guix modules)
+  #:use-module ((guix modules) #:hide (file-name->module-name))
   #:use-module (guix i18n)
   #:use-module ((guix utils)
                 #:select (source-properties->location
@@ -33,7 +33,7 @@
   #:autoload   (gnu build file-systems) (find-partition-by-luks-uuid)
   #:autoload   (gnu build linux-modules)
                  (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 linux) (mdadm-static)
   #: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
           ;; instead of hyphens.  MODULES is a list of module names, whereas
           ;; 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)
         (raise (condition
                 (&message
-- 
cgit v1.2.3