From 5c7dd5ac3ae20da352b953cf8bb55baadd1274e1 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 21 Feb 2016 12:49:27 +0100 Subject: linux-modules: Use normalized module names for 'modprobe.blacklist'. * gnu/build/linux-modules.scm (normalize-module-name): New procedure. (file-name->module-name): Use it. (module-black-list): Expound docstring. --- gnu/build/linux-modules.scm | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) (limited to 'gnu/build') diff --git a/gnu/build/linux-modules.scm b/gnu/build/linux-modules.scm index bbe1a74d85..d7feb3a080 100644 --- a/gnu/build/linux-modules.scm +++ b/gnu/build/linux-modules.scm @@ -96,10 +96,20 @@ contains module names, not actual file names." name (dot-ko name))) +(define (normalize-module-name module) + "Return the \"canonical\" name for MODULE, replacing hyphens with +underscores." + ;; See 'modname_normalize' in libkmod. + (string-map (lambda (chr) + (case chr + ((#\-) #\_) + (else chr))) + module)) + (define (file-name->module-name file) - "Return the module name corresponding to FILE, stripping the trailing '.ko', -etc." - (basename file ".ko")) + "Return the module name corresponding to FILE, stripping the trailing '.ko' +and normalizing it." + (normalize-module-name (basename file ".ko"))) (define* (recursive-module-dependencies files #:key (lookup-module dot-ko)) @@ -138,7 +148,9 @@ LOOKUP-MODULE to the module name." (define (module-black-list) "Return the black list of modules that must not be loaded. This black list is specified using 'modprobe.blacklist=MODULE1,MODULE2,...' on the kernel -command line; it is honored by libkmod." +command line; it is honored by libkmod for users that pass +'KMOD_PROBE_APPLY_BLACKLIST', which includes 'modprobe --use-blacklist' and +udev." (define parameter "modprobe.blacklist=") -- cgit v1.2.3