diff options
| author | Mark H Weaver <mhw@netris.org> | 2016-01-19 00:18:37 -0500 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2016-01-19 00:18:37 -0500 |
| commit | afe9f409491a055e5d058c8f747e80d1506391e5 (patch) | |
| tree | 3b3747c9d2df32019a46b283b94f0a7af05ebf1d /gnu/system/linux-initrd.scm | |
| parent | bb8afbf5a1fbc85f700c0e07ce5581637e3674dc (diff) | |
| parent | 1348185ac2bb48b373495830267cff8ddc6b1fa5 (diff) | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/system/linux-initrd.scm')
| -rw-r--r-- | gnu/system/linux-initrd.scm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gnu/system/linux-initrd.scm b/gnu/system/linux-initrd.scm index 6130e020c8..b1ea637de9 100644 --- a/gnu/system/linux-initrd.scm +++ b/gnu/system/linux-initrd.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2013, 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -179,7 +179,7 @@ loaded at boot time in the order in which they appear." ;; Modules added to the initrd and loaded from the initrd. `("ahci" ;for SATA controllers "usb-storage" "uas" ;for the installation image etc. - "usbkbd" "usbhid" ;USB keyboards, for debugging + "usbhid" ;USB keyboards, for debugging "dm-crypt" "xts" ;for encrypted root partitions ,@(if (string-match "^(x86_64|i[3-6]86)-" (%current-system)) '("pata_acpi" "pata_atiixp" ;for ATA controllers |