X-Git-Url: http://git.tuebingen.mpg.de/?p=dss.git;a=blobdiff_plain;f=dss.ggo;h=11529956891db25e5110e03009b88ff5ca36c0c6;hp=38e8637c384b8aa61de4b29c43068294425f59d1;hb=01ed0597ca37173df783d9a6816cf13d7a1435f9;hpb=79489a96d14274b78a654bbcf60d8eb8289cae50

diff --git a/dss.ggo b/dss.ggo
index 38e8637..1152995 100644
--- a/dss.ggo
+++ b/dss.ggo
@@ -1,9 +1,9 @@
-# Copyright (C) 2008-2010 Andre Noll <maan@systemlinux.org>
+# Copyright (C) 2008-2010 Andre Noll <maan@tuebingen.mpg.de>
 #
 # Licensed under the GPL v2. For licencing details see COPYING.
 
 package "dss"
-version "0.1.4"
+version "0.1.5"
 purpose "the dyadic snapshot scheduler
 
 dss creates hardlink-based snapshots of a given directory on a remote
@@ -41,7 +41,7 @@ flag off
 dependon="logfile"
 details="
 	Note that dss refuses to start in daemon mode if no logfile
-	was specified. This option is mostly useful in conjuction
+	was specified. This option is mostly useful in conjunction
 	with the -R option described below.
 
 	Note that it is not possible to change whether dss runs as
@@ -244,6 +244,26 @@ details="
 		--rsync-option --exclude --rsync-option /proc
 "
 
+option "max-rsync-errors" -
+"Terminate after this many rsync failures"
+int typestr="count"
+default="10"
+optional
+details="
+	Only relevant when operating in --run mode (see above). If
+	the rsync process exits with a fatal error, dss restarts
+	the command in the hope that the problem is transient
+	and subsequent rsync runs succeed. After the given number
+	of consecutive rsync error exits, however, dss gives up,
+	executes the exit hook and terminates. Set this to zero if
+	dss should exit immediately on the first rsync error.
+
+	The only non-fatal error is when rsync exits with code 24. This
+	indicates a partial transfer due to vanished source files
+	and happens frequently when snapshotting a directory which
+	is concurrently being modified.
+"
+
 ###################
 section "Intervals"
 ###################
@@ -439,3 +459,23 @@ details="
 	becomes low. Use this flag if the file system containing the
 	destination directory is used for snapshots only.
 "
+
+option "min-complete" -
+#~~~~~~~~~~~~~~~~~~~~~~
+"Minimal number of complete snapshots to keep"
+int typestr = "num"
+default = "1"
+optional
+details = "
+	This option is only relevant if snapshots must be deleted
+	because disk space gets low.
+
+	dss refuses to remove old snapshots if there are fewer complete
+	snapshots left than the given number. The default value of one
+	guarantees that at least one complete snapshot is available
+	at all times.
+
+	If only <num> complete snapshot are left, and there is not
+	enough disk space available for another snapshot, the program
+	terminates with a \"No space left on device\" error.
+"