summaryrefslogtreecommitdiffstats
path: root/perl-install/fs.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2000-09-05 14:21:48 +0000
committerPascal Rigaux <pixel@mandriva.com>2000-09-05 14:21:48 +0000
commit44b596453c50044debba901575eb015045ae845d (patch)
tree478ad04ac879df73742947911a123b2e7bd82652 /perl-install/fs.pm
parent25365fea641e9e5bcec2372695c9438d099b78eb (diff)
downloaddrakx-44b596453c50044debba901575eb015045ae845d.tar
drakx-44b596453c50044debba901575eb015045ae845d.tar.gz
drakx-44b596453c50044debba901575eb015045ae845d.tar.bz2
drakx-44b596453c50044debba901575eb015045ae845d.tar.xz
drakx-44b596453c50044debba901575eb015045ae845d.zip
no_comment
Diffstat (limited to 'perl-install/fs.pm')
-rw-r--r--perl-install/fs.pm5
1 files changed, 3 insertions, 2 deletions
diff --git a/perl-install/fs.pm b/perl-install/fs.pm
index cd7434edd..7b9563ebb 100644
--- a/perl-install/fs.pm
+++ b/perl-install/fs.pm
@@ -71,8 +71,9 @@ sub get_mntpoints_from_fstab {
$p->{device} eq $_->{device} or next;
$_->{type} ne 'auto' && $_->{type} ne type2fs($p->{type}) and
log::l("err, fstab and partition table do not agree for $_->{device} type: " . (type2fs($p->{type}) || type2name($p->{type})) . " vs $_->{type}"), next;
- $p->{mntpoint} ||= $_->{mntpoint};
- $p->{options} ||= $_->{options};
+ delete $_->{unsafeMntpoint} || !$_->{mntpoint} or next;
+ $p->{mntpoint} = $_->{mntpoint};
+ $p->{options} = $_->{options};
}
}
}