summaryrefslogtreecommitdiff
path: root/gnu/system/linux-initrd.scm
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2024-04-08 00:13:25 +0200
committerLudovic Courtès <ludo@gnu.org>2024-04-08 00:13:25 +0200
commit6062339156ecc42cac59af0d34e22fcc7da3aa4a (patch)
treea1642b7b52995e184ca30ef0cf7aa0b852a79b7e /gnu/system/linux-initrd.scm
parentb30b838d5055e36be19d030db28838fec4474d98 (diff)
mapped-devices: <mapped-device-type> can specify modules to import.
* gnu/system/mapped-devices.scm (<mapped-device-type>)[modules]: New field. (device-mapping-service-type): Honor it. * gnu/system/linux-initrd.scm (raw-initrd): Likewise. Change-Id: Icc702cb6f281741975e33203f87fbc1ffa9856da
Diffstat (limited to 'gnu/system/linux-initrd.scm')
-rw-r--r--gnu/system/linux-initrd.scm7
1 files changed, 6 insertions, 1 deletions
diff --git a/gnu/system/linux-initrd.scm b/gnu/system/linux-initrd.scm
index f5d86219a85..7868ff57231 100644
--- a/gnu/system/linux-initrd.scm
+++ b/gnu/system/linux-initrd.scm
@@ -1,5 +1,5 @@
1;;; GNU Guix --- Functional package management for GNU 1;;; GNU Guix --- Functional package management for GNU
2;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org> 2;;; Copyright © 2013-2020, 2024 Ludovic Courtès <ludo@gnu.org>
3;;; Copyright © 2016 Mark H Weaver <mhw@netris.org> 3;;; Copyright © 2016 Mark H Weaver <mhw@netris.org>
4;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org> 4;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org>
5;;; Copyright © 2017, 2019 Mathieu Othacehe <m.othacehe@gmail.com> 5;;; Copyright © 2017, 2019 Mathieu Othacehe <m.othacehe@gmail.com>
@@ -259,6 +259,11 @@ upon error."
259 #:select (find-partition-by-luks-uuid)) 259 #:select (find-partition-by-luks-uuid))
260 (rnrs bytevectors)) 260 (rnrs bytevectors))
261 261
262 ;; Load extra modules needed by the mapped device code.
263 #$@(append-map (compose mapped-device-kind-modules
264 mapped-device-type)
265 mapped-devices))
266
262 (with-output-to-port (%make-void-port "w") 267 (with-output-to-port (%make-void-port "w")
263 (lambda () 268 (lambda ()
264 (set-path-environment-variable "PATH" '("bin" "sbin") 269 (set-path-environment-variable "PATH" '("bin" "sbin")