chiark
/
gitweb
/
~ian
/
chiark-utils.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
@@ -1,3 +1,10 @@
[chiark-utils.git]
/
backup
/
checkallused
diff --git
a/backup/checkallused
b/backup/checkallused
index c4856d052ff2f399684d0d0878a125924e74e7f3..62aef2d1f5dba73632fe66342d21c6844d90fb67 100755
(executable)
--- a/
backup/checkallused
+++ b/
backup/checkallused
@@
-58,7
+58,6
@@
while (!defined $tapedone{$tape}) {
sub checkdevspec ($$$) {
my ($atf,$devspec,$why) = @_;
sub checkdevspec ($$$) {
my ($atf,$devspec,$why) = @_;
- print STDERR "checkdevspec >$atf|$devspec|$why<\n";
push @{ $devspec{$atf}{$devspec} }, $why;
}
push @{ $devspec{$atf}{$devspec} }, $why;
}
@@
-94,7
+93,7
@@
print "\n";
for $pfx ('', sort keys %prefix) {
$rstr= length($pfx) ? $prefix{$pfx}.' ' : '';
$dfstr= exists($prefixdf{$pfx}) ? $prefixdf{$pfx} :
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 => $_ ?";
$cmd= "$rstr $dfstr";
open X, "$cmd |" or die $!;
$_= <X>; m/^Filesystem/ or die "$cmd => $_ ?";
@@
-111,9
+110,7
@@
for $pfx ('', sort keys %prefix) {
if (defined($backto= $backed{"$pcstr$mp"})) {
if (m,^/dev/\S+\s+\d+\s+(\d+)\s,) {
$usedkb{$backto} += $1;
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
+119,12
@@
for $pfx ('', sort keys %prefix) {
}
foreach $fsg (keys %usedkb) {
}
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) {
}
foreach $dsk (keys %devspec) {