[pve-devel] [PATCH v5 storage] Optionally allow blockdev in abs_filesystem_path

[Dominic Jäger]

This is required to import from LVM storages

Signed-off-by: Dominic Jäger <d.jaeger at 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