summaryrefslogtreecommitdiffstats
path: root/perl-install/fs.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2001-09-06 13:15:55 +0000
committerPascal Rigaux <pixel@mandriva.com>2001-09-06 13:15:55 +0000
commit3e49147ec07edabd7653362a61959f42c8c0b8ba (patch)
tree63ad60afa606692d6739d22f703facaad59a07a5 /perl-install/fs.pm
parent4b8d53d3d043a3111a946534c525ceb84bd1d369 (diff)
downloaddrakx-3e49147ec07edabd7653362a61959f42c8c0b8ba.tar
drakx-3e49147ec07edabd7653362a61959f42c8c0b8ba.tar.gz
drakx-3e49147ec07edabd7653362a61959f42c8c0b8ba.tar.bz2
drakx-3e49147ec07edabd7653362a61959f42c8c0b8ba.tar.xz
drakx-3e49147ec07edabd7653362a61959f42c8c0b8ba.zip
(merge_fstabs): correction allowing manual_fstab to not give the type
Diffstat (limited to 'perl-install/fs.pm')
-rw-r--r--perl-install/fs.pm2
1 files changed, 1 insertions, 1 deletions
diff --git a/perl-install/fs.pm b/perl-install/fs.pm
index d12abc368..0e7c3f02e 100644
--- a/perl-install/fs.pm
+++ b/perl-install/fs.pm
@@ -66,7 +66,7 @@ sub merge_fstabs {
my ($p2) = grep { fsedit::is_same_hd($_, $p) } @l or next;
@l = grep { !fsedit::is_same_hd($_, $p) } @l;
- $p->{type} ne $p2->{type} && type2fs($p) ne type2fs($p2) && $p->{type} ne 'auto' && $p2->{type} ne 'auto' and
+ $p2->{type} && $p->{type} ne $p2->{type} && type2fs($p) ne type2fs($p2) && $p->{type} ne 'auto' && $p2->{type} ne 'auto' and
log::l("err, fstab and partition table do not agree for $p->{device} type: " . (type2fs($p) || type2name($p->{type})) . " vs ", (type2fs($p2) || type2name($p2->{type}))), next;
$p->{mntpoint} = $p2->{mntpoint} if delete $p->{unsafeMntpoint};