summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Craven <david@craven.ch>2016-09-29 12:50:47 +0200
committerDavid Craven <david@craven.ch>2016-09-29 12:59:37 +0200
commitb9f7895d39b9857ddb893f2fe19d0a4bd6ec53d7 (patch)
treec9fff40df436aa4c72bfaa2dd48c82816312a61b
parentd06ce0466f2a9a12d2cb9529c1a6179c1f28d7ae (diff)
Revert "gnu: %default-extra-linux-options: Remove redundant options."
Options aren't redundant and are required for building the initrd. This reverts commit 50dbc03647170fded9e0bca0cc4b7e1614aa38db.
-rw-r--r--gnu/packages/linux.scm13
1 files changed, 12 insertions, 1 deletions
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 9c7570a27e..7089af3044 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -188,7 +188,18 @@ for ARCH and optionally VARIANT, or #f if there is no such configuration."
(define %default-extra-linux-options
`(;; https://lists.gnu.org/archive/html/guix-devel/2014-04/msg00039.html
- ("CONFIG_DEVPTS_MULTIPLE_INSTANCES" . #t)))
+ ("CONFIG_DEVPTS_MULTIPLE_INSTANCES" . #t)
+ ;; Modules required for initrd:
+ ("CONFIG_NET_9P" . m)
+ ("CONFIG_NET_9P_VIRTIO" . m)
+ ("CONFIG_VIRTIO_BLK" . m)
+ ("CONFIG_VIRTIO_NET" . m)
+ ("CONFIG_VIRTIO_PCI" . m)
+ ("CONFIG_VIRTIO_BALLOON" . m)
+ ("CONFIG_VIRTIO_MMIO" . m)
+ ("CONFIG_FUSE_FS" . m)
+ ("CONFIG_CIFS" . m)
+ ("CONFIG_9P_FS" . m)))
(define (config->string options)
(string-join (map (match-lambda