diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2000-01-24 13:53:54 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2000-01-24 13:53:54 +0000 |
| commit | 7fa1fd93ecd790ae288102dcb4ec4cf3ca3bc760 (patch) | |
| tree | fd53b39c8586419f7f2b128c73167ec94a644495 /perl-install/install_steps_gtk.pm | |
| parent | a5bc70922e46a978bde60d3d51454ca03b1f7325 (diff) | |
| download | drakx-7fa1fd93ecd790ae288102dcb4ec4cf3ca3bc760.tar drakx-7fa1fd93ecd790ae288102dcb4ec4cf3ca3bc760.tar.gz drakx-7fa1fd93ecd790ae288102dcb4ec4cf3ca3bc760.tar.bz2 drakx-7fa1fd93ecd790ae288102dcb4ec4cf3ca3bc760.tar.xz drakx-7fa1fd93ecd790ae288102dcb4ec4cf3ca3bc760.zip | |
no_comment
Diffstat (limited to 'perl-install/install_steps_gtk.pm')
| -rw-r--r-- | perl-install/install_steps_gtk.pm | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/perl-install/install_steps_gtk.pm b/perl-install/install_steps_gtk.pm index 4ad02d116..86101f814 100644 --- a/perl-install/install_steps_gtk.pm +++ b/perl-install/install_steps_gtk.pm @@ -257,7 +257,7 @@ sub selectLanguage { sub doPartitionDisks($$) { my ($o, $hds, $raid) = @_; - if (!$::isStandalone && fsedit::is_one_big_fat($hds)) { + if ($::beginner && fsedit::is_one_big_fat($hds)) { #- wizard my $min_linux = 600 << 11; my $max_linux = 1500 << 11; @@ -266,6 +266,7 @@ sub doPartitionDisks($$) { my ($part) = fsedit::get_fstab(@{$o->{hds}}); my $w = $o->wait_message(_("Resizing"), _("Computing fat filesystem bounds")); my $resize_fat = eval { resize_fat::main->new($part->{device}, devices::make($part->{device})) }; + $@ and goto diskdrake; my $min_win = $resize_fat->min_size; if (!$@ && $part->{size} > $min_linux + $min_freewin + $min_win && $o->ask_okcancel('', _("WARNING! @@ -299,6 +300,7 @@ When sure, press Ok."))) { } } + diskdrake: while (1) { diskdrake::main($hds, $raid, interactive_gtk->new, $o->{partitions}); if (!grep { isSwap($_) } fsedit::get_fstab(@{$o->{hds}})) { |