# Parse a line from a filesystem definition file. We expect the line
# to be in $tf.
sub parsefsys () {
- if ($tf =~ m,^(/\S*)\s+(\w+)$,) {
- # Line of form '/file/system dumptype'
+ my ($dopts,$dopt);
+ if ($tf =~ m,^(/\S*)\s+(\w+)([,0-9a-z]+)$,) {
+ # Line of form '/file/system dumptype[,options]'
$atf= $1;
$tm= $2;
+ $dopts= $3;
$prefix= '<local>';
stat $atf or die "stat $atf: $!";
-d _ or die "not a dir: $atf";
$rstr= '';
- } elsif ($tf =~ m,^(/\S*)\s+(\w+)\s+(\w+)$,) {
- # Line of form '/file/system dumptype prefix'
- # (used for remote backups, I think)
+ } elsif ($tf =~ m,^(/\S*)\s+(\w+)([,0-9a-z]+)\s+(\w+)$,) {
+ # Line of form '/file/system dumptype[,options] prefix'
+ # (used for remote backups)
$atf= $1;
$tm= $2;
- $prefix= $3;
+ $dopts= $3;
+ $prefix= $4;
defined($prefix{$prefix}) or die "prefix $prefix in $tf ?\n";
$rstr= $prefix{$prefix}.' ';
+ } else {
+ die "fsys $tf ?";
+ }
+ undef %dopt;
+ foreach $dopt (split /\,/,$dopts) {
+ if (grep { $dopt eq $_ } qw(gz)) {
+ $dopt{$dopt}= 'y';
+ } elsif ($dopt =~ m/\=/ && grep { $` eq $_ } qw(gz)) {
+ $dopt{$`}= $';
+ } else {
+ die "unknown option $dopt";
+ }
}
}
pipe(FINDOR,FINDOW) or die $!;
pipe(DUMPOR,DUMPOW) or die $!;
pipe(TEEOR,TEEOW) or die $!;
+ $bufir='TEEOR';
+
+ if ($dopt{'gz'} eq 'y') {
+ $gz= '3';
+ } elsif ($dopt{'gz'} =~ m/^\d$/) {
+ $gz= $dopt{'gz'};
+ } elsif (defined $dopt{'gz'}) {
+ die "$tf bad gz";
+ } else {
+ $gz= 0;
+ }
+ if ($gz) {
+ $bufir='GZOR';
+ pipe(GZOR,GZOW) or die $!;
+ }
+
pipe(BUFOR,BUFOW) or die $!;
parsefsys();
startprocess '<p','>>this-md5sums','md5sum';
startprocess $dumpin,'>&DUMPOW',$rstr.$dumpcmd;
startprocess '<&DUMPOR','>&TEEOW','tee p';
- startprocess '<&TEEOR','>&BUFOW','writebuffer';
+ if ($gz) {
+ startprocess '<&TEEOR','>&GZOW','gzip -v$gz';
+ }
+ startprocess '<&$bufir','>&BUFOW','writebuffer';
startprocess '<&BUFOR','>/dev/null'
,"dd ibs=$softblocksizebytes obs=$blocksizebytes of=$ntape";
closepipes();
-chiark-utils (3.0.4) unstable; urgency=low
+chiark-utils (3.0.3.99) unstable; urgency=low
* chiark-backup: full dumps have tapedesc in TAPEID
- --
+ -- Ian Jackson <ian@davenant.greenend.org.uk> Mon, 5 May 2003 17:09:40 +0100
chiark-utils (3.0.3) unstable; urgency=low