summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2000-12-09 18:55:01 +0000
committerPascal Rigaux <pixel@mandriva.com>2000-12-09 18:55:01 +0000
commit905062480d41547b7a47c347c397f36dbc00a93c (patch)
treeaf4b4df67441e720d23903e5505345c6ca2d1406
parentef7bbfb45b57dc42a24a81b7960be93eed6f7c72 (diff)
downloaddrakx-905062480d41547b7a47c347c397f36dbc00a93c.tar
drakx-905062480d41547b7a47c347c397f36dbc00a93c.tar.gz
drakx-905062480d41547b7a47c347c397f36dbc00a93c.tar.bz2
drakx-905062480d41547b7a47c347c397f36dbc00a93c.tar.xz
drakx-905062480d41547b7a47c347c397f36dbc00a93c.zip
(formatMountPartitions): the format partition dialog created at first use,
so that it doesn't appear if no partitions are formatted.
-rw-r--r--perl-install/install_steps_interactive.pm5
1 files changed, 3 insertions, 2 deletions
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index a2faedac9..ea6d9826b 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -196,7 +196,7 @@ sub selectInstallClass {
_("Expert") => "expert",
),
);
- %s = @c = (_("Expert") => "expert") if $::expert && !$clicked;
+ %c = @c = (_("Expert") => "expert") if $::expert && !$clicked;
$o->set_help('selectInstallClassCorpo') if $::corporate;
@@ -395,9 +395,10 @@ sub choosePartitionsToFormat($$) {
sub formatMountPartitions {
my ($o, $fstab) = @_;
- my $w = $o->wait_message('', _("Formatting partitions"));
+ my $w;
fs::formatMount_all($o->{raid}, $o->{fstab}, $o->{prefix}, sub {
my ($part) = @_;
+ $w ||= $o->wait_message('', _("Formatting partitions"));
$w->set(isLoopback($part) ?
_("Creating and formatting file %s", loopback::file($part)) :
_("Formatting partition %s", $part->{device}));