mapped-devices: luks: Specify modules needed at the top-level.
Fixes <https://issues.guix.gnu.org/70266>. * gnu/system/mapped-devices.scm (luks-device-mapping)[modules]: New field. (open-luks-device): Remove non-top-level ‘use-modules’ form. * gnu/system/linux-initrd.scm (raw-initrd): Remove modules that were added specifically for ‘luks-device-mapping’. Change-Id: I4253c3dd5e3cbcee41ec84fd57227abd428d1bd6master
parent
6062339156
commit
49f82fca41
|
@ -252,13 +252,6 @@ upon error."
|
|||
(srfi srfi-1) ;for lvm-device-mapping
|
||||
(srfi srfi-26)
|
||||
|
||||
;; FIXME: The following modules are for
|
||||
;; LUKS-DEVICE-MAPPING. We should instead propagate
|
||||
;; this info via gexps.
|
||||
((gnu build file-systems)
|
||||
#:select (find-partition-by-luks-uuid))
|
||||
(rnrs bytevectors))
|
||||
|
||||
;; Load extra modules needed by the mapped device code.
|
||||
#$@(append-map (compose mapped-device-kind-modules
|
||||
mapped-device-type)
|
||||
|
|
|
@ -206,12 +206,6 @@ option of @command{guix system}.\n")
|
|||
(uuid-bytevector source)
|
||||
source))
|
||||
(keyfile #$key-file))
|
||||
;; XXX: 'use-modules' should be at the top level.
|
||||
(use-modules (rnrs bytevectors) ;bytevector?
|
||||
((gnu build file-systems)
|
||||
#:select (find-partition-by-luks-uuid
|
||||
system*/tty))
|
||||
((guix build utils) #:select (mkdir-p)))
|
||||
|
||||
;; Create '/run/cryptsetup/' if it does not exist, as device locking
|
||||
;; is mandatory for LUKS2.
|
||||
|
@ -287,7 +281,10 @@ option of @command{guix system}.\n")
|
|||
(mapped-device-kind
|
||||
(open open-luks-device)
|
||||
(close close-luks-device)
|
||||
(check check-luks-device)))
|
||||
(check check-luks-device)
|
||||
(modules '((rnrs bytevectors) ;bytevector?
|
||||
((gnu build file-systems)
|
||||
#:select (find-partition-by-luks-uuid system*/tty))))))
|
||||
|
||||
(define* (luks-device-mapping-with-options #:key key-file)
|
||||
"Return a luks-device-mapping object with open modified to pass the arguments
|
||||
|
|
Reference in New Issue