From patchwork Fri Oct 23 10:07:54 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 24755 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id DC7C427BBF0; Fri, 23 Oct 2020 11:09:58 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 7EB7927BBEE for ; Fri, 23 Oct 2020 11:09:58 +0100 (BST) Received: from localhost ([::1]:34100 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kVu1F-0004tl-OV for patchwork@mira.cbaines.net; Fri, 23 Oct 2020 06:09:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36848) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kVu0M-0004Rp-SY for guix-patches@gnu.org; Fri, 23 Oct 2020 06:09:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:43861) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kVu0M-00006G-Hg for guix-patches@gnu.org; Fri, 23 Oct 2020 06:09:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kVu0M-0002ld-DT for guix-patches@gnu.org; Fri, 23 Oct 2020 06:09:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#44169] [PATCH 3/3] installer: Use UUIDs in the 'swap-devices' field. Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 23 Oct 2020 10:09:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 44169 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 44169@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= Received: via spool by 44169-submit@debbugs.gnu.org id=B44169.160344769410561 (code B ref 44169); Fri, 23 Oct 2020 10:09:02 +0000 Received: (at 44169) by debbugs.gnu.org; 23 Oct 2020 10:08:14 +0000 Received: from localhost ([127.0.0.1]:55405 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kVtza-0002kH-Bp for submit@debbugs.gnu.org; Fri, 23 Oct 2020 06:08:14 -0400 Received: from eggs.gnu.org ([209.51.188.92]:36622) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kVtzU-0002jb-Sk for 44169@debbugs.gnu.org; Fri, 23 Oct 2020 06:08:09 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:38523) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kVtzP-0008B0-MP; Fri, 23 Oct 2020 06:08:03 -0400 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=55072 helo=gnu.org) by fencepost.gnu.org with esmtpsa (TLS1.2:DHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1kVtzP-0007jR-7o; Fri, 23 Oct 2020 06:08:03 -0400 From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Fri, 23 Oct 2020 12:07:54 +0200 Message-Id: <20201023100754.20924-3-ludo@gnu.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201023100754.20924-1-ludo@gnu.org> References: <20201023100754.20924-1-ludo@gnu.org> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches 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