From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:35076) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1imoWz-00073r-Bi for guix-patches@gnu.org; Wed, 01 Jan 2020 19:40:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1imoWy-0003zQ-4Q for guix-patches@gnu.org; Wed, 01 Jan 2020 19:40:05 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:60079) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1imoWy-0003yz-0u for guix-patches@gnu.org; Wed, 01 Jan 2020 19:40:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1imoWx-0003el-Ue for guix-patches@gnu.org; Wed, 01 Jan 2020 19:40:03 -0500 Subject: [bug#38860] [PATCH 5/7] linux-initrd: Add support for JFS. Resent-Message-ID: Date: Thu, 2 Jan 2020 01:39:00 +0100 Message-Id: <20200102003902.15205-5-me@tobias.gr> In-Reply-To: <20200102003902.15205-1-me@tobias.gr> References: <20200102003902.15205-1-me@tobias.gr> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" Reply-to: Tobias Geerinckx-Rice , Tobias Geerinckx-Rice via Guix-patches From: Tobias Geerinckx-Rice via Guix-patches via To: 38860@debbugs.gnu.org * gnu/system/linux-initrd.scm (file-system-packages): Add jfs_fsck/static. (file-system-type-modules): Add ‘jfs’ module. --- gnu/system/linux-initrd.scm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/gnu/system/linux-initrd.scm b/gnu/system/linux-initrd.scm index 0efb8fb222..dcc9b6b937 100644 --- a/gnu/system/linux-initrd.scm +++ b/gnu/system/linux-initrd.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2016 Mark H Weaver ;;; Copyright © 2016 Jan Nieuwenhuizen ;;; Copyright © 2017, 2019 Mathieu Othacehe +;;; Copyright © 2019 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -30,6 +31,7 @@ #:use-module (gnu packages compression) #:use-module (gnu packages disk) #:use-module (gnu packages linux) + #:use-module (gnu packages file-systems) #:use-module (gnu packages guile) #:use-module ((gnu packages xorg) #:select (console-setup xkeyboard-config)) @@ -240,6 +242,9 @@ FILE-SYSTEMS." '()) ,@(if (find (file-system-type-predicate "btrfs") file-systems) (list btrfs-progs/static) + '()) + ,@(if (find (file-system-type-predicate "jfs") file-systems) + (list jfs_fsck/static) '()))) (define-syntax vhash ;TODO: factorize @@ -269,6 +274,7 @@ FILE-SYSTEMS." ("9p" => '("9p" "9pnet_virtio")) ("btrfs" => '("btrfs")) ("iso9660" => '("isofs")) + ("jfs" => '("jfs")) (else '()))) (define (file-system-modules file-systems) -- 2.23.0