summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2005-06-01 06:55:40 +0000
committerPascal Rigaux <pixel@mandriva.com>2005-06-01 06:55:40 +0000
commitbd45f62da63fc2640d9255d81a1eb27fd3fc4809 (patch)
treedc98f23a42eb149ae790684b98400a095139201f
parenteec187b6c3ee3e6fb6f8cecbd726f0fe2b54be50 (diff)
downloaddrakx-bd45f62da63fc2640d9255d81a1eb27fd3fc4809.tar
drakx-bd45f62da63fc2640d9255d81a1eb27fd3fc4809.tar.gz
drakx-bd45f62da63fc2640d9255d81a1eb27fd3fc4809.tar.bz2
drakx-bd45f62da63fc2640d9255d81a1eb27fd3fc4809.tar.xz
drakx-bd45f62da63fc2640d9255d81a1eb27fd3fc4809.zip
ensure reading existing fstab in suggest_mount_points doesn't get its options
-rw-r--r--perl-install/fs.pm11
1 files changed, 7 insertions, 4 deletions
diff --git a/perl-install/fs.pm b/perl-install/fs.pm
index 754f0b7d0..ed0e08e92 100644
--- a/perl-install/fs.pm
+++ b/perl-install/fs.pm
@@ -112,10 +112,13 @@ sub merge_fstabs {
$p->{mntpoint} = $p2->{mntpoint} if delete $p->{unsafeMntpoint};
- $p->{fs_type} = $p2->{fs_type} if $p2->{fs_type} && !$loose;
- $p->{options} = $p2->{options} if $p2->{options} && !$loose;
- #- important to get isMounted property else DrakX may try to mount already mounted partitions :-(
- add2hash($p, $p2);
+ if (!$loose) {
+ $p->{fs_type} = $p2->{fs_type} if $p2->{fs_type};
+ $p->{options} = $p2->{options} if $p2->{options};
+ add2hash($p, $p2);
+ } else {
+ $p->{isMounted} ||= $p2->{isMounted};
+ }
$p->{device_alias} ||= $p2->{device_alias} || $p2->{device} if $p->{device} ne $p2->{device} && $p2->{device} !~ m|/|;
$p->{fs_type} && $p2->{fs_type} && $p->{fs_type} ne $p2->{fs_type}