From 9f8b5dc46a32f7676bbfdc3c15ba36efcc4f924b Mon Sep 17 00:00:00 2001
From: Adam Thorn <alt36@cam.ac.uk>
Date: Tue, 6 Oct 2020 10:23:35 +0100
Subject: [PATCH] Make zfs-rsync.sh exit in error if PRE script fails
---
ROOT/usr/lib/chem-zfs-backup-server/zfs-rsync.sh | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/ROOT/usr/lib/chem-zfs-backup-server/zfs-rsync.sh b/ROOT/usr/lib/chem-zfs-backup-server/zfs-rsync.sh
index ef81641..d28ea0d 100755
--- a/ROOT/usr/lib/chem-zfs-backup-server/zfs-rsync.sh
+++ b/ROOT/usr/lib/chem-zfs-backup-server/zfs-rsync.sh
@@ -34,6 +34,13 @@ fi
# Prepare the host if required
if [ ! -z "$PRE" ] ; then
$PRE $HN >>$LOGDIR/${HN}_${TAG}-pre.log 2>&1
+
+ PRE_EXIT=$?
+ if [ $PRE_EXIT -ne 0 ] ; then
+ echo PRE script $PRE exited with $PRE_EXIT >>$LOGFILE
+ exit $PRE_EXIT
+ fi
+
fi
# Do the backup
--
GitLab