05/08: linux-modules: Add 'current-kernel-directory'.

[Ludovic Courtès]

civodul pushed a commit to branch master
in repository guix.

commit a57df67b5932c7f458d4a31a82a477634d6af1a0
Author: Ludovic Courtès <address@hidden>
Date:   Wed Mar 14 23:09:57 2018 +0100

    linux-modules: Add 'current-kernel-directory'.
    
    * gnu/build/linux-modules.scm (current-kernel-directory): New procedure.
    (current-alias-file): Use it.
---
 gnu/build/linux-modules.scm | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/gnu/build/linux-modules.scm b/gnu/build/linux-modules.scm
index 4fe673c..3dd60f4 100644
--- a/gnu/build/linux-modules.scm
+++ b/gnu/build/linux-modules.scm
@@ -357,12 +357,15 @@ and each module is a module name like \"snd_hda_intel\"."
          (()                                      ;empty line
           (loop aliases)))))))
 
-(define (current-alias-file)
-  "Return the absolute file name of the default 'modules.alias' file."
+(define (current-kernel-directory)
+  "Return the directory of the currently running Linux kernel."
   (string-append (or (getenv "LINUX_MODULE_DIRECTORY")
                      "/run/booted-system/kernel/lib/modules")
-                 "/" (utsname:release (uname))
-                 "/" "modules.alias"))
+                 "/" (utsname:release (uname))))
+
+(define (current-alias-file)
+  "Return the absolute file name of the default 'modules.alias' file."
+  (string-append (current-kernel-directory) "/modules.alias"))
 
 (define* (known-module-aliases #:optional (alias-file (current-alias-file)))
   "Return the list of alias/module pairs read from ALIAS-FILE.  Each alias is