@@ -1,3 +1,9 @@

+chiark-utils (3.0.4) unstable; urgency=low
+
+  * chiark-backup: full dumps have tapedesc in TAPEID
+
+ --
+
 chiark-utils (3.0.3) unstable; urgency=low

   * chiark-backup: compatibility with md5sum from dpkg 1.10.4.

diff --git a/backup/backuplib.pl b/backup/backuplib.pl
index e80f779ca0a6d77d8988d5ce85800c589a1a1626..f8d7349bdec683fa4db009933e3ad33db3f7670d 100644 (file)
--- a/backup/backuplib.pl
+++ b/backup/backuplib.pl
@@ -64,9 +64,9 @@ sub readtapeid_raw () {
           "| tar -b$blocksize -vvxf - TAPEID";
 }
 
-sub writetapeid ($) {
+sub writetapeid ($$) {
     open T, ">TAPEID" or die $!;
-    print T "$_[0]\n" or die $!;
+    print T "$_[0]\n$_[1]\n" or die $!;
     close T or die $!;
 
     system "tar -b$blocksize -vvcf TAPEID.tar TAPEID"; $? and die $?;

diff --git a/backup/full b/backup/full
index af6ebc95a3f14bd8dedfb5c6187b827f62278386..388270fa62263687ba670caff4c671fb81374426 100755 (executable)
--- a/backup/full
+++ b/backup/full
@@ -134,7 +134,7 @@ system "mt -f $tape reten"; $? and die $?;
 setstatus "FAILED writing tape ID";
 # First write the tape ID to this tape.
 
-writetapeid($tapeid);
+writetapeid($tapeid,$tapedesc);
 
 unlink 'this-md5sums';
 

diff --git a/backup/labeltape b/backup/labeltape
index c06d897a7bdf7415642365ab6c0ab086b34a310f..b7081041102b7ea2c0ad47f11f97160c534b788d 100755 (executable)
--- a/backup/labeltape
+++ b/backup/labeltape
@@ -37,7 +37,7 @@ open T,'>TAPEID' or die $!;
 print T "$newid\n" or die $!;
 close T or die $!;
 
-writetapeid($newid);
+writetapeid($newid,'tapeid set manually');
 rewind_raw();
 
 print "Labelled tape \`$newid'\n" or die $!;

diff --git a/debian/changelog b/debian/changelog
index 16ff7a07344c427ae8b9888a5bcb4c503514203d..bd0438bf13b64e2463310e188524bbb6be9a0e65 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+chiark-utils (3.0.4) unstable; urgency=low
+
+  * chiark-backup: full dumps have tapedesc in TAPEID
+
+ --
+
 chiark-utils (3.0.3) unstable; urgency=low
 
   * chiark-backup: compatibility with md5sum from dpkg 1.10.4.