summaryrefslogtreecommitdiffstats
path: root/perl-install
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
parent18f99365371c0fa34b22e4011feafee2813ae36d (diff)
downloaddrakx-backup-do-not-use-bc184c28974dfa435242ff04b610c5f9fe4e4404.tar
drakx-backup-do-not-use-bc184c28974dfa435242ff04b610c5f9fe4e4404.tar.gz
drakx-backup-do-not-use-bc184c28974dfa435242ff04b610c5f9fe4e4404.tar.bz2
drakx-backup-do-not-use-bc184c28974dfa435242ff04b610c5f9fe4e4404.tar.xz
drakx-backup-do-not-use-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')
-rw-r--r--perl-install/fs.pm4
-rwxr-xr-xperl-install/standalone/drakupdate_fstab2
2 files changed, 3 insertions, 3 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");
diff --git a/perl-install/standalone/drakupdate_fstab b/perl-install/standalone/drakupdate_fstab
index c911f7055..b645b7d56 100755
--- a/perl-install/standalone/drakupdate_fstab
+++ b/perl-install/standalone/drakupdate_fstab
@@ -132,7 +132,7 @@ sub main {
}
my $fstab = [ fs::read_fstab('', '/etc/fstab', 'keep_freq_passno', 'keep_devfs_name', 'verbatim_credentials') ];
- my ($existing_fstab_entries, $fstab_) = partition { $_->{device} eq $part->{device} || $_->{device} eq $part->{devfs_device} } @$fstab;
+ my ($existing_fstab_entries, $fstab_) = partition { fsedit::is_same_hd($_, $part) } @$fstab;
if ($action eq 'add') {
if (@$existing_fstab_entries) {