equal
deleted
inserted
replaced
9 |
9 |
10 |
10 |
11 sub ids($\%) { |
11 sub ids($\%) { |
12 my ($file, $devs) = @_; |
12 my ($file, $devs) = @_; |
13 |
13 |
14 verbose("reading blkids:"); |
14 my @volumes = sort keys %{$devs->{volume}}; |
15 foreach (`blkid -c /dev/null`) { |
15 verbose("reading blkids: @volumes"); |
|
16 foreach (`blkid -c /dev/null @volumes`) { |
16 my $dev = (split /:/)[0]; |
17 my $dev = (split /:/)[0]; |
17 ### $dev |
|
18 verbose($dev); |
|
19 |
18 |
20 my ($uuid) = /\sUUID=.(.*?).\s/; |
19 my ($uuid) = /\sUUID=.(.*?).\s/; |
21 my ($type) = /\sTYPE=.(.*?).\s/; |
20 my ($type) = /\sTYPE=.(.*?).\s/; |
22 my ($label) = /\sLABEL=.(.*?).\s/; |
21 my ($label) = /\sLABEL=.(.*?).\s/; |
23 |
|
24 # dev mapper names should be replaced by nicer ones |
|
25 if ($dev =~ /\/dev\/dm-/) { |
|
26 $dev = find_by_devid("/dev/mapper", (stat $dev)[6]); |
|
27 }; |
|
28 |
22 |
29 if (exists $devs->{volume}{$dev}) { |
23 if (exists $devs->{volume}{$dev}) { |
30 $devs->{volume}{$dev}{uuid} = $uuid; |
24 $devs->{volume}{$dev}{uuid} = $uuid; |
31 $devs->{volume}{$dev}{type} = $type; |
25 $devs->{volume}{$dev}{type} = $type; |
32 $devs->{volume}{$dev}{label} = $label; |
26 $devs->{volume}{$dev}{label} = $label; |