diff --git a/ROOT/DEBIAN/control b/ROOT/DEBIAN/control index fdfe0fc896421ab9e4161cab67546b46d6b5d41c..eda3c3d60a3bacf6b5a98e3ed543f2a5ee124a1f 100644 --- a/ROOT/DEBIAN/control +++ b/ROOT/DEBIAN/control @@ -3,6 +3,6 @@ Priority: optional Section: otherosfs Maintainer: Chemistry COs <support@ch.cam.ac.uk> Architecture: all -Version: 0.9-ch94 +Version: 0.9-ch95 Depends: zfs-dkms, postgresql-13 | postgresql-9.5 | postgresql-9.4 , liblockfile-simple-perl, libdbi-perl, libjson-perl, libzfs-perl-chem, libnet-openssh-perl, libdbd-pg-perl, mbuffer, rsync, nfs-kernel-server, pv, libwww-curl-perl Description: a backup system using ZFS (repository 'backup-scheduler') diff --git a/ROOT/etc/chem-zfs-backup-server/zfs-rsync.d/prepare b/ROOT/etc/chem-zfs-backup-server/zfs-rsync.d/prepare index 342d939f4b94388a7a58f08498a74c911f460704..1a420ac740c6d209b771cd5e0e1474771ce796b6 100755 --- a/ROOT/etc/chem-zfs-backup-server/zfs-rsync.d/prepare +++ b/ROOT/etc/chem-zfs-backup-server/zfs-rsync.d/prepare @@ -54,7 +54,11 @@ fi # provided by it. # systemd-detect-virt is present on all our Ubuntu VMs so is hopefully a # reliable method to use +# NB this returns non-zero on a non-virtual machine so we don't mind +# the return value +set +e VIRT_TYPE=$(ssh root@$SERVER systemd-detect-virt 2>/dev/null) +set -e if [ "$VIRT_TYPE" == "xen" ] ; then cat<<EOF >> $CONFDIR/$SERVER/exclude /lib/modules