--- a/SI/blkid.pm Mon Jan 18 20:35:27 2010 +0100
+++ b/SI/blkid.pm Sun Jan 17 13:54:10 2010 +0100
@@ -11,21 +11,15 @@
sub ids($\%) {
my ($file, $devs) = @_;
- verbose("reading blkids:");
- foreach (`blkid -c /dev/null`) {
+ my @volumes = sort keys %{$devs->{volume}};
+ verbose("reading blkids: @volumes");
+ foreach (`blkid -c /dev/null @volumes`) {
my $dev = (split /:/)[0];
- ### $dev
- verbose($dev);
my ($uuid) = /\sUUID=.(.*?).\s/;
my ($type) = /\sTYPE=.(.*?).\s/;
my ($label) = /\sLABEL=.(.*?).\s/;
- # dev mapper names should be replaced by nicer ones
- if ($dev =~ /\/dev\/dm-/) {
- $dev = find_by_devid("/dev/mapper", (stat $dev)[6]);
- };
-
if (exists $devs->{volume}{$dev}) {
$devs->{volume}{$dev}{uuid} = $uuid;
$devs->{volume}{$dev}{type} = $type;