From d0f50002cf680a5342cdc89adeccb80238fe5aa2 Mon Sep 17 00:00:00 2001
From: ianmdlvl <ianmdlvl>
Date: Mon, 14 Aug 2006 10:04:37 +0000
Subject: [PATCH] @@ -1,3 +1,9 @@ +chiark-utils (4.1.7) unstable; urgency=low +
 +  * backup: new `noinc' fs line option. + + -- Ian Jackson
 <ian@davenant.greenend.org.uk>  Mon, 14 Aug 2006 11:04:30 +0100 + 
 chiark-utils (4.1.6) unstable; urgency=low

   * backup/snaprsync: work around bug in bash (Debian #382798).
---
 backup/backuplib.pl  | 2 +-
 backup/increm        | 4 ++++
 backup/iwjbackup.txt | 3 +++
 debian/changelog     | 6 ++++++
 4 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/backup/backuplib.pl b/backup/backuplib.pl
index b537f2f..43df710 100644
--- a/backup/backuplib.pl
+++ b/backup/backuplib.pl
@@ -202,7 +202,7 @@ sub parsefsys () {
 
     undef %dopt;
     foreach $dopt (split /\,/,$dopts) {
-	if (grep { $dopt eq $_ } qw(gz)) {
+	if (grep { $dopt eq $_ } qw(gz noinc)) {
 	    $dopt{$dopt}= 'y';
 	} elsif (grep { $dopt eq $_ } qw(snap)) {
 	    $dopt{$dopt}= $dopt;
diff --git a/backup/increm b/backup/increm
index 945bb0e..341cd99 100755
--- a/backup/increm
+++ b/backup/increm
@@ -103,6 +103,10 @@ for $tf (@fsys) {
 	$ddcmd .= " conv=sync";
     }
 
+    if ($dopt{'noinc'}) {
+	pboth("Incrementals of $atf_print ($prefix) suppressed in config.\n");
+    }
+
     if ($tm eq 'dump') {
 	$dumplabel= $pcstr.$atf_print.'$';
 	$dumpcmd= "dump 1Lbfu $dumplabel $softblocksizekb - $atf";
diff --git a/backup/iwjbackup.txt b/backup/iwjbackup.txt
index 5362fd1..0f83e4c 100644
--- a/backup/iwjbackup.txt
+++ b/backup/iwjbackup.txt
@@ -96,6 +96,9 @@ Options supported:
     in /etc/chiark-backup/snap/lvm for details of how this works.
     When snap= is used, the block device must be specified.
 
+  noinc
+    Suppress incrementals.
+
 expected-diffs is a config file to indicate which 
 filesystems should *not* be backed up. The scripts do a config
 check which involves checking that:
diff --git a/debian/changelog b/debian/changelog
index efc7461..1ee9c3a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+chiark-utils (4.1.7) unstable; urgency=low
+
+  * backup: new `noinc' fs line option.
+
+ -- Ian Jackson <ian@davenant.greenend.org.uk>  Mon, 14 Aug 2006 11:04:30 +0100
+
 chiark-utils (4.1.6) unstable; urgency=low
 
   * backup/snaprsync: work around bug in bash (Debian #382798).
-- 
2.30.2