diff options
Diffstat (limited to 'gnu/system')
| -rw-r--r-- | gnu/system/install.scm | 4 | ||||
| -rw-r--r-- | gnu/system/linux-initrd.scm | 6 | ||||
| -rw-r--r-- | gnu/system/uuid.scm | 7 |
3 files changed, 14 insertions, 3 deletions
diff --git a/gnu/system/install.scm b/gnu/system/install.scm index 4d1612ac7f..c15c2c7814 100644 --- a/gnu/system/install.scm +++ b/gnu/system/install.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2015 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2016 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com> -;;; Copyright © 2017 Tobias Geerinckx-Rice <me@tobias.gr> +;;; Copyright © 2017, 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; ;;; This file is part of GNU Guix. ;;; @@ -38,6 +38,7 @@ #:use-module (gnu packages bash) #:use-module (gnu packages bootloaders) #:use-module (gnu packages certs) + #:use-module (gnu packages file-systems) #:use-module (gnu packages fonts) #:use-module (gnu packages fontutils) #:use-module (gnu packages guile) @@ -488,6 +489,7 @@ Access documentation at any time by pressing Alt-F2.\x1b[0m mdadm dosfstools ;mkfs.fat, for the UEFI boot partition btrfs-progs + jfsutils openssh ;we already have sshd, having ssh/scp can help wireless-tools iw wpa-supplicant-minimal iproute ;; XXX: We used to have GNU fdisk here, but as of version 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 <mhw@netris.org> ;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org> ;;; Copyright © 2017, 2019 Mathieu Othacehe <m.othacehe@gmail.com> +;;; Copyright © 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; ;;; 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) diff --git a/gnu/system/uuid.scm b/gnu/system/uuid.scm index e7a3a0439d..225959e2b7 100644 --- a/gnu/system/uuid.scm +++ b/gnu/system/uuid.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2017 Danny Milosavljevic <dannym@scratchpost.org> +;;; Copyright © 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; ;;; This file is part of GNU Guix. ;;; @@ -43,6 +44,7 @@ string->ext4-uuid string->btrfs-uuid string->fat-uuid + string->jfs-uuid iso9660-uuid->string ;; XXX: For lack of a better place. @@ -202,6 +204,7 @@ ISO9660 UUID representation." (define string->ext3-uuid string->dce-uuid) (define string->ext4-uuid string->dce-uuid) (define string->btrfs-uuid string->dce-uuid) +(define string->jfs-uuid string->dce-uuid) (define-syntax vhashq (syntax-rules (=>) @@ -215,13 +218,13 @@ ISO9660 UUID representation." (define %uuid-parsers (vhashq - ('dce 'ext2 'ext3 'ext4 'btrfs 'luks => string->dce-uuid) + ('dce 'ext2 'ext3 'ext4 'btrfs 'jfs 'luks => string->dce-uuid) ('fat32 'fat16 'fat => string->fat-uuid) ('iso9660 => string->iso9660-uuid))) (define %uuid-printers (vhashq - ('dce 'ext2 'ext3 'ext4 'btrfs 'luks => dce-uuid->string) + ('dce 'ext2 'ext3 'ext4 'btrfs 'jfs 'luks => dce-uuid->string) ('iso9660 => iso9660-uuid->string) ('fat32 'fat16 'fat => fat-uuid->string))) |