From b9f7895d39b9857ddb893f2fe19d0a4bd6ec53d7 Mon Sep 17 00:00:00 2001 From: David Craven Date: Thu, 29 Sep 2016 12:50:47 +0200 Subject: Revert "gnu: %default-extra-linux-options: Remove redundant options." Options aren't redundant and are required for building the initrd. This reverts commit 50dbc03647170fded9e0bca0cc4b7e1614aa38db. --- gnu/packages/linux.scm | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'gnu/packages/linux.scm') 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 -- cgit v1.2.3