public inbox for pve-devel@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 v5 storage] Optionally allow blockdev in abs_filesystem_path
Date: Fri,  5 Mar 2021 12:11:39 +0100	[thread overview]
Message-ID: <20210305111140.208136-2-d.jaeger@proxmox.com> (raw)
In-Reply-To: <20210305111140.208136-1-d.jaeger@proxmox.com>

This is required to import from LVM storages

Signed-off-by: Dominic Jäger <d.jaeger@proxmox.com>
---
v4->v5: New

 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-05 11:18 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-03-05 11:11 [pve-devel] [PATCH v5 qemu-server] Add API for import wizards Dominic Jäger
2021-03-05 11:11 ` Dominic Jäger [this message]
2021-03-05 11:11 ` [pve-devel] [PATCH v5 manager] gui: Add import for disk & VM Dominic Jäger

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=20210305111140.208136-2-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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal