diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2001-08-19 23:20:19 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2001-08-19 23:20:19 +0000 |
| commit | 528338fa75e8ceedbf17763bf5a5c094e92d0fe8 (patch) | |
| tree | eba70b060fea721ded1b6f1fb36462730f5390ee /perl-install/fs.pm | |
| parent | 8c744cf3d47bf1295ced161e7ef9776a25efeeb8 (diff) | |
| download | drakx-backup-do-not-use-528338fa75e8ceedbf17763bf5a5c094e92d0fe8.tar drakx-backup-do-not-use-528338fa75e8ceedbf17763bf5a5c094e92d0fe8.tar.gz drakx-backup-do-not-use-528338fa75e8ceedbf17763bf5a5c094e92d0fe8.tar.bz2 drakx-backup-do-not-use-528338fa75e8ceedbf17763bf5a5c094e92d0fe8.tar.xz drakx-backup-do-not-use-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.pm | 4 |
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; |