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

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

This reverts commit 50dbc03647.
This commit is contained in:
David Craven 2016-09-29 12:50:47 +02:00
parent d06ce0466f
commit b9f7895d39
No known key found for this signature in database
GPG key ID: C5E051C79C0BECDB

View file

@ -188,7 +188,18 @@ (define* (kernel-config arch #:key variant)
(define %default-extra-linux-options (define %default-extra-linux-options
`(;; https://lists.gnu.org/archive/html/guix-devel/2014-04/msg00039.html `(;; 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) (define (config->string options)
(string-join (map (match-lambda (string-join (map (match-lambda