From 528338fa75e8ceedbf17763bf5a5c094e92d0fe8 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Sun, 19 Aug 2001 23:20:19 +0000
Subject: rename isCdNotEjectable in usingRamdisk, ensure no files are removed
 unless we're in ramdisk

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

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

diff --git a/perl-install/fs.pm b/perl-install/fs.pm
index ef520d5a9..d4e9a53fc 100644
--- a/perl-install/fs.pm
+++ b/perl-install/fs.pm
@@ -62,8 +62,8 @@ sub merge_fstabs {
 	
 	$p->{mntpoint} = $p2->{mntpoint} if delete $p->{unsafeMntpoint};
 
-	$p->{type} = $p2->{type} if $p->{type} eq 'defaults';
-	$p->{options} = $p2->{options};
+	$p->{type} ||= $p2->{type};
+	$p->{options} = $p2->{options} if $p->{type} eq 'defaults';
 	add2hash($p, $p2);
     }
     @l;
-- 
cgit v1.2.1