X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=backup%2Fcheckallused;fp=backup%2Fcheckallused;h=600fb88e5be383e9d1078aabd31beeaa3612a1e5;hb=d1b0cf6453e5562e8b1693390f32c7f45aab7cc9;hp=fd613f3181b75d91c5fc603c70f510ad40ee2337;hpb=49b87b31128ab8bf32998d60eeacfe397a5a4b19;p=chiark-utils.git

diff --git a/backup/checkallused b/backup/checkallused
index fd613f3..600fb88 100755
--- a/backup/checkallused
+++ b/backup/checkallused
@@ -38,8 +38,6 @@ for $fsg (sort keys %fsgdone) {
     for $tf (@fsys) {
 	parsefsys();
 	$pstr= $prefix ne '<local>' ? "$prefix:$atf" : $atf;
-	&e("dumped twice ($backed{$pstr}, $fsg): $pstr")
-	    if defined $backed{$pstr};
 	$backed{$pstr}= $fsg;
 	print " $pstr";
     }
@@ -59,36 +57,19 @@ print "\n";
 
 for $pfx ('', sort keys %prefix) {
     $rstr= length($pfx) ? $prefix{$pfx}.' ' : '';
-    $dfstr= exists($prefixdf{$pfx}) ? $prefixdf{$pfx} :
-	'df --no-sync -xiso9660 -xnfs -xproc';
-    $cmd= "$rstr $dfstr";
-    open X, "$cmd |" or die $!;
-    $_= <X>; m/^Filesystem/ or die "$cmd => $_ ?";
+    open X, $rstr." df --no-sync -xnfs |" or die $!;
+    $_= <X>; m/^Filesystem/ or die "$_ ?";
     $ppstr= length($pfx) ? $pfx : '<local>';
     $pstr= length($pfx) ? "$pfx:" : '';
     print "mount points: $ppstr:";
     while (<X>) {
 	chomp;
-	next if m,^procfs\s,;
 	m,^/dev/(\S+)\s.*\s(/\S*)\s*$, or die "$_ ?";
-	($dev,$mp) = ($1,$2);
-	$mounted{"$pstr$mp"}="$pstr$dev"; print " $1-$2";
-	if (defined($backto= $backed{"$pstr$mp"})) {
-	    if (m,^/dev/\S+\s+\d+\s+(\d+)\s,) {
-		$usedkb{$backto} += $1;
-	    } else {
-		$usedkb{$backto} += 0;
-		$unkkb{$backto} .= " + $pstr$mp";
-	    }
-	}
+	$mounted{"$pstr$2"}="$pstr$1"; print " $1-$2";
     }
     print "\n";
-    $!=0; close(X); $? and die "$cmd $? $!";
-}
-
-foreach $fsg (keys %usedkb) {
-    print "filesystem group $fsg: $usedkb{$fsg} 1K-blocks$unkkb{$fsg}\n";
 }
+$!=0; close(X); $? and die "$? $!";
 
 open Z,"$etc/expected-diffs" or die $!;
 for (;;) {