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 00E487931E for ; Tue, 4 May 2021 10:10:45 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id DC8CC2497A for ; Tue, 4 May 2021 10:10:14 +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 32E372493E for ; Tue, 4 May 2021 10:10:13 +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 F170E425C0 for ; Tue, 4 May 2021 10:10:12 +0200 (CEST) From: Fabian Ebner To: pve-devel@lists.proxmox.com Date: Tue, 4 May 2021 10:10:02 +0200 Message-Id: <20210504081004.21898-9-f.ebner@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210504081004.21898-1-f.ebner@proxmox.com> References: <20210504081004.21898-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.000 Adjusted score from AWL reputation of From: address 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 Subject: [pve-devel] [PATCH zsync 08/10] parse disks: don't include colon in storage name variable X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 04 May 2021 08:10:45 -0000 in preparation to re-use it elsewhere. Signed-off-by: Fabian Ebner --- pve-zsync | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pve-zsync b/pve-zsync index 101dc03..e4f927e 100755 --- a/pve-zsync +++ b/pve-zsync @@ -858,7 +858,7 @@ sub parse_disks { my @parameter = split(/,/,$1); foreach my $opt (@parameter) { - if ($opt =~ m/^(?:file=|volume=)?([^:]+:)([A-Za-z0-9\-]+)$/){ + if ($opt =~ m/^(?:file=|volume=)?([^:]+):([A-Za-z0-9\-]+)$/){ $disk = $2; $stor = $1; last; @@ -872,10 +872,10 @@ sub parse_disks { my $cmd = []; push @$cmd, 'ssh', "$user\@$ip", '--' if $ip; - push @$cmd, 'pvesm', 'path', "$stor$disk"; + push @$cmd, 'pvesm', 'path', "$stor:$disk"; my $path = run_cmd($cmd); - die "Get no path from pvesm path $stor$disk\n" if !$path; + die "Get no path from pvesm path $stor:$disk\n" if !$path; if ($vm_type eq 'qemu' && $path =~ m/^\/dev\/zvol\/(\w+.*)(\/$disk)$/) { -- 2.20.1