From bd45f62da63fc2640d9255d81a1eb27fd3fc4809 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Wed, 1 Jun 2005 06:55:40 +0000
Subject: ensure reading existing fstab in suggest_mount_points doesn't get its
 options

---
 perl-install/fs.pm | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'perl-install/fs.pm')

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}
-- 
cgit v1.2.1