From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id G8SfCZpedl/bZAAA0tVLHw (envelope-from ) for ; Thu, 01 Oct 2020 22:56:26 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id cAG8BJpedl/HWwAAB5/wlQ (envelope-from ) for ; Thu, 01 Oct 2020 22:56:26 +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 B4B03940366 for ; Thu, 1 Oct 2020 22:56:25 +0000 (UTC) Received: from localhost ([::1]:43316 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kO7Ut-0001GB-Eq for larch@yhetil.org; Thu, 01 Oct 2020 18:56:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49896) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kO7UY-0001En-N5 for guix-patches@gnu.org; Thu, 01 Oct 2020 18:56:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:55387) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kO7UY-0002r3-D7 for guix-patches@gnu.org; Thu, 01 Oct 2020 18:56:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kO7UY-0001tH-9P for guix-patches@gnu.org; Thu, 01 Oct 2020 18:56: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: Mikhail Tsykalov Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 01 Oct 2020 22:56: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: ludo@gnu.org Cc: 41143@debbugs.gnu.org, Mikhail Tsykalov Received: via spool by 41143-submit@debbugs.gnu.org id=B41143.16015929167201 (code B ref 41143); Thu, 01 Oct 2020 22:56:02 +0000 Received: (at 41143) by debbugs.gnu.org; 1 Oct 2020 22:55:16 +0000 Received: from localhost ([127.0.0.1]:38697 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kO7To-0001s5-0f for submit@debbugs.gnu.org; Thu, 01 Oct 2020 18:55:16 -0400 Received: from mail-lf1-f41.google.com ([209.85.167.41]:34574) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kO7Tm-0001rp-7O for 41143@debbugs.gnu.org; Thu, 01 Oct 2020 18:55:15 -0400 Received: by mail-lf1-f41.google.com with SMTP id u8so624794lff.1 for <41143@debbugs.gnu.org>; Thu, 01 Oct 2020 15:55:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=IRizteFNwyomMsE5X0Zz9sFQi78xFaoBzN997H68J0o=; b=OwswxR23coBJBn3g0so76zg/eewaMqm7TAaeuWj/rRkJidnW6yCFitfo0aokP7N8N9 k1xKP9tgWkoPzHec4YoGiW9EYoGi8Xsa++ybGwFJDGT10InlCKH4CFcePDMMVmA/W6IN 49ivt2VKO+gN2NHQLvNCA/j8t2PwQYgLKT3ApNHVNMK4hrJuYuM/ZV1kBpI2fQChDxjH RuZQMs5iBxJgn1CaKYeKAbqQCBU5mzEC757Pt2LohT/S+Bd9WZeUWrEh8ADTfExB4ump G/Zp+YCUiJb4iL8Bvax5z5Y+eJ/bZdrC52MWDBKIRjgCNy9Kl1wGqGfZVECY1QmwuEPS FTPw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=IRizteFNwyomMsE5X0Zz9sFQi78xFaoBzN997H68J0o=; b=UL+m228YUrMcZNRApB6OPO1PnnmbXXn7ikH9i2RRuSzlP8TC7aodftMCC80gPMHeqQ JAB9BseipoN73RORfRh6MwCZomwpoF+TUym0E7e6yjdxE/qWYOMEYDXk69pZRNyV96yD 0B3KKvqm8c8MLoB++qAS0XsQeSpTcapdSJEX10QysYyKetdpfiQkmLUU4I92bE6AD/la WQKW7ds9T2K2ks5CtaPBgwVOEDj5/Z+y1aZndWsVD9UC8y6RPURHCjoxTDThLAUWTBOP JZB1b6py/iJalt1xtnBCv6c+VS5UY6mFVWWXtcFgHkSRdbW13W910N7LW0lm75BorLTa 6+Xw== X-Gm-Message-State: AOAM532mqOUPxai6WyeBwMLy+eiHJsEiiaOqnfqDZ1qGDpun62n/G+Xo CJ8ce0SPPMg3onGS0Zf2ng0= X-Google-Smtp-Source: ABdhPJx0xxfrekldK0mfdl+BkVtuaePdKn55O69SahJsFDW5C5ODcCvmgT6paXTqODcXjErfqnuaHA== X-Received: by 2002:a19:b55:: with SMTP id 82mr3252141lfl.43.1601592907994; Thu, 01 Oct 2020 15:55:07 -0700 (PDT) Received: from localhost.localdomain ([88.201.200.148]) by smtp.googlemail.com with ESMTPSA id 68sm748795lfe.27.2020.10.01.15.55.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Oct 2020 15:55:07 -0700 (PDT) From: Mikhail Tsykalov Date: Fri, 2 Oct 2020 01:48:59 +0300 Message-Id: <20201001224900.28989-1-tsymsh@gmail.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <87pn69j09o.fsf@gnu.org> References: <87pn69j09o.fsf@gnu.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -1.0 (-) 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=fail (rsa verify failed) header.d=gmail.com header.s=20161025 header.b=OwswxR23; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); 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: 5.09 X-TUID: A9Y04TNwTJUU * 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. --- gnu/services/base.scm | 3 ++- gnu/system.scm | 11 +++++----- gnu/system/linux-initrd.scm | 2 +- gnu/system/mapped-devices.scm | 40 ++++++++++++++++++++++++++++------- 4 files changed, 41 insertions(+), 15 deletions(-) diff --git a/gnu/services/base.scm b/gnu/services/base.scm index 04bc991356..4aa14ebf99 100644 --- a/gnu/services/base.scm +++ b/gnu/services/base.scm @@ -291,7 +291,8 @@ FILE-SYSTEM." (define (mapped-device->shepherd-service-name md) "Return the symbol that denotes the shepherd service of MD, a ." (symbol-append 'device-mapping- - (string->symbol (mapped-device-target md)))) + (string->symbol (string-join + (mapped-device-targets md) "-")))) (define dependency->shepherd-service-name (match-lambda diff --git a/gnu/system.scm b/gnu/system.scm index bdb696fe2e..1bb812256f 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -444,9 +444,9 @@ marked as 'needed-for-boot'." (let ((device (file-system-device fs))) (if (string? device) ;title is 'device (filter (lambda (md) - (string=? (string-append "/dev/mapper/" - (mapped-device-target md)) - device)) + (any (cut string=? device <>) + (map (cut string-append "/dev/mapper" <>) + (mapped-device-targets md)))) (operating-system-mapped-devices os)) '()))) @@ -466,11 +466,12 @@ marked as 'needed-for-boot'." (define (mapped-device-users device file-systems) "Return the subset of FILE-SYSTEMS that use DEVICE." - (let ((target (string-append "/dev/mapper/" (mapped-device-target device)))) + (let ((targets (map (cut string-append "/dev/mapper/" <>) + (mapped-device-targets device)))) (filter (lambda (fs) (or (member device (file-system-dependencies fs)) (and (string? (file-system-device fs)) - (string=? (file-system-device fs) target)))) + (any (cut string=? (file-system-device fs) <>) targets)))) file-systems))) (define (operating-system-user-mapped-devices os) diff --git a/gnu/system/linux-initrd.scm b/gnu/system/linux-initrd.scm index b8a30c0abc..db02059a26 100644 --- 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)) (type (mapped-device-type md)) (open (mapped-device-kind-open type))) (open source target))) diff --git a/gnu/system/mapped-devices.scm b/gnu/system/mapped-devices.scm index 31c50c4e40..8622418fcf 100644 --- a/gnu/system/mapped-devices.scm +++ b/gnu/system/mapped-devices.scm @@ -28,6 +28,7 @@ formatted-message &fix-hint &error-location)) + #:use-module (guix deprecation) #:use-module (gnu services) #:use-module (gnu services shepherd) #:use-module (gnu system uuid) @@ -42,10 +43,12 @@ #:use-module (srfi srfi-35) #:use-module (ice-9 match) #:use-module (ice-9 format) - #:export (mapped-device + #:export (%mapped-device + mapped-device mapped-device? mapped-device-source mapped-device-target + mapped-device-targets mapped-device-type mapped-device-location @@ -70,15 +73,36 @@ ;;; ;;; Code: -(define-record-type* mapped-device +(define-record-type* %mapped-device make-mapped-device mapped-device? (source mapped-device-source) ;string | list of strings - (target mapped-device-target) ;string + (targets mapped-device-targets) ;list of strings (type mapped-device-type) ; (location mapped-device-location (default (current-source-location)) (innate))) +(define-syntax mapped-device-compatibility-helper + (syntax-rules (target) + ((_ () (fields ...)) + (%mapped-device fields ...)) + ((_ ((target exp) rest ...) (others ...)) + (%mapped-device others ... + (targets (list exp)) + rest ...)) + ((_ (field rest ...) (others ...)) + (mapped-device-compatibility-helper (rest ...) + (others ... field))))) + +(define-syntax-rule (mapped-device fields ...) + "Build an record, automatically converting 'target' field +specifications to 'targets'." + (mapped-device-compatibility-helper (fields ...) ())) + +(define-deprecated (mapped-device-target md) + mapped-device-targets + (car (mapped-device-targets md))) + (define-record-type* mapped-device-kind make-mapped-device-kind mapped-device-kind? @@ -100,7 +124,7 @@ (($ source target ($ open close)) (shepherd-service - (provision (list (symbol-append 'device-mapping- (string->symbol target)))) + (provision (list (symbol-append 'device-mapping- (string->symbol (string-join target "-"))))) (requirement '(udev)) (documentation "Map a device node using Linux's device mapper.") (start #~(lambda () #$(open source target))) @@ -198,12 +222,12 @@ option of @command{guix system}.\n") (error "LUKS partition not found" source)) source) - #$target))))) + #$(car target)))))) (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)))) (define* (check-luks-device md #:key needed-for-boot? @@ -259,12 +283,12 @@ TARGET (e.g., \"/dev/md0\"), using 'mdadm'." ;; Use 'mdadm-static' rather than 'mdadm' to avoid pulling its whole ;; closure (80 MiB) in the initrd when a RAID device is needed for boot. (zero? (apply system* #$(file-append mdadm-static "/sbin/mdadm") - "--assemble" #$target sources)))) + "--assemble" #$(car target) sources)))) (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)))) (define raid-device-mapping ;; The type of RAID mapped devices. -- 2.28.0