X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=remove;h=2aadedf1da73d48e498f0c694e842d4268d3a03f;hb=b3e5cfcae0a225911e510bf19eb725423c5e7cb5;hp=2d4934860d7be4676b76e38d50c308280644d1eb;hpb=99101536f2996467004392f1741b2274833d1d73;p=ganeti-extstorage-zfs

diff --git a/remove b/remove
index 2d49348..2aadedf 100755
--- a/remove
+++ b/remove
@@ -2,7 +2,7 @@
 
 . /usr/share/ganeti/extstorage/zfs/defaults.sh
 
-test -e /dev/zvol/$EXTP_VG/$VOL_NAME || exit 0
+test -e /dev/zvol/$EXTP_ZFS/$VOL_NAME || exit 0
 
 # remove snapshot flag on origin
 origin=$(zfs_get lv:origin)
@@ -11,3 +11,7 @@ test ! -z "$origin" && zfs set lv:s='-' $EXTP_ZFS/$origin
 rm -f /dev/$EXTP_VG/$VOL_NAME
 zfs destroy $EXTP_DESTROY $EXTP_ZFS/$VOL_NAME
 
+snap=$(echo $VOL_NAME | sed 's/\.snap$/@snap/')
+if [ $snap != $VOL_NAME ] ; then
+	zfs destroy $EXTP_DESTROY $EXTP_ZFS/$snap
+fi