copy originstname+adopt to adopt vol

diff --git a/bin/adopt b/bin/adopt
index 01107b4..490464a 100755 (executable)
--- a/bin/adopt
+++ b/bin/adopt
@@ -3,4 +3,5 @@
 
 . /usr/share/ganeti/extstorage/zfs/defaults.sh
 
-./bin/snap | iselect -p 2 -a -n 'adopt snapshot' | awk '{ print $1 }' | xargs -i zfs clone {} $EXTP_ZFS/adopt
+./bin/snap | iselect -p 2 -a -n 'adopt snapshot' | awk '{ print $1 }' | xargs -i sh -cx \
+'zfs clone {} '$EXTP_ZFS'/adopt && zfs set ganeti:originstname=`zfs get ganeti:originstname -o value -p -H {}`+adopt '$EXTP_ZFS'/adopt'

diff --git a/t/adopt.sh b/t/adopt.sh
index 2c82330..e2acc2d 100755 (executable)
--- a/t/adopt.sh
+++ b/t/adopt.sh
@@ -1,6 +1,7 @@
 ssh `gnt-cluster getmaster` \
   gnt-instance add -t plain --disk=0:adopt=adopt \
        -o debootstrap+default \
+       --no-start \
        --no-name-check --no-ip-check \
        -B maxmem=512M -n arh-hw t-adopt