summaryrefslogtreecommitdiffstats
path: root/perl-install/fs.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2001-08-19 23:20:19 +0000
committerPascal Rigaux <pixel@mandriva.com>2001-08-19 23:20:19 +0000
commit528338fa75e8ceedbf17763bf5a5c094e92d0fe8 (patch)
treeeba70b060fea721ded1b6f1fb36462730f5390ee /perl-install/fs.pm
parent8c744cf3d47bf1295ced161e7ef9776a25efeeb8 (diff)
downloaddrakx-528338fa75e8ceedbf17763bf5a5c094e92d0fe8.tar
drakx-528338fa75e8ceedbf17763bf5a5c094e92d0fe8.tar.gz
drakx-528338fa75e8ceedbf17763bf5a5c094e92d0fe8.tar.bz2
drakx-528338fa75e8ceedbf17763bf5a5c094e92d0fe8.tar.xz
drakx-528338fa75e8ceedbf17763bf5a5c094e92d0fe8.zip
rename isCdNotEjectable in usingRamdisk, ensure no files are removed unless we're in ramdisk
Diffstat (limited to 'perl-install/fs.pm')
-rw-r--r--perl-install/fs.pm4
1 files changed, 2 insertions, 2 deletions
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;