X-Git-Url: http://git.tuebingen.mpg.de/?p=dss.git;a=blobdiff_plain;f=dss.ggo;h=2bd899fb5dc9083b12a168c95dc5af73335ccfb4;hp=506fbf105433fed61631ad965e5b8295068cbfe7;hb=00c1e3fbafc6310a32bf39bbd8c36a7acee275f9;hpb=676f0d8d399ade79ff579e28787a63f00bdf2ce3

diff --git a/dss.ggo b/dss.ggo
index 506fbf1..2bd899f 100644
--- a/dss.ggo
+++ b/dss.ggo
@@ -1,4 +1,4 @@
-# Copyright (C) 2008-2009 Andre Noll <maan@systemlinux.org>
+# Copyright (C) 2008-2010 Andre Noll <maan@systemlinux.org>
 #
 # Licensed under the GPL v2. For licencing details see COPYING.
 
@@ -194,6 +194,21 @@ details="
 	dss.
 "
 
+option "no-resume" -
+#~~~~~~~~~~~~~~~~~~~
+"Do not try to resume from previous runs"
+flag off
+details = "
+	Starting from version 0.1.4, dss tries to resume from a
+	previously cancelled dss instance by default. It does so by
+	looking at the status of the most recently created snapshot. If
+	this snapshot status is incomplete, its directory is reused
+	as the destination directory for a subsequent rsync run.
+
+	The --no-resume option deactivates this feature so that a new
+	directory is always used as the rsync destination directory.
+"
+
 option "rsync-option" O
 #~~~~~~~~~~~~~~~~~~~~~~
 "Further rsync options"
@@ -253,6 +268,7 @@ option "pre-create-hook" r
 #~~~~~~~~~~~~~~~~~~~~~~~~~~
 "Executed before snapshot creation"
 string typestr="command"
+default = "/bin/true"
 optional
 details="
 	Execute this command before trying to create a new snapshot.
@@ -271,6 +287,7 @@ option "post-create-hook" o
 #~~~~~~~~~~~~~~~~~~~~~~~~~~
 "Executed after snapshot creation"
 string typestr="command"
+default = "/bin/true"
 optional
 details="
 	Execute this after a snapshot has successfully been
@@ -287,6 +304,7 @@ option "pre-remove-hook" -
 #~~~~~~~~~~~~~~~~~~~~~~~~~~
 "Executed before snapshot removal"
 string typestr="command"
+default = "/bin/true"
 optional
 details="
 	Execute this command before removing a snapshot. The full
@@ -308,6 +326,7 @@ option "post-remove-hook" -
 #~~~~~~~~~~~~~~~~~~~~~~~~~~
 "Executed after snapshot removal"
 string typestr="command"
+default = "/bin/true"
 optional
 details="
 	Execute this after a snapshot has successfully been removed. As
@@ -320,6 +339,7 @@ option "exit-hook" e
 #~~~~~~~~~~~~~~~~~~~
 "Executed if run command exits"
 string typestr="command"
+default = "/bin/true"
 optional
 details="
 	This hook is only used if the --run command was given which