no_comment

4 files changed, 20 insertions, 7 deletions

diff --git a/perl-install/ChangeLog b/perl-install/ChangeLog
index f95282ea0..cda64d606 100644
--- a/perl-install/ChangeLog
+++ b/perl-install/ChangeLog
@@ -1,5 +1,8 @@
 2000-10-02  François Pons  <fpons@mandrakesoft.com>
 
+	* diskdrake.pm (Resize): fix to make ext2resizing work a little
+	better	
+
 	* install_steps.pm: fixed installation of urpmi configuration.
 
 	* detect_devices.pm: updated comment about UltraDMA66/100
@@ -14,6 +17,9 @@
 
 2000-10-02  Pixel  <pixel@mandrakesoft.com>
 
+	* many files: remove many lnx4win special cases which are not
+	needed anymore        
+	
 	* any.pm (addUsers): grpuser output goes to Mr Dave
 
 	* bootloader.pm (install_lilo): change the default color of menu
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index f78961b30..533d9fd51 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -43,7 +43,7 @@ my (%installSteps, @orderedInstallSteps);
   selectMouse        => [ __("Configure mouse"), 1, 1, '', "selectInstallClass" ],
   selectKeyboard     => [ __("Choose your keyboard"), 1, 1, '', "selectInstallClass" ],
   miscellaneous      => [ __("Miscellaneous"), 1, 1, '$::beginner' ],
-  doPartitionDisks   => [ __("Setup filesystems"), 1, 0, '$o->{lnx4win}', "selectInstallClass" ],
+  doPartitionDisks   => [ __("Setup filesystems"), 1, 0, '', "selectInstallClass" ],
   formatPartitions   => [ __("Format partitions"), 1, -1, '', "doPartitionDisks" ],
   choosePackages     => [ __("Choose packages to install"), 1, -2, '$::beginner', "formatPartitions" ],
   installPackages    => [ __("Install system"), 1, -1, '', ["formatPartitions", "selectInstallClass"] ],
@@ -55,9 +55,9 @@ my (%installSteps, @orderedInstallSteps);
   setRootPassword    => [ __("Set root password"), 1, 1, '', "installPackages" ],
   addUser            => [ __("Add a user"), 1, 1, '', "installPackages" ],
 arch() !~ /alpha/ ? (
-  createBootdisk     => [ __("Create a bootdisk"), 1, 0, '$::o->{lnx4win} && !$::expert', "installPackages" ],
+  createBootdisk     => [ __("Create a bootdisk"), 1, 0, '', "installPackages" ],
 ) : (),
-  setupBootloader    => [ __("Install bootloader"), 1, 1, '$::o->{lnx4win} && !$::expert', "installPackages" ],
+  setupBootloader    => [ __("Install bootloader"), 1, 1, '', "installPackages" ],
   configureX         => [ __("Configure X"), 1, 1, '', ["formatPartitions", "setupBootloader"] ],
 arch() !~ /alpha/ ? (
   generateAutoInstFloppy => [ __("Auto install floppy"), 1, 1, '!$::expert || $o->{lnx4win}', "installPackages" ],
@@ -507,7 +507,7 @@ sub main {
 	    kickstart => sub { $::auto_install = $v },
 	    auto_install => sub { $::auto_install = $v },
 	    simple_themes => sub { $o->{simple_themes} = 1 },
-#-	    useless_thing_accepted => sub { $o->{useless_thing_accepted} = 1 },
+	    useless_thing_accepted => sub { $o->{useless_thing_accepted} = 1 },
 	    alawindows => sub { $o->{security} = 0; $o->{partitioning}{clearall} = 1; $o->{bootloader}{crushMbr} = 1 },
 	    fdisk => sub { $o->{partitioning}{fdisk} = 1 },
 	    g_auto_install => sub { $::testing = $::g_auto_install = 1; $o->{partitioning}{auto_allocate} = 1 },
diff --git a/perl-install/install_interactive.pm b/perl-install/install_interactive.pm
index c15f492cf..633e95b0c 100644
--- a/perl-install/install_interactive.pm
+++ b/perl-install/install_interactive.pm
@@ -188,7 +188,14 @@ sub partitionWizard {
     $o->set_help('doPartitionDisks');
 
     my %solutions = partitionWizardSolutions($o, $o->{hds}, $o->{fstab}, $o->{partitioning}{readonly});
-    %solutions = (loopback => $solutions{loopback}) if $o->{lnx4win} && $solutions{loopback};
+    if ($o->{lnx4win}) {
+	if ($solutions{loopback}) {
+	    %solutions = (loopback => $solutions{loopback});
+	} else {
+	    $o->ask_warn('', _("You don't have enough free space on your Windows partition")) if grep { isFat($_) } @{$o->{fstab}}
+	}
+    }
+
     delete $solutions{diskdrake} if $nodiskdrake;
 
     my @solutions = sort { $b->[0] <=> $a->[0] } values %solutions;
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 73fbedd2e..72e19259c 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -859,7 +859,7 @@ sub addUser {
 sub createBootdisk {
     my ($o, $first_time) = @_;
 
-    return if $first_time && $::beginner || $o->{lnx4win};
+    return if $first_time && $::beginner;
 
     if (arch() =~ /sparc/) {
 	#- as probing floppies is a bit more different on sparc, assume always /dev/fd0.
@@ -931,7 +931,7 @@ _("Error installing aboot,
 try to force installation even if that destroys the first partition?"));
 	};
     } else {
-	$o->{lnx4win} or any::setupBootloader($o, $o->{bootloader}, $o->{hds}, $o->{fstab}, $o->{security}, $o->{prefix}, $more) or return;
+	any::setupBootloader($o, $o->{bootloader}, $o->{hds}, $o->{fstab}, $o->{security}, $o->{prefix}, $more) or return;
 
 	eval { $o->SUPER::setupBootloader };
 	if ($@) {