nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

linux-initrd: Add USB kernel modules to the default initrd. 

* gnu/system/linux-initrd.scm (base-initrd)[linux-modules]: Add
  usb-storage, uas, usbkbd, and usbhid.
* gnu/system/vm.scm (system-disk-image): Remove #:extra-modules argument
  to 'base-initrd'.
This commit is contained in:
Ludovic Courtès 2015-01-27 21:24:32 +01:00
parent d021d25175
commit 493c245b8f
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gnu/system/linux-initrd.scm
View File

@ -184,8 +184,10 @@ loaded at boot time in the order in which they appear."
(define linux-modules (define linux-modules
;; Modules added to the initrd and loaded from the initrd. ;; Modules added to the initrd and loaded from the initrd.
`("ahci" ;for SATA controllers `("ahci" ;for SATA controllers
"pata_acpi" "pata_atiixp" ;for ATA controllers "pata_acpi" "pata_atiixp" ;for ATA controllers
"usb-storage" "uas" ;for the installation image etc.
"usbkbd" "usbhid" ;USB keyboards, for debugging
,@(if (or virtio? qemu-networking?) ,@(if (or virtio? qemu-networking?)
virtio-modules virtio-modules
'()) '())

7
gnu/system/vm.scm
View File

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013, 2014 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -278,12 +278,11 @@ to USB sticks meant to be read-only."
(let ((os (operating-system (inherit os) (let ((os (operating-system (inherit os)
;; Since this is meant to be used on real hardware, don't ;; Since this is meant to be used on real hardware, don't
;; install QEMU networking or anything like that, but make sure ;; install QEMU networking or anything like that. Assume USB
;; USB mass storage devices are available. ;; mass storage devices (usb-storage.ko) are available.
(initrd (lambda (file-systems . rest) (initrd (lambda (file-systems . rest)
(apply base-initrd file-systems (apply base-initrd file-systems
#:volatile-root? #t #:volatile-root? #t
#:extra-modules '("usb-storage.ko")
rest))) rest)))
;; Force our own root file system. ;; Force our own root file system.