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

[chiark-utils.git] / backup / backuplib.pl

diff --git a/backup/backuplib.pl b/backup/backuplib.pl
index 174dc812c9678320c53328e31c0ea0d50a05cfd0..1c6b64c4ceb62c4d59e5d869cdf264eea62cc08f 100644 (file)
--- a/backup/backuplib.pl
+++ b/backup/backuplib.pl
@@ -43,8 +43,7 @@ sub setstatus ($) {
 # used to implement the funky pipeline stuff.
 sub startprocess ($$$) {
     my ($i,$o,$c) = @_;
-    print LOG "  $c\n" or die $!;
-    print "  $c\n" or die $!;
+    pboth("  $c\n");
     defined($p= fork) or die $!;
     if ($p) { $processes{$p}= $c; return; }
     open STDIN,"$i" or die "$c stdin $i: $!";
@@ -137,6 +136,8 @@ sub readfsysfile ($) {
            $prefix{$1}= $2;
        } elsif (m/^prefix\-df\s+(\w+)\s+(\S.*\S)$/) {
            $prefixdf{$1}= $2;
+       } elsif (m/^snap(?:\=(\w+))?\s+(\w+)\s+(\w+)$/) {
+            push @excldir,$1;
        } elsif (m/^excludedir\s+(\S.*\S)$/) {
             push @excldir,$1;
         } elsif (m/^exclude\s+(\S.*\S)$/) {
@@ -195,7 +196,9 @@ sub parsefsys () {
     foreach $dopt (split /\,/,$dopts) {
        if (grep { $dopt eq $_ } qw(gz)) {
            $dopt{$dopt}= 'y';
-       } elsif ($dopt =~ m/\=/ && grep { $` eq $_ } qw(gz)) {
+       if (grep { $dopt eq $_ } qw(snap)) {
+           $dopt{$dopt}= $dopt;
+       } elsif ($dopt =~ m/\=/ && grep { $` eq $_ } qw(gz snap)) {
            $dopt{$`}= $';
        } elsif (length $dopt) {
            die "unknown option $dopt (in $dopts $tf)";
@@ -216,6 +219,37 @@ sub parsefsys () {
     }
 }
 
+sub prepfsys () {
+    if (length $dopt{'snap'}) {
+       system('snap-drop'); $? and die $?;
+       
+       $snapscripts= '/etc/chiark-backup/snap';
+       $snapbase= "$pcstr $snapscripts/$dopt{'snap'} /var/lib/chiark-backup";
+
+       $snapsnap= "$snapbase snap $dev $atf";
+       $snapdrop= "$snapbase drop";
+
+       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 $?;
+
+       $dev_nosnap= $dev;
+       $atf_nosnap= $atf;
+       $dev= "/var/lib/chiark-backup/snap-device";
+       $atf= "/var/lib/chiark-backup/snap-mount";
+    }
+}
+
+sub finfsys () {
+    if (length $dopt{'snap'}) {
+       system('snap-drop'); $? and die $?;
+    }
+}
+
 sub openlog () {
     unlink 'log';
     $u= umask(007);