~ruther/guix-local: Revert "gnu: %default-extra-linux-options: Remove redundant options."

b9f7895d39b9857ddb893f2fe19d0a4bd6ec53d7 — David Craven 9 years ago d06ce04

Revert "gnu: %default-extra-linux-options: Remove redundant options."

Options aren't redundant and are required for building the initrd.

This reverts commit 50dbc03647170fded9e0bca0cc4b7e1614aa38db.

patch browse .tar.gz

1 files changed, 12 insertions(+), 1 deletions(-)

M gnu/packages/linux.scm

M gnu/packages/linux.scm => gnu/packages/linux.scm +12 -1

@@ 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