lvremove better check is volume exists

diff --git a/sbin/lvremove b/sbin/lvremove
index c99accd..18ef776 100755 (executable)
--- a/sbin/lvremove
+++ b/sbin/lvremove
@@ -13,8 +13,10 @@ if echo $* | grep -q $EXTP_VG ; then
        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
+       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
+       fi
 else
        /sbin/lvm lvrename $*
 fi

diff --git a/t/lvremove b/t/lvremove
index 573fdf6..0a17dc3 100644 (file)
--- a/t/lvremove
+++ b/t/lvremove
@@ -1 +1,2 @@
-lvremove -f ffzgvg/3e6746a9-cb99-4584-a219-af7e4b5cb5f5.disk0_data.snap
+#lvremove -f ffzgvg/3e6746a9-cb99-4584-a219-af7e4b5cb5f5.disk0_data.snap
+lvremove -f ffzgvg/1785c7cb-fe2a-419e-9e87-6b5058385408.disk0_data