From: Wolfgang Link <w.link@proxmox.com>
Date: Thu, 19 Nov 2015 11:28:20 +0000 (+0100)
Subject: Change zfspoolplugin path when snapshot is given.
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=fdd31ce7594ffc4ccea68260091989a3cbc07cdb;p=pve-storage.git

Change zfspoolplugin path when snapshot is given.

Zfs subvol snapshots are always mounted under $path_of_subvol/.zfs/$snapname
---

diff --git a/PVE/Storage/ZFSPoolPlugin.pm b/PVE/Storage/ZFSPoolPlugin.pm
index 0c1d8d9..dc9ece7 100644
--- a/PVE/Storage/ZFSPoolPlugin.pm
+++ b/PVE/Storage/ZFSPoolPlugin.pm
@@ -149,12 +149,12 @@ sub path {
 
     if ($vtype eq "images") {
 	if ($volname =~ m/^subvol-/) {
-	    # fixme: we currently assume standard mount point?!
 	    $path = "/$scfg->{pool}/$volname";
+	    $path .= "/.zfs/snapshot/$snapname" if defined($snapname);
 	} else {
 	    $path = "/dev/zvol/$scfg->{pool}/$volname";
+	    $path .= "\@$snapname" if defined($snapname);
 	}
-	$path .= "\@$snapname" if defined($snapname);
     } else {
 	die "$vtype is not allowed in ZFSPool!";
     }