export VOL_NAME before use

[ganeti-extstorage-zfs] / sbin / lvremove

diff --git a/sbin/lvremove b/sbin/lvremove
index 356305c..ee15f23 100755 (executable)
--- a/sbin/lvremove
+++ b/sbin/lvremove
@@ -7,15 +7,19 @@
 if echo $* | grep -q $EXTP_VG ; then
        while [ ! -z "$1" ] ; do
                if echo $1 | grep -q $EXTP_VG ; then
-                       VOL_NAME=`echo $1 | sed -e "s:$EXTP_VG/::" -e 's/\.snap$/@snap/'`
+                       VOL_NAME=`echo $1 | sed -e "s:$EXTP_VG/::"` # FIXME -e 's/\.snap$/@snap/'`
                fi
                shift;
        done
+       export VOL_NAME
+
+       origin=$(zfs_get lv:origin)
 
        # destroy snapshot and clone
-       if [ /dev/zvol/$EXTP_ZFS/$VOL_NAME ] ; then
-               zfs destroy -R $EXTP_ZFS/$VOL_NAME || exit 0 # FIXME
-               rm -f /dev/$EXTP_VG/$VOL_NAME
+       $dir/remove
+       if [ ! -z "$origin" ] ; then
+               VOL_NAME=$origin@snap $dir/remove
+               zfs set lv:s='-' $EXTP_ZFS/$origin
        fi
 else
        /sbin/lvm lvrename $*