@@ -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).

diff --git a/backup/backuplib.pl b/backup/backuplib.pl
index b537f2ff7544874d6693141f8f851cf7630d305f..43df710c740b796adc1b16930798351c99250041 100644 (file)
--- 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 945bb0e5dec5118b1e561be5a5f6fdb62b9da61a..341cd993555db1fb897a330b0dc4fe4852180223 100755 (executable)
--- 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 5362fd1343b1978504e54af1d7fdb0599e2d824e..0f83e4c00e134d7e21db5a9c0405da25380a626c 100644 (file)
--- 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 efc74616b888ed10ae5add88f3a5bef89f4a8656..1ee9c3a4ba00c7a1e9265ce8c6bfb9298e3e5457 100644 (file)
--- 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).