X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=chiark-utils.git;a=blobdiff_plain;f=backup%2Fcheckallused;h=c0079d08bb726d4b4faa33fb4cab736ca2af23ea;hp=c4856d052ff2f399684d0d0878a125924e74e7f3;hb=19b4b2b99d4a7bdb0d4e8ca569a1d2f28612f6de;hpb=6e9e36a3b3f4176c2b2ac9584d4deea6f1f5c55d;ds=sidebyside

diff --git a/backup/checkallused b/backup/checkallused
index c4856d0..c0079d0 100755
--- a/backup/checkallused
+++ b/backup/checkallused
@@ -6,12 +6,13 @@
 # other UN*X-compatible machines, as used on chiark.greenend.org.uk.
 #
 # chiark backup is:
-#  Copyright (C) 1997-1998,2000-2001 Ian Jackson <ian@chiark.greenend.org.uk>
+#  Copyright (C) 1997-1998,2000-2001,2007
+#                     Ian Jackson <ian@chiark.greenend.org.uk>
 #  Copyright (C) 1999 Peter Maydell <pmaydell@chiark.greenend.org.uk>
 #
 # This is free software; you can redistribute it and/or modify it under the
 # terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2, or (at your option) any later version.
+# Foundation; either version 3, or (at your option) any later version.
 #
 # This is distributed in the hope that it will be useful, but WITHOUT ANY
 # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
@@ -19,8 +20,8 @@
 # details.
 #
 # You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# with this program; if not, consult the Free Software Foundation's
+# website at www.fsf.org, or the GNU Project website at www.gnu.org.
 
 # All filesystems must either be backed up in both full and
 # incremental dumps or listed as exceptions.
@@ -58,7 +59,6 @@ while (!defined $tapedone{$tape}) {
 
 sub checkdevspec ($$$) {
     my ($atf,$devspec,$why) = @_;
-    print STDERR "checkdevspec >$atf|$devspec|$why<\n";
     push @{ $devspec{$atf}{$devspec} }, $why;
 }
 
@@ -94,7 +94,7 @@ print "\n";
 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 => $_ ?";
@@ -111,9 +111,7 @@ for $pfx ('', sort keys %prefix) {
 	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"}++;
 	    }
 	}
     }
@@ -122,7 +120,12 @@ for $pfx ('', sort keys %prefix) {
 }
 
 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 $fsg (keys %backed) {
+    next if $countedkb{$fsg};
+    print "unaccounted filesystem: $fsg\n";
 }
 
 foreach $dsk (keys %devspec) {