--- a/SI/blkid.pm Sun Jan 17 16:40:08 2010 +0100
+++ b/SI/blkid.pm Mon Jan 18 20:35:27 2010 +0100
@@ -4,25 +4,9 @@
use strict;
use warnings;
-use File::Find;
-
use SI::tools;
-sub find_by_devid($$) {
- my ($dir, $id) = @_;
- my $found;
- find(
- sub {
- return if $found;
- $found = (stat)[6] == $id ? $File::Find::name : undef;
- return;
- },
- $dir
- );
- return $found;
-}
-
sub ids($\%) {
my ($file, $devs) = @_;
@@ -37,15 +21,8 @@
my ($type) = /\sTYPE=.(.*?).\s/;
my ($label) = /\sLABEL=.(.*?).\s/;
- #if ($dev ~~ $devs->{physical}) {
- #$devs->{physical}{$dev}{uuid} = $uuid;
- #$devs->{physical}{$dev}{type} = $type;
- #$devs->{physical}{$dev}{label} = $label;
- #next;
- #}
-
# dev mapper names should be replaced by nicer ones
- if ($dev ~~ /^\/dev\/dm-/) {
+ if ($dev =~ /\/dev\/dm-/) {
$dev = find_by_devid("/dev/mapper", (stat $dev)[6]);
};