update licence to GPLv3 or later (was GPLv2 or later).

[chiark-utils.git] / backup / increm

diff --git a/backup/increm b/backup/increm
index b50f50e8c9040d93475a1e8b8edcd455ca2f100a..f0125fa7931332ee512e9ff02dbe55ea4d367acb 100755 (executable)
--- a/backup/increm
+++ b/backup/increm
@@ -11,7 +11,7 @@
 #
 # This is free software; you can redistribute it and/or modify it under the
 # terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2, or (at your option) any later version.
+# Foundation; either version 3, or (at your option) any later version.
 #
 # This is distributed in the hope that it will be useful, but WITHOUT ANY
 # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
@@ -103,16 +103,21 @@ for $tf (@fsys) {
        $ddcmd .= " conv=sync";
     }
 
+    if ($dopt{'noinc'}) {
+       pboth("Incrementals of $atf_print ($prefix) suppressed in config.\n");
+    }
+
     if ($tm eq 'dump') {
-       $dumpcmd= "dump 1bfu $softblocksizekb - $atf";
+       $dumplabel= $pcstr.$atf_print.'$';
+       $dumpcmd= "dump 1Lbfu $dumplabel $softblocksizekb - $atf";
     } elsif ($tm eq 'gtar') {
        $dumpcmd= "tar NCcfl $fsidfile $atf - .";
     } else {
-       pboth("Not dumping $atf ($prefix) - not supported.\n");
+       pboth("Not dumping $atf_print ($prefix) - not supported.\n");
        next;
     }
 
-    nexttapefile("inc $prefix:$atf");
+    nexttapefile("inc $prefix:$atf_print");
     
     # Same trick as full uses to do a pipeline whilst keeping track
     # of all exit statuses:
@@ -139,8 +144,7 @@ print IAN "$advance\n" or die $!;
 close IAN or die $!;
 rename 'increm-advance.new','increm-advance' or die $!;
 
-print LOG "Next FULL dump tape is $next\n" or die $!;
-print "Next FULL dump tape is $next\n" or die $!;
+pboth("Next FULL dump tape is $next\n");
 
 setstatus "INCREMENTAL successful: $tapedesc, next full is $next";
 exit 0;