From mboxrd@z Thu Jan 1 00:00:00 1970 From: Marius Bakke Subject: [PATCH 2/6] linux-initrd: Support FAT filesystems. Date: Sat, 5 Nov 2016 12:55:07 +0000 Message-ID: <20161105125511.29383-3-mbakke@fastmail.com> References: <20161105125511.29383-1-mbakke@fastmail.com> Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:38705) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c30Va-0001R7-Br for guix-devel@gnu.org; Sat, 05 Nov 2016 08:55:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1c30VZ-00015s-Im for guix-devel@gnu.org; Sat, 05 Nov 2016 08:55:42 -0400 Received: from out2-smtp.messagingengine.com ([66.111.4.26]:59112) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1c30VZ-00015C-Fn for guix-devel@gnu.org; Sat, 05 Nov 2016 08:55:41 -0400 In-Reply-To: <20161105125511.29383-1-mbakke@fastmail.com> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: guix-devel@gnu.org Cc: Marius Bakke * 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) '()))) -- 2.10.2