X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=backup%2Ffull;h=668b5fdaec6fa9216e1ad1c7bcd1fe299261de2a;hb=0a78347f158bbf808adee40e73fa090ada78efe8;hp=02b5b0c60d89b41ba85a068335cf1e59af39dd5f;hpb=17fb3a3831ca812a3ad384f4eec3b977432facd9;p=chiark-utils.git

diff --git a/backup/full b/backup/full
index 02b5b0c..668b5fd 100755
--- a/backup/full
+++ b/backup/full
@@ -41,10 +41,8 @@ printdate();
 
 setstatus "FAILED reading TAPEID";
 # Try to read the tape ID from the tape into the file TAPEID
-unlink 'TAPEID';
-system "mt -f $tape rewind"; $? and die $?;
-system "mt -f $tape setblk $blocksizebytes"; $? and die $?;
-system "dd if=$tape bs=${blocksize}b count=10 | tar -b$blocksize -vvxf - TAPEID";
+
+readtapeid_raw();
 
 setstatus "FAILED during startup";
 
@@ -130,14 +128,13 @@ openlog();
 $doing= "dump of $fsys to tape $tapedesc in drive $tape";
 print LOG "$doing:\n" or die $!;
 
+setstatus "FAILED retensioning";
+system "mt -f $tape reten"; $? and die $?;
+
 setstatus "FAILED writing tape ID";
 # First write the tape ID to this tape.
-open T, ">TAPEID" or die $!;
-print T "$tapeid\n" or die $!;
-close T 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);
 
 unlink 'this-md5sums';