From 46fb5bacd64a9763ffab2c628c21d8f640795a23 Mon Sep 17 00:00:00 2001 From: Dobrica Pavlinusic Date: Thu, 26 Jun 2014 15:50:06 +0200 Subject: [PATCH] exit 1 on existing, verbose receive --- bin/adopt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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' -- 2.20.1