guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

59/155: linux-initrd: Support FAT filesystems.


From: John Darrington
Subject: 59/155: linux-initrd: Support FAT filesystems.
Date: Wed, 21 Dec 2016 20:48:33 +0000 (UTC)

jmd pushed a commit to branch wip-installer
in repository guix.

commit 8a812b47803794a7216226c5269a565c7cc9e42b
Author: Marius Bakke <address@hidden>
Date:   Thu Nov 3 09:58:34 2016 +0000

    linux-initrd: Support FAT filesystems.
    
    * gnu/system/linux-initrd.scm (base-initrd): When a FAT filesystem is
    present: Add fatfsck/static in 'helper-packages'; and add nls_iso8859-1
    in 'linux-modules'.
---
 gnu/system/linux-initrd.scm |    9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/gnu/system/linux-initrd.scm b/gnu/system/linux-initrd.scm
index 174239a..a787072 100644
--- a/gnu/system/linux-initrd.scm
+++ b/gnu/system/linux-initrd.scm
@@ -29,6 +29,7 @@
                 #:select (derivation->output-path))
   #:use-module (guix modules)
   #:use-module (gnu packages compression)
+  #:use-module (gnu packages disk)
   #:use-module (gnu packages linux)
   #:use-module (gnu packages guile)
   #:use-module ((gnu packages make-bootstrap)
@@ -193,6 +194,9 @@ loaded at boot time in the order in which they appear."
       ,@(if (find (file-system-type-predicate "9p") file-systems)
             virtio-9p-modules
             '())
+      ,@(if (find (file-system-type-predicate "vfat") file-systems)
+            '("nls_iso8859-1")
+            '())
       ,@(if volatile-root?
             '("fuse")
             '())
@@ -205,6 +209,11 @@ loaded at boot time in the order in which they appear."
                   file-systems)
             (list e2fsck/static)
             '())
+      ,@(if (find (lambda (fs)
+                    (string-suffix? "fat" (file-system-type fs)))
+                  file-systems)
+            (list fatfsck/static)
+            '())
       ,@(if volatile-root?
             (list unionfs-fuse/static)
             '())))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]