all lists on lists.proxmox.com
 help / color / mirror / Atom feed
From: "Dominic Jäger" <d.jaeger@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH v6 storage] Optionally allow blockdev in abs_filesystem_path
Date: Tue,  9 Mar 2021 11:43:16 +0100	[thread overview]
Message-ID: <20210309104318.317454-1-d.jaeger@proxmox.com> (raw)

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




             reply	other threads:[~2021-03-09 10:44 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-03-09 10:43 Dominic Jäger [this message]
2021-03-09 10:43 ` [pve-devel] [PATCH v6 qemu-server] Add API for import wizards Dominic Jäger
     [not found]   ` <<20210309104318.317454-2-d.jaeger@proxmox.com>
2021-03-15  9:25     ` Fabian Grünbichler
2021-03-09 10:43 ` [pve-devel] [PATCH v6 manager] gui: Add import for disk & VM Dominic Jäger
     [not found] ` <<20210309104318.317454-1-d.jaeger@proxmox.com>
2021-03-15  9:25   ` [pve-devel] [PATCH v6 storage] Optionally allow blockdev in abs_filesystem_path Fabian Grünbichler

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210309104318.317454-1-d.jaeger@proxmox.com \
    --to=d.jaeger@proxmox.com \
    --cc=pve-devel@lists.proxmox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal