Set a lock-timeout.

diff --git a/debian/changelog b/debian/changelog
index 03289576efc4e338f9da92956099e432bfc70ac6..cff9ec7eb2909b0f5bfa3aba3f5056e175de8550 100644 (file)
--- 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 b8d69b2e82efd768abf901b39cee1ebdd44c8cd9..776125729b22722a11ed5e327a7b7676bc56da92 100644 (file)
--- 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"