diff -r 8242547f4965 -r 39421a9700c5 SI/system.pm --- a/SI/system.pm Wed Jan 20 17:44:57 2010 +0100 +++ b/SI/system.pm Wed Jan 20 21:35:35 2010 +0100 @@ -22,32 +22,38 @@ my $mnt = tempdir(CLEANUP => 1); my $h; - foreach my $fs (grep { exists $devs->{volume}{$_}{type} and $devs->{volume}{$_}{type} =~ /^ext/i } @{$devs->{volumes}}) + foreach my $fs ( + grep { + exists $devs->{volume}{$_}{type} + and $devs->{volume}{$_}{type} =~ /^ext/i + } @{ $devs->{volumes} } + ) { run("mount -r $fs $mnt"); if (-f "$mnt/etc/hostname") { chomp($h = cat("$mnt/etc/hostname")); } run("umount $mnt"); - return $h if defined $h; + return $h if defined $h; } return $h; } sub fsck(\%) { - my $devs = shift; - - foreach my $v ( grep { exists $devs->{volume}{type} } keys %{$devs->{volume}} ) { - my $volume = $devs->{volume}{$v}; - next if $volume->{type} !~ /^ext/i; + my $devs = shift; - system("fsck -C0 $v"); - die "ERR: fsck failed\n" if $? > 2; - } + foreach + my $v (grep { exists $devs->{volume}{type} } keys %{ $devs->{volume} }) + { + my $volume = $devs->{volume}{$v}; + next if $volume->{type} !~ /^ext/i; + + system("fsck -C0 $v"); + die "ERR: fsck failed\n" if $? > 2; + } } - 1; # vim:sts=4 sw=4 aw ai si: