From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <root@dev.dominic.proxmox.com>
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 12C346888D
for <pve-devel@lists.proxmox.com>; Tue, 9 Mar 2021 11:44:06 +0100 (CET)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id 097E78BCB
for <pve-devel@lists.proxmox.com>; Tue, 9 Mar 2021 11:43:36 +0100 (CET)
Received: from dev.dominic.proxmox.com (unknown [94.136.29.99])
by firstgate.proxmox.com (Proxmox) with ESMTP id A38768BB1
for <pve-devel@lists.proxmox.com>; Tue, 9 Mar 2021 11:43:35 +0100 (CET)
Received: by dev.dominic.proxmox.com (Postfix, from userid 0)
id A666D21650; Tue, 9 Mar 2021 11:43:29 +0100 (CET)
From: =?UTF-8?q?Dominic=20J=C3=A4ger?= <d.jaeger@proxmox.com>
To: pve-devel@lists.proxmox.com
Date: Tue, 9 Mar 2021 11:43:16 +0100
Message-Id: <20210309104318.317454-1-d.jaeger@proxmox.com>
X-Mailer: git-send-email 2.20.1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-SPAM-LEVEL: Spam detection results: 2
KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment
KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery
methods
NO_DNS_FOR_FROM 0.379 Envelope sender has no MX or A DNS records
RDNS_NONE 1.274 Delivered to internal network by a host with no rDNS
SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record
SPF_NONE 0.001 SPF: sender does not publish an 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. [storage.pm]
Subject: [pve-devel] [PATCH v6 storage] Optionally allow blockdev in
abs_filesystem_path
X-BeenThere: pve-devel@lists.proxmox.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Proxmox VE development discussion <pve-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pve-devel/>
List-Post: <mailto:pve-devel@lists.proxmox.com>
List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=subscribe>
X-List-Received-Date: Tue, 09 Mar 2021 10:44:06 -0000
This is required to import from LVM storages
Signed-off-by: Dominic Jäger <d.jaeger@proxmox.com>
---
v5->v6: unchanged
PVE/Storage.pm | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/PVE/Storage.pm b/PVE/Storage.pm
index 8ee2c92..7c2e24e 100755
--- a/PVE/Storage.pm
+++ b/PVE/Storage.pm
@@ -609,7 +609,7 @@ sub path {
}
sub abs_filesystem_path {
- my ($cfg, $volid) = @_;
+ my ($cfg, $volid, $allowBlockdev) = @_;
my $path;
if (parse_volume_id ($volid, 1)) {
@@ -623,8 +623,11 @@ sub abs_filesystem_path {
}
}
}
-
- die "can't find file '$volid'\n" if !($path && -f $path);
+ if ($allowBlockdev) {
+ die "can't find file '$volid'\n" if !($path && (-f $path || -b $path));
+ } else {
+ die "can't find file '$volid'\n" if !($path && -f $path);
+ }
return $path;
}
--
2.20.1