Fixes to backup2l pre-backup and messaging.

backup/backup.d/post-backup.d/99-upload-backup

@@ -42,7 +42,6 @@ name = Symbiosis::Host.primary_backup_space.to_s
 #  If we didn't get a name then exit.
 #
 if name.empty?
-  puts "Failed to determine backup space name.  Not uploading backup(s) to remote space."
   exit 0
 end
 

backup/backup.d/pre-backup.d/00-download-backup

@@ -47,7 +47,6 @@ name = Symbiosis::Host.primary_backup_space.to_s
 #  If we didn't get a name then exit.
 #
 if name.empty?
-  puts "Failed to determine backup space name.  Not downloading existing backups."
   exit 0
 end
 

backup/backup.d/pre-backup.d/04-disable-lock

+#!/bin/bash
+#
+# Disables the backup2l lock file introduced in 1.6 as we're about to run
+#  backup2l a second time (as a dry-run) to determine the amount of disk
+#  space we're likely to use for the next backup.
+#
+
+# Determine the location of the lock file from the default config.
+LOCK="$(grep '^BACKUP_DIR=\|^VOLNAME=' /etc/backup2l.conf | sed 's|.*="||' | tr -d '\n' | sed -e 's|"|/|1' -e 's|"|.lock|')"
+
+# If it exists, then move it out of the way for now.
+if [ -f ${LOCK} ]; then
+  mv -f ${LOCK} ${LOCK}_disabled
+fi

backup/backup.d/pre-backup.d/06-enable-lock

+#!/bin/bash
+#
+# Re-enables the backup2l lock file introduced in 1.6 as we've just run
+#  backup2l a second time (as a dry-run) to determine the amount of disk
+#  space we're likely to use for the next backup.
+#
+
+# Determine the location of the lock file from the default config.
+LOCK="$(grep '^BACKUP_DIR=\|^VOLNAME=' /etc/backup2l.conf | sed 's|.*="||' | tr -d '\n' | sed -e 's|"|/|1' -e 's|"|.lock|')"
+
+# If it exists, then move it back where it came from.
+if [ -f ${LOCK}_disabled ]; then
+  mv -f ${LOCK}_disabled ${LOCK}
+fi

backup/debian/changelog

+symbiosis-backup (2018:0830) stable; urgency=medium
+
+  * Removed output when not finding deprecated Bytemark backup space.
+  * Added jobs to temporarily move lock file when doing space estimation.
+
+ -- Paul Cammish <paul.cammish@bytemark.co.uk>  Mon, 30 Jul 2018 09:40:38 +0100
+
 symbiosis-backup (2017:0818) stable; urgency=medium
 
   * Fixed typo in output.