From: Andrew Ruthven <andrew@etc.gen.nz>
Date: Thu, 26 Apr 2012 21:21:35 +0000 (+1200)
Subject: Set a lock-timeout.
X-Git-Tag: v0.6~7
X-Git-Url: http://git.etc.gen.nz/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5a5c969fb69b61293bc0aba3cacd0d6c5b530f7c;p=etc-obnam.git

Set a lock-timeout.
---

diff --git a/debian/changelog b/debian/changelog
index 0328957..cff9ec7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+etc-obnam (0.4) unstable; urgency=low
+
+  * wait a little while on the locks since we might be running at the same
+    time.
+
+ -- Andrew Ruthven <andrew@etc.gen.nz>  Fri, 27 Apr 2012 09:21:11 +1200
+
 etc-obnam (0.3) unstable; urgency=low
 
   * Remove bashism in run-backups
diff --git a/debian/postinst b/debian/postinst
index b8d69b2..7761257 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -60,6 +60,7 @@ generate_obnam_config() {
   echo "log = /var/log/obnam.log"
   echo "ssh-key = /etc/obnam/id_rsa"
   echo "log-level = info"
+  echo "lock-timeout = 600"
   echo "#"
   echo "# To reconfigure the following settings run:"
   echo "#    dpkg-reconfigure $PACKAGE"