@@ -6,8 +6,11 @@

[chiark-utils.git] / backup / increm

diff --git a/backup/increm b/backup/increm
index 9bad0f1c6e3229b3cd2d4fdf53ff3f4c0e748408..bc058f7f7ffe0f44c1bf0300eb92696448f5382b 100755 (executable)
--- a/backup/increm
+++ b/backup/increm
@@ -67,14 +67,10 @@ $advance =~ m/^\d+$/ or die "$advance ?";
 # it invoked us, so no need to read the existing TAPEID record first.)
 system "mt -f $ntape rewind"; $? and die $?;
 if ($advance == 1) {
-    open TI,">TAPEID" or die $!;
-    print TI "$tapeid\n$tapedesc\n" or die $!;
-    close TI or die $!;
-
-    system "tar -b$blocksize -vvcf TAPEID.tar TAPEID"; $? and die $?;
-    system "dd if=TAPEID.tar of=$ntape bs=${blocksize}b count=10"; $? and die $?;
+    writetapeid($tapeid,$tapedesc);
 } else {
     system "mt -f $ntape fsf $advance"; $? and die $?;
+    $currenttapefilenumber= $advance+1;
 }
 
 # Get a list of all filesystems
@@ -112,6 +108,9 @@ for $tf (@fsys) {
        print LOG "Not dumping $atf ($prefix) - not \`dump'.\n" or die $!;
        next;
     }
+
+    nexttapefile("inc $prefix:$atf");
+    
     # Same trick as full uses to do a pipeline whilst keeping track
     # of all exit statuses:
     #   dump </dev/null | writebuffer | dd >/dev/null