summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2005-01-06 10:10:12 +0000
committerPascal Rigaux <pixel@mandriva.com>2005-01-06 10:10:12 +0000
commit0d5a1b01a3a92b910347fbbba77ef0b1e18ac3c5 (patch)
treedaacd4c6f90be73f4d195185f6d5fbf8cc18c1df
parent3fadcba17f5e950e483c301490c174737f1fe852 (diff)
downloaddrakx-0d5a1b01a3a92b910347fbbba77ef0b1e18ac3c5.tar
drakx-0d5a1b01a3a92b910347fbbba77ef0b1e18ac3c5.tar.gz
drakx-0d5a1b01a3a92b910347fbbba77ef0b1e18ac3c5.tar.bz2
drakx-0d5a1b01a3a92b910347fbbba77ef0b1e18ac3c5.tar.xz
drakx-0d5a1b01a3a92b910347fbbba77ef0b1e18ac3c5.zip
fs::formatMount_all() parameter wait_message is no more optional (though you can give undef)
-rw-r--r--perl-install/fs.pm4
-rw-r--r--perl-install/install_steps.pm2
2 files changed, 3 insertions, 3 deletions
diff --git a/perl-install/fs.pm b/perl-install/fs.pm
index e7a5322f0..38d55ac89 100644
--- a/perl-install/fs.pm
+++ b/perl-install/fs.pm
@@ -458,8 +458,8 @@ sub formatMount_part {
}
sub formatMount_all {
- my ($raids, $fstab, $prefix, $o_wait_message) = @_;
- formatMount_part($_, $raids, $fstab, $prefix, $o_wait_message)
+ my ($raids, $fstab, $prefix, $wait_message) = @_;
+ formatMount_part($_, $raids, $fstab, $prefix, $wait_message)
foreach sort { isLoopback($a) ? 1 : isSwap($a) ? -1 : 0 } grep { $_->{mntpoint} } @$fstab;
#- ensure the link is there
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index e7b34c637..528bb8334 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -281,7 +281,7 @@ sub choosePartitionsToFormat($$) {
sub formatMountPartitions {
my ($o) = @_;
- fs::formatMount_all($o->{all_hds}{raids}, $o->{fstab}, $o->{prefix});
+ fs::formatMount_all($o->{all_hds}{raids}, $o->{fstab}, $o->{prefix}, undef);
}
#------------------------------------------------------------------------------