X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=chiark-utils.git;a=blobdiff_plain;f=backup%2Fbackuplib.pl;h=b537f2ff7544874d6693141f8f851cf7630d305f;hp=1c6b64c4ceb62c4d59e5d869cdf264eea62cc08f;hb=50fe60865662b13acaa1efcc49f1837fdffd785a;hpb=7d4185f54b99fef18f8661ea1d5974171f997f1e

diff --git a/backup/backuplib.pl b/backup/backuplib.pl
index 1c6b64c..b537f2f 100644
--- a/backup/backuplib.pl
+++ b/backup/backuplib.pl
@@ -173,8 +173,6 @@ sub parsefsys () {
 	$dopts= $3;
 	$prefix= '<local>';
 	$pcstr= '';
-	stat $atf or die "stat $atf: $!";
-	-d _ or die "not a dir: $atf";
 	$rstr= '';
     } elsif ($tf =~ m#^(/\S*)\s+(\w+)([,=0-9a-z]*)\s+(\w+)$#) {
         # Line of form '[/device:]/file/system dumptype[,options] prefix'
@@ -190,13 +188,23 @@ sub parsefsys () {
 	die "fsys $tf ?";
     }
 
+    $fsidstr= $pcstr.$atf;
+    $fsidstr =~ s/[,+]/+$&/g;
+    $fsidstr =~ s#/#,#g;
+    $fsidfile= "/var/lib/chiark-backup/incstamp,$fsidstr";
+
     $dev = $atf =~ s,^(.*)\:,, ? $1 : '';
 
+    if (!length $pcstr) {
+	stat $atf or die "stat $atf: $!";
+	-d _ or die "not a dir: $atf";
+    }
+
     undef %dopt;
     foreach $dopt (split /\,/,$dopts) {
 	if (grep { $dopt eq $_ } qw(gz)) {
 	    $dopt{$dopt}= 'y';
-	if (grep { $dopt eq $_ } qw(snap)) {
+	} elsif (grep { $dopt eq $_ } qw(snap)) {
 	    $dopt{$dopt}= $dopt;
 	} elsif ($dopt =~ m/\=/ && grep { $` eq $_ } qw(gz snap)) {
 	    $dopt{$`}= $';
@@ -217,25 +225,38 @@ sub parsefsys () {
 	    $$gzo= '';
 	}
     }
+
+    if (length $dopt{'snap'}) {
+	length $dev or die "$pcstr:$atf no device but needed for snap";
+    }
+}
+
+sub execute ($) {
+    pboth("  $_[0]\n");
+    system $_[0]; $? and die "$_[0] $?";
 }
 
 sub prepfsys () {
+    $dev_print= $dev;
+    $atf_print= $atf;
+    
     if (length $dopt{'snap'}) {
+	
 	system('snap-drop'); $? and die $?;
 	
 	$snapscripts= '/etc/chiark-backup/snap';
-	$snapbase= "$pcstr $snapscripts/$dopt{'snap'} /var/lib/chiark-backup";
+	$snapbase= "$rstr $snapscripts/$dopt{'snap'}";
+	$snapargs= "/var/lib/chiark-backup";
 
-	$snapsnap= "$snapbase snap $dev $atf";
-	$snapdrop= "$snapbase drop";
+	$snapsnap= "$snapbase snap $snapargs $dev $atf";
+	$snapdrop= "$snapbase drop $snapargs";
 
 	open SD, ">snap-drop.new" or die $!;
 	print SD $snapdrop,"\n" or die $!;
 	close SD or die $!;
 	rename "snap-drop.new","snap-drop" or die $!;
 
-	pboth("  $snapsnap\n");
-	system $snapsnap; $? and die $?;
+	execute($snapsnap);
 
 	$dev_nosnap= $dev;
 	$atf_nosnap= $atf;