From: Dobrica Pavlinusic <dpavlin@rot13.org>
Date: Thu, 26 Jun 2014 13:50:06 +0000 (+0200)
Subject: exit 1 on existing, verbose receive
X-Git-Url: http://git.rot13.org/?p=ganeti-extstorage-zfs;a=commitdiff_plain;h=46fb5bacd64a9763ffab2c628c21d8f640795a23

exit 1 on existing, verbose receive
---

diff --git a/bin/adopt b/bin/adopt
index 030a56c..f9c2a93 100755
--- a/bin/adopt
+++ b/bin/adopt
@@ -2,6 +2,8 @@
 
 . /usr/share/ganeti/extstorage/zfs/defaults.sh
 
+test -e /dev/zvol/$EXTP_ZFS/adopt && exit 1
+
 zfs list -t snapshot -r -r $EXTP_ZFS -o name -H \
 | iselect -p 1 -a -n 'adopt snapshot' \
-| xargs -i sh -cx 'zfs send -R {} | zfs receive '$EXTP_ZFS'/adopt && zfs set ganeti:originstname="`zfs get ganeti:originstname -o value -p -H {}`+adopt" '$EXTP_ZFS'/adopt && zfs set lv:a="-" '$EXTP_ZFS'/adopt'
+| xargs -i sh -cx 'zfs send -R {} | zfs receive -v '$EXTP_ZFS'/adopt && zfs set ganeti:originstname="`zfs get ganeti:originstname -o value -p -H {}`+adopt" '$EXTP_ZFS'/adopt && zfs set lv:a="-" '$EXTP_ZFS'/adopt'