foreach (@fstab) {
my ($spec, $file) = @$_;
- my ($dev, $fs) = _find_filesystem ($g, $fses, $spec);
+ my ($dev, $fs) = _find_filesystem ($g, $fses, $spec, $file);
if ($dev) {
$r->{mounts}->{$file} = $dev;
$r->{filesystems}->{$dev} = $fs;
my $g = shift;
my $fses = shift;
local $_ = shift;
+ my $file = shift;
if (/^LABEL=(.*)/) {
my $label = $1;
foreach (sort keys %$fses) {
if (exists $fses->{$_}->{label} &&
- $fses->{$_}->{label} eq $label) {
+ $fses->{$_}->{label} =~ /$label/i) {
return ($_, $fses->{$_});
}
}
return ("/dev/$1/$2", $fses->{"/dev/$1/$2"});
}
+ return () if $file =~ (/media\/cdrom/);
return () if m{/dev/cdrom};
return () if m{/dev/fd0};