X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=chiark-utils.git;a=blobdiff_plain;f=backup%2Fincrem;h=945bb0e5dec5118b1e561be5a5f6fdb62b9da61a;hp=ac220957edb2d4f0d470fa4235514afae345b091;hb=50505a407d5558883e5242a12ec49d298f4344fe;hpb=7d4185f54b99fef18f8661ea1d5974171f997f1e

diff --git a/backup/increm b/backup/increm
index ac22095..945bb0e 100755
--- a/backup/increm
+++ b/backup/increm
@@ -104,14 +104,16 @@ for $tf (@fsys) {
     }
 
     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 {
-	print "Not dumping $atf ($prefix) - not \`dump'.\n" or die $!;
-	print LOG "Not dumping $atf ($prefix) - not \`dump'.\n" or die $!;
+	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:
@@ -138,8 +140,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;