As found on chiark in /usr/local/lib/backup: better tapeid/tapedesc handling; added...

[chiark-utils.git] / backup / increm

diff --git a/backup/increm b/backup/increm
index e4ebbf75a5bf881886863164d6b61c14bc1945aa..1d2aaa774afe6633558af65fdd5665ae0ad25f59 100755 (executable)
--- a/backup/increm
+++ b/backup/increm
@@ -8,10 +8,10 @@ BEGIN {
 
 $|=1;
 
-@ARGV==1 or die;
-$tapeid= $ARGV[0];
+@ARGV==2 or die;
+($tapeid,$tapedesc)= @ARGV;
 
-print "Running incremental (tape $tapeid) ...\n" or die $!;
+print "Running incremental onto $tapedesc ...\n" or die $!;
 
 open T,"$etc/tape.$tapeid" or die "Tape $tapeid not found: $!\n";
 close T;
@@ -28,12 +28,10 @@ close A or die $!;
 
 $advance =~ m/^\d+$/ or die "$advance ?";
 
-system "mt -f $tape rewind"; $? and die $?;
-system "mt -f $tape retension"; $? and die $?;
-
+system "mt -f $ntape rewind"; $? and die $?;
 if ($advance == 1) {
     open TI,">TAPEID" or die $!;
-    print 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 $?;
@@ -71,7 +69,6 @@ for $tf (@fsys) {
 }
 
 system "mt -f $tape rewind"; $? and die $?;
-
 open IAN,">increm-advance.new" or die $!;
 print IAN "$advance\n" or die $!;
 close IAN or die $!;
@@ -80,5 +77,5 @@ 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 $!;
 
-setstatus "INCREMENTAL successful (next full is $next)";
+setstatus "INCREMENTAL successful: $tapedesc, next full is $next";
 exit 0;