split ganeti metadata from tag+value

diff --git a/sbin/lvchange b/sbin/lvchange
index ff94ea3..2760a0a 100755 (executable)
--- a/sbin/lvchange
+++ b/sbin/lvchange
@@ -17,9 +17,7 @@ if echo $* | grep -q $EXTP_VG ; then
        --addtag)
                VOL_NAME=`echo $3 | cut -d/ -f4`
                zfs set lv:tag=$2 $EXTP_ZFS/$VOL_NAME # FIXME duplicate?
-               tag=`echo $2 | cut -d+ -f1`
-               val=`echo $2 | cut -d+ -f2-`
-               zfs set ganeti:$tag=$val $EXTP_ZFS/$VOL_NAME
+               VOL_METADATA=$2 /usr/share/ganeti/extstorage/zfs/setinfo
        ;;
        esac
 else

diff --git a/setinfo b/setinfo
index ef1d71b..51d295a 100755 (executable)
--- a/setinfo
+++ b/setinfo
@@ -3,3 +3,8 @@
 . /usr/share/ganeti/extstorage/zfs/defaults.sh
 
 zfs set ganeti:metadata="$VOL_METADATA" $EXTP_ZFS/$VOL_NAME
+# FIXME remove duplication?
+
+tag=`echo $VOL_METADATA | cut -d+ -f1`
+val=`echo $VOL_METADATA | cut -d+ -f2-`
+zfs set ganeti:$tag="$val" $EXTP_ZFS/$VOL_NAME