summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.org>2004-06-29 10:41:37 +0000
committerOlivier Blin <oblin@mandriva.org>2004-06-29 10:41:37 +0000
commit7fc03519620b88cc83a498a9e238d25a890d6122 (patch)
tree2e00c3913c522441574f650c447a5c6d2bb9f560
parent6c2c2415d32f33655f632e17ce1dd95b18a0a109 (diff)
downloaddrakx-7fc03519620b88cc83a498a9e238d25a890d6122.tar
drakx-7fc03519620b88cc83a498a9e238d25a890d6122.tar.gz
drakx-7fc03519620b88cc83a498a9e238d25a890d6122.tar.bz2
drakx-7fc03519620b88cc83a498a9e238d25a890d6122.tar.xz
drakx-7fc03519620b88cc83a498a9e238d25a890d6122.zip
always update $part{device} in fs::subpart_from_wild_device_name because /dev is stripped (fix #6982, #10175)
-rw-r--r--perl-install/fs.pm4
1 files changed, 2 insertions, 2 deletions
diff --git a/perl-install/fs.pm b/perl-install/fs.pm
index 62d286dc4..dda2716f5 100644
--- a/perl-install/fs.pm
+++ b/perl-install/fs.pm
@@ -152,8 +152,8 @@ sub subpart_from_wild_device_name {
}
$dev =~ s!/(tmp|dev)/!!;
- my $is_devfs = $dev =~ m!/(disc|part\d+)$!;
- $part{$is_devfs ? 'devfs_device' : 'device'} = $dev;
+ $part{device} = $dev;
+ $part{devfs_device} = $dev if $dev =~ m!/(disc|part\d+)$!;
return \%part;
} else {
log::l("part_from_wild_device_name: unknown device $dev");