summary refs log tree commit diff
path: root/gnu/system/vm.scm
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2015-01-27 21:24:32 +0100
committerLudovic Courtès <ludo@gnu.org>2015-01-27 21:32:06 +0100
commit493c245b8f464b5ad1b93caecc589a8e3cabcf0b (patch)
tree2c4e4b2388745585ec701e92cd1b425ce9595d50 /gnu/system/vm.scm
parentd021d2517574ab2d60662c613b1bcebe1a8226d4 (diff)
downloadguix-493c245b8f464b5ad1b93caecc589a8e3cabcf0b.tar.gz
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'.
Diffstat (limited to 'gnu/system/vm.scm')
-rw-r--r--gnu/system/vm.scm7
1 files changed, 3 insertions, 4 deletions
diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm
index 4374256530..c93e26d65f 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 <ludo@gnu.org>
+;;; Copyright © 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org>
 ;;;
 ;;; 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.