summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2004-06-02 17:01:52 +0000
committerPascal Rigaux <pixel@mandriva.com>2004-06-02 17:01:52 +0000
commitf68005c61a76bb9bd62865e5d7aa0a3e4264d434 (patch)
tree68d9907004ed7f16435df6954933a3a61cdc7aa1
parent20f42f88dfe3fd937f97487a541ebf4ab3a9d1ff (diff)
downloaddrakx-f68005c61a76bb9bd62865e5d7aa0a3e4264d434.tar
drakx-f68005c61a76bb9bd62865e5d7aa0a3e4264d434.tar.gz
drakx-f68005c61a76bb9bd62865e5d7aa0a3e4264d434.tar.bz2
drakx-f68005c61a76bb9bd62865e5d7aa0a3e4264d434.tar.xz
drakx-f68005c61a76bb9bd62865e5d7aa0a3e4264d434.zip
- stop mounting ext3 partitions using type ext2 during install
- stop fsck'ing ext3 partitions (it was only done during install, not upgrade)
-rw-r--r--perl-install/fs.pm6
1 files changed, 1 insertions, 5 deletions
diff --git a/perl-install/fs.pm b/perl-install/fs.pm
index e3cc830f0..b389d2984 100644
--- a/perl-install/fs.pm
+++ b/perl-install/fs.pm
@@ -750,8 +750,7 @@ sub mount {
my $err = $?;
die "fsck.jfs failed" if $err & 0xfc00;
};
- } elsif ($fs eq 'ext2' || $fs eq 'ext3' && $::isInstall && !$::o->{isUpgrade}) {
- if (!$b_rdonly) {
+ } elsif ($fs eq 'ext2' && !$b_rdonly) {
$o_wait_message->(N("Checking %s", $dev)) if $o_wait_message;
foreach ('-a', '-y') {
run_program::raw({ timeout => 60 * 60 }, "fsck.ext2", $_, $dev);
@@ -766,9 +765,6 @@ sub mount {
last;
}
}
- }
- # really mount as ext2 during install for speed up
- $fs = 'ext2';
}
if (member($fs, @fs_modules)) {
eval { modules::load($fs) };