added lvextend needed for gnt-instance grow-disk

[ganeti-extstorage-zfs] / sbin / lvremove

diff --git a/sbin/lvremove b/sbin/lvremove
index c99accd..69f5709 100755 (executable)
--- a/sbin/lvremove
+++ b/sbin/lvremove
@@ -1,4 +1,4 @@
-#!/bin/sh -x
+#!/bin/sh -e
 
 . /usr/share/ganeti/extstorage/zfs/defaults.sh
 
@@ -7,14 +7,13 @@
 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
 
        # destroy snapshot and clone
-       zfs destroy -R $EXTP_ZFS/$VOL_NAME || exit 0 # FIXME
-       test -e /dev/$EXTP_VG/$VOL_NAME && rm /dev/$EXTP_VG/$VOL_NAME
+       $dir/remove
 else
        /sbin/lvm lvrename $*
 fi