me
/
guix
Archived
1
0
Fork 0
Code

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: I4253c3dd5e3cbcee41ec84fd57227abd428d1bd6
master
Ludovic Courtès 2024-04-08 00:15:39 +02:00
parent 6062339156
commit 49f82fca41
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
2 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gnu/system/linux-initrd.scm
View File

@ -252,13 +252,6 @@ upon error."
(srfi srfi-1) ;for lvm-device-mapping (srfi srfi-1) ;for lvm-device-mapping
(srfi srfi-26) (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. ;; Load extra modules needed by the mapped device code.
#$@(append-map (compose mapped-device-kind-modules #$@(append-map (compose mapped-device-kind-modules
mapped-device-type) mapped-device-type)

11
gnu/system/mapped-devices.scm
View File

@ -206,12 +206,6 @@ option of @command{guix system}.\n")
(uuid-bytevector source) (uuid-bytevector source)
source)) source))
(keyfile #$key-file)) (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 ;; Create '/run/cryptsetup/' if it does not exist, as device locking
;; is mandatory for LUKS2. ;; is mandatory for LUKS2.
@ -287,7 +281,10 @@ option of @command{guix system}.\n")
(mapped-device-kind (mapped-device-kind
(open open-luks-device) (open open-luks-device)
(close close-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) (define* (luks-device-mapping-with-options #:key key-file)
"Return a luks-device-mapping object with open modified to pass the arguments "Return a luks-device-mapping object with open modified to pass the arguments