From f482231e4846acbe06761c99c123f19b842e0d4d Mon Sep 17 00:00:00 2001 From: Dietmar Maurer Date: Wed, 9 Dec 2015 07:38:36 +0100 Subject: [PATCH] Revert "Change zfspoolplugin path when snapshot is given." This reverts commit fdd31ce7594ffc4ccea68260091989a3cbc07cdb. The assumption was wrong. Turned out that we cannot assume snapshots are always mounted there. --- PVE/Storage/ZFSPoolPlugin.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/PVE/Storage/ZFSPoolPlugin.pm b/PVE/Storage/ZFSPoolPlugin.pm index dc9ece7..0c1d8d9 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!"; }