summary refs log tree commit diff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2018-03-03 00:04:17 +0100
committerLudovic Courtès <ludo@gnu.org>2018-03-03 09:41:21 +0100
commit3cb3a4e6e5c8252829a4ef9fd3d0f897c0c5e53f (patch)
tree01a54c32cbf324424a6204fb2102137517bcfc64
parent3ede1550e8310a8a544c1fb0f7f372c60c00bbe0 (diff)
downloadguix-3cb3a4e6e5c8252829a4ef9fd3d0f897c0c5e53f.tar.gz
linux-initrd: 'file-system-modules' returns the right module list.
Fixes a bug whereby, for an "iso9660" file system, it would return
'("iso9660" "isofs"), i.e., both the key and the value.

Reported by Danny Milosavljevic <dannym@scratchpost.org>
at <https://debbugs.gnu.org/cgi/bugreport.cgi?bug=30629#115>.

* gnu/system/linux-initrd.scm (lookup-procedure): 'vhash-assoc' returns
a key/value pair; match it.
-rw-r--r--gnu/system/linux-initrd.scm4
1 files changed, 2 insertions, 2 deletions
diff --git a/gnu/system/linux-initrd.scm b/gnu/system/linux-initrd.scm
index e7f97bb88d..7a7592bf0a 100644
--- a/gnu/system/linux-initrd.scm
+++ b/gnu/system/linux-initrd.scm
@@ -262,8 +262,8 @@ FILE-SYSTEMS."
      (let ((table (vhash mapping ...)))
        (lambda (key)
          (match (vhash-assoc key table)
-           (#f    default)
-           (value value)))))))
+           (#f            default)
+           ((key . value) value)))))))
 
 (define file-system-type-modules
   ;; Given a file system type, return the list of modules it needs.