summaryrefslogtreecommitdiffstats
path: root/perl-install/fs.pm
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.org>2004-06-29 13:18:04 +0000
committerOlivier Blin <oblin@mandriva.org>2004-06-29 13:18:04 +0000
commitbc184c28974dfa435242ff04b610c5f9fe4e4404 (patch)
treefbf648acf32f71ceafd5aeeda8a5f8c3cb5bddc1 /perl-install/fs.pm
parent18f99365371c0fa34b22e4011feafee2813ae36d (diff)
downloaddrakx-bc184c28974dfa435242ff04b610c5f9fe4e4404.tar
drakx-bc184c28974dfa435242ff04b610c5f9fe4e4404.tar.gz
drakx-bc184c28974dfa435242ff04b610c5f9fe4e4404.tar.bz2
drakx-bc184c28974dfa435242ff04b610c5f9fe4e4404.tar.xz
drakx-bc184c28974dfa435242ff04b610c5f9fe4e4404.zip
use fsedit::is_same_hd in drakupdate_fstab and revert previous change in fs::subpart_from_wild_device_name (do not fill both devfs_device and device fields)
Diffstat (limited to 'perl-install/fs.pm')
-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 6093b005e..35399d3be 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)/!!;
- $part{device} = $dev;
- $part{devfs_device} = $dev if $dev =~ m!/(disc|part\d+)$!;
+ my $is_devfs = $dev =~ m!/(disc|part\d+)$!;
+ $part{$is_devfs ? 'devfs_device' : 'device'} = $dev;
return \%part;
} else {
log::l("part_from_wild_device_name: unknown device $dev");