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

diff --git a/remove b/remove
index d02293b..2aadedf 100755
--- a/remove
+++ b/remove
@@ -2,5 +2,16 @@
 
 . /usr/share/ganeti/extstorage/zfs/defaults.sh
 
+test -e /dev/zvol/$EXTP_ZFS/$VOL_NAME || exit 0
+
+# remove snapshot flag on origin
+origin=$(zfs_get lv:origin)
+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 || true
+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