Patchwork [2/6] linux-initrd: Support FAT filesystems.

login
register
mail settings
Submitter Marius Bakke
Date Nov. 5, 2016, 12:55 p.m.
Message ID <20161105125511.29383-3-mbakke@fastmail.com>
Download mbox | patch
Permalink /patch/17222/
State New
Headers show

Comments

Marius Bakke - Nov. 5, 2016, 12:55 p.m.
* 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(+)
Ludovic Courtès - Nov. 6, 2016, 9:44 p.m.
Marius Bakke <mbakke@fastmail.com> skribis:

> * 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).

Simply write “in 'helper-packages'” and “in 'linux-modules'”.

Otherwise LGTM, thanks!

Ludo’.

Patch

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)
             '())))