summaryrefslogtreecommitdiff
path: root/gnu/system.scm
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2015-04-05 22:47:16 +0200
committerLudovic Courtès <ludo@gnu.org>2015-04-05 23:15:20 +0200
commit0d275f4aa3d1457658fa754e6a0c07fbcc4b88af (patch)
treeee46ca7170a2b8a30bbde43d0cf0b0c321b0ee13 /gnu/system.scm
parent59446b208c9b3a9f1901cd6ba518768220903dc9 (diff)
downloadpatches-0d275f4aa3d1457658fa754e6a0c07fbcc4b88af.tar
patches-0d275f4aa3d1457658fa754e6a0c07fbcc4b88af.tar.gz
system: Take kernel modules from the user-specified kernel.
* gnu/system/linux-initrd.scm (base-initrd): Add #:linux option to specify the linux kernel to use. * gnu/system/vm.scm (expression->derivation-in-linux-vm): Propagate #:linux to base-initrd. * gnu/system.scm (operating-system-initrd-file): Pass #:linux to 'make-initrd'. Co-authored-by: Ludovic Courtès <ludo@gnu.org>
Diffstat (limited to 'gnu/system.scm')
-rw-r--r--gnu/system.scm1
1 files changed, 1 insertions, 0 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"))))