From 14c8728f0d812ea2c396b3c0564fa8da1202f430 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 6 Jul 2025 16:54:28 +0200 Subject: mapped-devices: luks: Adjust to support extra arguments. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes . When using ‘luks-device-mapping-with-options’, procedures such as ‘operating-system-boot-mapped-devices’ would fail to identify LUKS mapped devices because they would check whether the mapped device type is ‘eq?’ to ‘luks-device-mapping’. This addresses that by ensuring mapped devices are always of the ‘luks-device-mapping’ type, even when different options are used. * gnu/system/mapped-devices.scm (close-luks-device): Add #:rest. (luks-device-mapping-with-options): Deprecate. * gnu/tests/install.scm (%encrypted-home-os-key-file): Update accordingly. * doc/guix.texi (Mapped Devices): Document use of the ‘arguments’ field of ‘luks-device-mapping’. Remove ‘luks-device-mapping-with-options’ documentation. (Bootloader Configuration): Update example with key file in extra initrd. Change-Id: I5442908cb8ef4e3891dbb053cccf5e42b895486f Reported-by: Tadhg McDonald-Jensen --- gnu/tests/install.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/tests') diff --git a/gnu/tests/install.scm b/gnu/tests/install.scm index 7ef0cae73bd..97c3505fb09 100644 --- a/gnu/tests/install.scm +++ b/gnu/tests/install.scm @@ -1078,8 +1078,8 @@ launched as a shepherd service." (mapped-devices (list (mapped-device (source (uuid "12345678-1234-1234-1234-123456789abc")) (target "the-home-device") - (type (luks-device-mapping-with-options - #:key-file "/key-file.bin"))))) + (type luks-device-mapping) + (arguments '(#:key-file "/key-file.bin"))))) (file-systems (cons* (file-system (device (file-system-label "root-fs")) (mount-point "/") -- cgit v1.3