From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 863D575A0B for ; Tue, 13 Jul 2021 12:08:55 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 8404F1FBDF for ; Tue, 13 Jul 2021 12:08:55 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id E156A1FBD1 for ; Tue, 13 Jul 2021 12:08:54 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id B9F8540E24 for ; Tue, 13 Jul 2021 12:08:54 +0200 (CEST) To: Proxmox Backup Server development discussion , Stefan Reiter References: <20210713092321.597180-1-s.reiter@proxmox.com> <20210713092321.597180-2-s.reiter@proxmox.com> From: Dietmar Maurer Message-ID: <284ff0be-267c-a073-36db-de022b994043@proxmox.com> Date: Tue, 13 Jul 2021 12:08:54 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.11.0 MIME-Version: 1.0 In-Reply-To: <20210713092321.597180-2-s.reiter@proxmox.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Content-Language: en-US X-SPAM-LEVEL: Spam detection results: 0 AWL 0.910 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [disk.rs] Subject: [pbs-devel] applied: [PATCH v2 proxmox-backup 2/2] fix #3515: file-restore-daemon: allow LVs/PVs with dash in name X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 Jul 2021 10:08:55 -0000 applied On 7/13/21 11:23 AM, Stefan Reiter wrote: > LVM replaces any dashes '-' in an LV or PV name with two '--' for the > created device node in /dev/mapper/ to distinguish the seperating > character between the PV and LV name. > > Signed-off-by: Stefan Reiter > --- > > v2: replace in VG name too of course... as usual realized that right after > sending v1 > > src/bin/proxmox_restore_daemon/disk.rs | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) > > diff --git a/src/bin/proxmox_restore_daemon/disk.rs b/src/bin/proxmox_restore_daemon/disk.rs > index 1bcfc798..57ca8d7c 100644 > --- a/src/bin/proxmox_restore_daemon/disk.rs > +++ b/src/bin/proxmox_restore_daemon/disk.rs > @@ -308,7 +308,11 @@ impl Filesystems { > let mntpath = format!("/mnt/lvm/{}/{}", &data.vg_name, &data.lv_name); > create_dir_all(&mntpath)?; > > - let mapper_path = format!("/dev/mapper/{}-{}", &data.vg_name, &data.lv_name); > + let mapper_path = format!( > + "/dev/mapper/{}-{}", > + &data.vg_name.replace('-', "--"), > + &data.lv_name.replace('-', "--") > + ); > self.try_mount(&mapper_path, &mntpath)?; > > let mp = PathBuf::from(mntpath);