summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2001-09-04 17:00:37 +0000
committerPascal Rigaux <pixel@mandriva.com>2001-09-04 17:00:37 +0000
commitdd25ae5c336f802860a25bfdbfc07b0c4e72d9ae (patch)
tree2df4c727a56fb7b3a17eb3b70562e208f0e6de8a
parenta0af06516522c49497543443273552c00d08262a (diff)
downloaddrakx-dd25ae5c336f802860a25bfdbfc07b0c4e72d9ae.tar
drakx-dd25ae5c336f802860a25bfdbfc07b0c4e72d9ae.tar.gz
drakx-dd25ae5c336f802860a25bfdbfc07b0c4e72d9ae.tar.bz2
drakx-dd25ae5c336f802860a25bfdbfc07b0c4e72d9ae.tar.xz
drakx-dd25ae5c336f802860a25bfdbfc07b0c4e72d9ae.zip
mount ext3 as ext2 during install for speed up
-rw-r--r--perl-install/fs.pm10
1 files changed, 8 insertions, 2 deletions
diff --git a/perl-install/fs.pm b/perl-install/fs.pm
index 7c026d26f..c919c574c 100644
--- a/perl-install/fs.pm
+++ b/perl-install/fs.pm
@@ -557,6 +557,7 @@ sub mount {
system('mount', $dev, $where) == 0 or die _("mount failed");
} elsif (member($fs, 'ext2', 'proc', 'usbdevfs', 'iso9660', @fs_modules)) {
$dev = devices::make($dev) if $fs ne 'proc' && $fs ne 'usbdevfs';
+ $where =~ s|/$||;
my $flag = c::MS_MGC_VAL();
$flag |= c::MS_RDONLY() if $rdonly;
@@ -579,8 +580,13 @@ sub mount {
} elsif ($fs eq 'iso9660') {
eval { modules::load('isofs') };
}
-
- $where =~ s|/$||;
+ if ($fs eq 'ext3' && $::isInstall) {
+ # ext3 mount to use the journal
+ syscall_('mount', $dev, $where, $fs, $flag, $mount_opt) or die _("mount failed: ") . "$!";
+ syscall_('umount', $where);
+ # really mount as ext2 during install for speed up
+ $type = 'ext2';
+ }
log::l("calling mount($dev, $where, $fs, $flag, $mount_opt)");
syscall_('mount', $dev, $where, $fs, $flag, $mount_opt) or die _("mount failed: ") . "$!";
} else {