aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gnu/system.scm1
-rw-r--r--gnu/system/linux-initrd.scm13
-rw-r--r--gnu/system/vm.scm1
3 files changed, 9 insertions, 6 deletions
diff --git a/gnu/system.scm b/gnu/system.scm
index 0d510b623b..ece61adb2b 100644
--- a/gnu/system.scm
+++ b/gnu/system.scm
@@ -737,6 +737,7 @@ we're running in the final root."
(operating-system-initrd os))
(mlet %store-monad ((initrd (make-initrd boot-file-systems
+ #:linux (operating-system-kernel os)
#:mapped-devices mapped-devices)))
(return #~(string-append #$initrd "/initrd"))))
diff --git a/gnu/system/linux-initrd.scm b/gnu/system/linux-initrd.scm
index 9feb8f73e6..0e5334cf79 100644
--- a/gnu/system/linux-initrd.scm
+++ b/gnu/system/linux-initrd.scm
@@ -143,16 +143,17 @@ initrd code."
(define* (base-initrd file-systems
#:key
+ (linux linux-libre)
(mapped-devices '())
qemu-networking?
virtio?
volatile-root?
(extra-modules '()))
- "Return a monadic derivation that builds a generic initrd. FILE-SYSTEMS is
-a list of file-systems to be mounted by the initrd, possibly in addition to
-the root file system specified on the kernel command line via '--root'.
-MAPPED-DEVICES is a list of device mappings to realize before FILE-SYSTEMS are
-mounted.
+ "Return a monadic derivation that builds a generic initrd, with kernel
+modules taken from LINUX. FILE-SYSTEMS is a list of file-systems to be
+mounted by the initrd, possibly in addition to the root file system specified
+on the kernel command line via '--root'. MAPPED-DEVICES is a list of device
+mappings to realize before FILE-SYSTEMS are mounted.
When QEMU-NETWORKING? is true, set up networking with the standard QEMU
parameters. When VIRTIO? is true, load additional modules so the initrd can
@@ -224,7 +225,7 @@ loaded at boot time in the order in which they appear."
(open source target)))
mapped-devices))
- (mlet %store-monad ((kodir (flat-linux-module-directory linux-libre
+ (mlet %store-monad ((kodir (flat-linux-module-directory linux
linux-modules)))
(expression->initrd
#~(begin
diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm
index c93e26d65f..e194ed6cf1 100644
--- a/gnu/system/vm.scm
+++ b/gnu/system/vm.scm
@@ -149,6 +149,7 @@ made available under the /xchg CIFS share."
(initrd (if initrd ; use the default initrd?
(return initrd)
(base-initrd %linux-vm-file-systems
+ #:linux linux
#:virtio? #t
#:qemu-networking? #t))))