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

[Ludovic Courtès]

civodul pushed a commit to branch master
in repository guix.

commit 493c245b8f464b5ad1b93caecc589a8e3cabcf0b
Author: Ludovic Courtès <address@hidden>
Date:   Tue Jan 27 21:24:32 2015 +0100

    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'.
---
 gnu/system/linux-initrd.scm |    6 ++++--
 gnu/system/vm.scm           |    7 +++----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/gnu/system/linux-initrd.scm b/gnu/system/linux-initrd.scm
index e72d050..e66d9fe 100644
--- a/gnu/system/linux-initrd.scm
+++ b/gnu/system/linux-initrd.scm
@@ -184,8 +184,10 @@ loaded at boot time in the order in which they appear."
 
   (define linux-modules
     ;; Modules added to the initrd and loaded from the initrd.
-    `("ahci"                                   ;for SATA controllers
-      "pata_acpi" "pata_atiixp"                ;for ATA controllers
+    `("ahci"                                  ;for SATA 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?)
             virtio-modules
             '())
diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm
index 4374256..c93e26d 100644
--- a/gnu/system/vm.scm
+++ b/gnu/system/vm.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2013, 2014 Ludovic Courtès <address@hidden>
+;;; Copyright © 2013, 2014, 2015 Ludovic Courtès <address@hidden>
 ;;;
 ;;; 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)
               ;; Since this is meant to be used on real hardware, don't
-              ;; install QEMU networking or anything like that, but make sure
-              ;; USB mass storage devices are available.
+              ;; install QEMU networking or anything like that.  Assume USB
+              ;; mass storage devices (usb-storage.ko) are available.
               (initrd (lambda (file-systems . rest)
                         (apply base-initrd file-systems
                                #:volatile-root? #t
-                               #:extra-modules '("usb-storage.ko")
                                rest)))
 
               ;; Force our own root file system.