unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: "Ludovic Courtès" <ludo@gnu.org>
To: 44169@debbugs.gnu.org
Cc: "Ludovic Courtès" <ludo@gnu.org>
Subject: [bug#44169] [PATCH 3/3] installer: Use UUIDs in the 'swap-devices' field.
Date: Fri, 23 Oct 2020 12:07:54 +0200	[thread overview]
Message-ID: <20201023100754.20924-3-ludo@gnu.org> (raw)
In-Reply-To: <20201023100754.20924-1-ludo@gnu.org>

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/parted.scm | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

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
-- 
2.28.0





  parent reply	other threads:[~2020-10-23 10:10 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-10-23  9:58 [bug#44169] [PATCH 0/3] Referring to swap with UUIDs and labels Ludovic Courtès
2020-10-23 10:07 ` [bug#44169] [PATCH 1/3] file-systems: Allow swap space lookup by UUID/label Ludovic Courtès
2020-10-23 10:07   ` [bug#44169] [PATCH 2/3] services: swap: Allow for UUIDs and file system labels Ludovic Courtès
2020-10-23 10:07   ` Ludovic Courtès [this message]
2020-10-23 11:50     ` [bug#44169] [PATCH 3/3] installer: Use UUIDs in the 'swap-devices' field Mathieu Othacehe
2020-10-26 10:18       ` Ludovic Courtès
2020-10-26 12:06         ` Mathieu Othacehe
2020-10-28 13:58           ` Ludovic Courtès
2020-10-30  0:17             ` bug#44169: " Ludovic Courtès
2020-11-01 18:18               ` [bug#44169] " Mathieu Othacehe
2020-10-23 11:43   ` [bug#44169] [PATCH 1/3] file-systems: Allow swap space lookup by UUID/label Mathieu Othacehe
2020-10-23 16:31     ` Ludovic Courtès
2020-10-23 17:02       ` Mathieu Othacehe
2020-10-24 15:07         ` Ludovic Courtès
2020-10-26 11:56           ` Mathieu Othacehe
2020-10-28 13:54             ` [bug#44169] [PATCH v2 " Ludovic Courtès
2020-10-28 13:54               ` [bug#44169] [PATCH v2 2/3] services: swap: Allow for UUIDs and file system labels Ludovic Courtès
2020-10-28 13:54               ` [bug#44169] [PATCH v2 3/3] installer: Use UUIDs in the 'swap-devices' field Ludovic Courtès

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20201023100754.20924-3-ludo@gnu.org \
    --to=ludo@gnu.org \
    --cc=44169@debbugs.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).