diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2017-05-22 14:56:50 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2017-05-22 14:56:50 +0200 |
| commit | e4cddbbcac752090585baed5b15e2eb4af713284 (patch) | |
| tree | 7a103d8d96beeb4ae5a28b1f575a70a0b6514501 /gnu/system/linux-initrd.scm | |
| parent | 98bb983ca7ea2b393021bfee155a72b1c6183f72 (diff) | |
| parent | 74297231be34afbd9d0182651a75f40c60973ec3 (diff) | |
| download | guix-e4cddbbcac752090585baed5b15e2eb4af713284.tar guix-e4cddbbcac752090585baed5b15e2eb4af713284.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/system/linux-initrd.scm')
| -rw-r--r-- | gnu/system/linux-initrd.scm | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/gnu/system/linux-initrd.scm b/gnu/system/linux-initrd.scm index dfe198e43e..3a5e76034a 100644 --- a/gnu/system/linux-initrd.scm +++ b/gnu/system/linux-initrd.scm @@ -268,6 +268,7 @@ loaded at boot time in the order in which they appear." "usbhid" "hid-generic" "hid-apple" ;keyboards during early boot "dm-crypt" "xts" "serpent_generic" "wp512" ;for encrypted root partitions "nvme" ;for new SSD NVMe devices + "nls_iso8859-1" ;for `mkfs.fat`, et.al ,@(if (string-match "^(x86_64|i[3-6]86)-" (%current-system)) '("pata_acpi" "pata_atiixp" ;for ATA controllers "isci") ;for SAS controllers like Intel C602 @@ -281,9 +282,6 @@ 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 (find (file-system-type-predicate "btrfs") file-systems) '("btrfs") '()) |