diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2020-10-23 11:31:56 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2020-10-30 01:14:21 +0100 |
| commit | 1c6d98533153bc8e0e36236e7fbcf1eb5e178d26 (patch) | |
| tree | fbf06a3262fa92122aedeec1bdba902cfb1f41a6 /gnu/installer/parted.scm | |
| parent | 81c3dd9cad29f2b0999aa1f22b3a7d4c04f1a842 (diff) | |
| download | guix-1c6d98533153bc8e0e36236e7fbcf1eb5e178d26.tar guix-1c6d98533153bc8e0e36236e7fbcf1eb5e178d26.tar.gz | |
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.scm | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/gnu/installer/parted.scm b/gnu/installer/parted.scm index fffd5abf3b..d799ee0e73 100644 --- a/gnu/installer/parted.scm +++ b/gnu/installer/parted.scm @@ -1327,7 +1327,12 @@ USER-PARTITIONS, or return nothing." ,@(initrd-configuration user-partitions) ,@(if (null? swap-devices) '() - `((swap-devices (list ,@swap-devices)))) + (let* ((uuids (map (lambda (file) + (uuid->string (read-partition-uuid file))) + swap-devices))) + `((swap-devices (list ,@(map (lambda (uuid) + `(uuid ,uuid)) + uuids)))))) ,@(if (null? encrypted-partitions) '() `((mapped-devices |