From 7fa1fd93ecd790ae288102dcb4ec4cf3ca3bc760 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Mon, 24 Jan 2000 13:53:54 +0000
Subject: no_comment

---
 perl-install/install_steps_gtk.pm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'perl-install/install_steps_gtk.pm')

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}})) {
-- 
cgit v1.2.1