summaryrefslogtreecommitdiff
path: root/gnu/installer/parted.scm
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2020-10-23 11:31:56 +0200
committerLudovic Courtès <ludo@gnu.org>2020-10-30 01:14:21 +0100
commit1c6d98533153bc8e0e36236e7fbcf1eb5e178d26 (patch)
treefbf06a3262fa92122aedeec1bdba902cfb1f41a6 /gnu/installer/parted.scm
parent81c3dd9cad29f2b0999aa1f22b3a7d4c04f1a842 (diff)
installer: Use UUIDs in the 'swap-devices' field.
Note: This change requires an updated 'guix' package that contains Linux-swap support in (gnu build file-systems). * gnu/installer/parted.scm (user-partitions->configuration): Use UUIDs in the 'swap-devices' field. * gnu/installer/newt/final.scm (run-final-page)[wait-for-clients]: New procedure. Use it. * gnu/installer/tests.scm (choose-partitioning): Wait for 'starting-final-step' message and move configuration file dialog handling to... (conclude-installation): ... here. Send over PORT the reply corresponding to 'starting-final-step'. * gnu/tests/install.scm (gui-test-program): When ENCRYPTED? is false, invoke 'swaplabel' in the marionette. (installation-target-os-for-gui-tests): When ENCRYPTED? is false, except a fixed UUID.
Diffstat (limited to 'gnu/installer/parted.scm')
-rw-r--r--gnu/installer/parted.scm7
1 files changed, 6 insertions, 1 deletions
diff --git a/gnu/installer/parted.scm b/gnu/installer/parted.scm
index fffd5abf3b0..d799ee0e735 100644
--- a/gnu/installer/parted.scm
+++ b/gnu/installer/parted.scm
@@ -1327,7 +1327,12 @@ USER-PARTITIONS, or return nothing."
1327 ,@(initrd-configuration user-partitions) 1327 ,@(initrd-configuration user-partitions)
1328 ,@(if (null? swap-devices) 1328 ,@(if (null? swap-devices)
1329 '() 1329 '()
1330 `((swap-devices (list ,@swap-devices)))) 1330 (let* ((uuids (map (lambda (file)
1331 (uuid->string (read-partition-uuid file)))
1332 swap-devices)))
1333 `((swap-devices (list ,@(map (lambda (uuid)
1334 `(uuid ,uuid))
1335 uuids))))))
1331 ,@(if (null? encrypted-partitions) 1336 ,@(if (null? encrypted-partitions)
1332 '() 1337 '()
1333 `((mapped-devices 1338 `((mapped-devices