$tape= $next;
}
-proc checkdevspec ($$$) {
- my ($atf,$devspec,$why);
+sub checkdevspec ($$$) {
+ my ($atf,$devspec,$why) = @_;
push @{ $devspec{$atf}{$devspec} }, $why;
}
for $pfx ('', sort keys %prefix) {
$rstr= length($pfx) ? $prefix{$pfx}.' ' : '';
$dfstr= exists($prefixdf{$pfx}) ? $prefixdf{$pfx} :
- 'df --no-sync -xiso9660 -xnfs -xproc';
+ 'df -P --no-sync -xiso9660 -xnfs -xproc -xtmpfs';
$cmd= "$rstr $dfstr";
open X, "$cmd |" or die $!;
$_= <X>; m/^Filesystem/ or die "$cmd => $_ ?";
next if m,^procfs\s,;
m,^/dev/(\S+)\s.*\s(/\S*)\s*$, or die "$_ ?";
($dev,$mp) = ($1,$2);
- checkdevspec("$pcstr$imp","$pcstr/dev/$dev","df");
+ checkdevspec("$pcstr$mp","$pcstr/dev/$dev","df");
$mounted{"$pcstr$mp"}="$pcstr$dev"; print " $1-$2";
if (defined($backto= $backed{"$pcstr$mp"})) {
if (m,^/dev/\S+\s+\d+\s+(\d+)\s,) {
$usedkb{$backto} += $1;
- } else {
- $usedkb{$backto} += 0;
- $unkkb{$backto} .= " + $prefix:$mp";
+ $countedkb{"$pcstr$mp"}++;
}
}
}
}
foreach $fsg (keys %usedkb) {
- print "filesystem group $fsg: $usedkb{$fsg} 1K-blocks$unkkb{$fsg}\n";
+ print "filesystem group $fsg: $usedkb{$fsg} 1K-blocks raw accounted\n";
}
-foreach $dsk (keys $devspec) {
- if (@{ $devspec{$dsk} } != 1) {
- foreach $devspec @{ $devspec{$dsk} } {
- &e("inconsistent devices for $dsk: $devspec");
+foreach $fsg (keys %backed) {
+ next if $countedkb{$fsg};
+ print "unaccounted filesystem: $fsg\n";
+}
+
+foreach $dsk (keys %devspec) {
+ if (keys %{ $devspec{$dsk} } != 1) {
+ foreach $devspec (keys %{ $devspec{$dsk} }) {
+ &e("inconsistent devices for $dsk: $devspec (".
+ join(', ', @{ $devspec{$dsk}{$devspec} }).")");
}
}
}
for $fs (sort keys %backed) { length($mounted{$fs}) || &e("dumped ($backed{$fs}), not a mount point: $fs"); }
for $fs (sort keys %incrd) { length($mounted{$fs}) || &e("increm'd ($incrd{$fs}), not a mount point: $fs"); }
-for $fs (sort keys %mounted) {
- next if $backed{$fs}
- length($backed{$fs}) || &e("mount point ($mounted{$fs}), not dumped: $fs"); }
+for $fs (sort keys %mounted) { length($backed{$fs}) || &e("mount point ($mounted{$fs}), not dumped: $fs"); }
for $fs (sort keys %mounted) { length($incrd{$fs}) || &e("mount point ($mounted{$fs}), not increm'd: $fs"); }
$emsg.= "configuration ok\n" unless $e;