summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2001-09-24 14:06:06 +0000
committerPascal Rigaux <pixel@mandriva.com>2001-09-24 14:06:06 +0000
commitd8fccf56918fd92ad1db542a832cf266d32451ce (patch)
treefba465ef5302dfdb8e0df43939c0a921405f0a6e /perl-install
parentce1806f3ddcfaf1f79a7377c3f23b3697e715e89 (diff)
downloaddrakx-d8fccf56918fd92ad1db542a832cf266d32451ce.tar
drakx-d8fccf56918fd92ad1db542a832cf266d32451ce.tar.gz
drakx-d8fccf56918fd92ad1db542a832cf266d32451ce.tar.bz2
drakx-d8fccf56918fd92ad1db542a832cf266d32451ce.tar.xz
drakx-d8fccf56918fd92ad1db542a832cf266d32451ce.zip
fix small error merging existing fstab
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/fs.pm6
1 files changed, 3 insertions, 3 deletions
diff --git a/perl-install/fs.pm b/perl-install/fs.pm
index 7e68dd80e..b64f06aed 100644
--- a/perl-install/fs.pm
+++ b/perl-install/fs.pm
@@ -27,7 +27,7 @@ sub read_fstab {
$type = fs2type($type);
if ($type eq 'supermount') {
# normalize this bloody supermount
- $options = join(",", grep {
+ $options = join(",", 'supermount', grep {
if (/fs=(.*)/) {
$type = $1;
0;
@@ -67,7 +67,7 @@ sub merge_fstabs {
my ($p2) = grep { fsedit::is_same_hd($_, $p) } @l or next;
@l = grep { !fsedit::is_same_hd($_, $p) } @l;
- $p2->{type} && $p->{type} ne $p2->{type} && type2fs($p) ne type2fs($p2) && $p->{type} ne 'auto' && $p2->{type} ne 'auto' and
+ $p->{type} && $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};
@@ -75,7 +75,7 @@ sub merge_fstabs {
$p->{type} ||= $p2->{type};
$p->{options} = $p2->{options} if $p->{type} eq 'defaults';
add2hash($p, $p2);
- $p->{device_alias} ||= $p2->{device_alias} || $p2->{device} if $p->{device} ne $p2->{device};
+ $p->{device_alias} ||= $p2->{device_alias} || $p2->{device} if $p->{device} ne $p2->{device} && $p2->{device} !~ m|/|;
}
@l;
}