From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id uC9HCPijeV+YDgAA0tVLHw (envelope-from ) for ; Sun, 04 Oct 2020 10:29:12 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id IOYiBPijeV9jYgAA1q6Kng (envelope-from ) for ; Sun, 04 Oct 2020 10:29:12 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id AB1D2940142 for ; Sun, 4 Oct 2020 10:29:11 +0000 (UTC) Received: from localhost ([::1]:56808 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kP1GP-0000zA-Mc for larch@yhetil.org; Sun, 04 Oct 2020 06:29:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43516) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kP1GI-0000yq-Ti for guix-patches@gnu.org; Sun, 04 Oct 2020 06:29:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:33456) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kP1GI-0008F0-LB for guix-patches@gnu.org; Sun, 04 Oct 2020 06:29:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kP1GI-0005a4-Gc for guix-patches@gnu.org; Sun, 04 Oct 2020 06:29:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#41143] [PATCH v2 1/2] mapped-devices: Allow target to be list of strings. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 04 Oct 2020 10:29:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 41143 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Mikhail Tsykalov Cc: 41143@debbugs.gnu.org Received: via spool by 41143-submit@debbugs.gnu.org id=B41143.160180732521424 (code B ref 41143); Sun, 04 Oct 2020 10:29:02 +0000 Received: (at 41143) by debbugs.gnu.org; 4 Oct 2020 10:28:45 +0000 Received: from localhost ([127.0.0.1]:45000 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kP1G1-0005ZT-5L for submit@debbugs.gnu.org; Sun, 04 Oct 2020 06:28:45 -0400 Received: from eggs.gnu.org ([209.51.188.92]:36660) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kP1Fx-0005ZC-QZ for 41143@debbugs.gnu.org; Sun, 04 Oct 2020 06:28:43 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:39718) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kP1Fs-0008CY-I9; Sun, 04 Oct 2020 06:28:36 -0400 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=46166 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1kP1Fq-0002bU-Dt; Sun, 04 Oct 2020 06:28:34 -0400 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= References: <87pn69j09o.fsf@gnu.org> <20201001224900.28989-1-tsymsh@gmail.com> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: 13 =?UTF-8?Q?Vend=C3=A9miaire?= an 229 de la =?UTF-8?Q?R=C3=A9volution?= X-PGP-Key-ID: 0x090B11993D9AEBB5 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-pc-linux-gnu Date: Sun, 04 Oct 2020 12:28:32 +0200 In-Reply-To: <20201001224900.28989-1-tsymsh@gmail.com> (Mikhail Tsykalov's message of "Fri, 2 Oct 2020 01:48:59 +0300") Message-ID: <874knaffov.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -3.3 (---) X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Spam-Score: -1.51 X-TUID: 6Cp1EUh7CBCm Hi Mikhail, Mikhail Tsykalov skribis: > * gnu/system/mapped-devices.scm (): Rename constructor to > %mapped-device. > [target]: Remove field. > [targets]: New field. Adjust users. > (mapped-device-compatibility-helper, mapped-device): New macros. > (mapped-device-target): New deprecated procedure. Thanks for following up. I think we=E2=80=99re almost done, some comments below: > --- a/gnu/system/linux-initrd.scm > +++ b/gnu/system/linux-initrd.scm > @@ -196,7 +196,7 @@ upon error." > ;; List of gexps to open the mapped devices. > (map (lambda (md) > (let* ((source (mapped-device-source md)) > - (target (mapped-device-target md)) > + (target (mapped-device-targets md)) I think we should write =E2=80=98targets=E2=80=99 (plural) everywhere. Tha= t can help avoid confusion IMO. > - #$target))))) > + #$(car target)))))) >=20=20 > (define (close-luks-device source target) > "Return a gexp that closes TARGET, a LUKS device." > #~(zero? (system* #$(file-append cryptsetup-static "/sbin/cryptsetup") > - "close" #$target))) > + "close" #$(car target)))) As per our coding convention (info "(guix) Data Types and Pattern Matching"), I=E2=80=99d recommend using =E2=80=98match=E2=80=99 (define (close-luks-device source targets) (match targets ((target) #~(zero? (system* =E2=80=A6 #$target))))) That has the added benefit that it errors out if TARGETS is not exactly a one-element list. > (define (close-raid-device sources target) > "Return a gexp that stops the RAID device TARGET." > #~(zero? (system* #$(file-append mdadm-static "/sbin/mdadm") > - "--stop" #$target))) > + "--stop" #$(car target)))) Same here. Could you also update =E2=80=9CMapped Devices=E2=80=9D in doc/guix.texi to = mention the new =E2=80=98targets=E2=80=99 field? Thanks, Ludo=E2=80=99.