From 62d97a61f7ac3d2889cc925bbf2fed71c440bf49 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Thu, 28 Sep 2000 17:52:25 +0000
Subject: no_comment

---
 perl-install/install_interactive.pm       | 7 ++++---
 perl-install/install_steps.pm             | 7 -------
 perl-install/install_steps_interactive.pm | 4 ++--
 perl-install/pkgs.pm                      | 7 +++++--
 4 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/perl-install/install_interactive.pm b/perl-install/install_interactive.pm
index b59e50ebd..c15f492cf 100644
--- a/perl-install/install_interactive.pm
+++ b/perl-install/install_interactive.pm
@@ -55,8 +55,8 @@ sub partitionWizardSolutions {
     my @wizlog;
     my (@solutions, %solutions);
 
-    my $min_linux = 500 << 11;
-    my $max_linux = 2500 << 11;
+    my $min_linux = 400 << 11;
+    my $max_linux = 3000 << 11;
     my $min_swap = 50 << 11;
     my $max_swap = 300 << 11;
     my $min_freewin = 100 << 11;
@@ -188,7 +188,7 @@ 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 => $solutions{loopback}) if $o->{lnx4win} && $solutions{loopback};
     delete $solutions{diskdrake} if $nodiskdrake;
 
     my @solutions = sort { $b->[0] <=> $a->[0] } values %solutions;
@@ -199,6 +199,7 @@ sub partitionWizard {
     log::l("solutions found: " . join('', map {$_->[1]} @sol) . " (all solutions found: " . join('', map {$_->[1]} @solutions) . ")");
 
     @solutions = @sol if @sol > 1;
+    log::l("solutions: ", int @solutions);
     @solutions or $o->ask_warn('', _("I can't find any room for installing")), die 'already displayed';
 
     my $ok; while (!$ok) {
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index 743eaa151..9e6511f43 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -286,9 +286,6 @@ sub beforeInstallPackages {
 	}
     }
 
-    #- copy RPM-GPG *before* installing packages (otherwise may be the CD2)
-    install_any::getAndSaveFile('RPM-GPG-KEYS', "$o->{prefix}/root/tmp/RPM-GPG-KEYS");
-
     log::l("before install packages, after copy");
     #- some packages need such files for proper installation.
     any::writeandclean_ldsoconf($o->{prefix});
@@ -440,10 +437,6 @@ Consoles 1,3,4,7 may also contain interesting information";
 	substInFile { s/^urpmi\n//; $_ .= "urpmi\n" if eof } "$msec/group.conf" if -d $msec;
     }
 
-    #- RPM-GPG-KEYS is copied earlier to ensure we have it
-    run_program::rooted($o->{prefix}, qw(gpg --import --homedir /etc/rpm /root/tmp/RPM-GPG-KEYS));
-    unlink "$o->{prefix}/root/tmp/RPM-GPG-KEYS";
-
 #    #- update language and icons for KDE.
 #    update_userkderc($o->{prefix}, 'Locale', Language => "");
 #    log::l("updating kde icons according to available devices");
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 16e5be535..9760ab7ee 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -67,7 +67,7 @@ translated etc. that varies from language to language).") if $o->{lang} !~ /^en/
     
     unless ($o->{useless_thing_accepted}) {
 	$o->set_help('license');
-	$o->{useless_thing_accepted} = $o->ask_from_list_('', formatAlaTeX(
+	$o->{useless_thing_accepted} = $o->ask_from_list_(_("License agreement"), formatAlaTeX(
 _(" Introduction
 
 The operating system and the different components available in the Linux-Mandrake distribution 
@@ -462,7 +462,7 @@ sub choosePackages {
 
     #- avoid reselection of package if individual selection is requested and this is not the first time.
     if (1 || $first_time || !$individual) {
-	my $min_mark = $::beginner ? 10 : $::expert ? 0 : 1;
+	my $min_mark = $::beginner ? 25 : $::expert ? 0 : 1;
 
 	my $b = pkgs::saveSelected($packages);
 	my (undef, $level) = pkgs::setSelectedFromCompssList($o->{compssListLevels}, $packages, $min_mark, 0, $o->{installClass});
diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm
index 846f4330e..59de3f42f 100644
--- a/perl-install/pkgs.pm
+++ b/perl-install/pkgs.pm
@@ -683,8 +683,11 @@ sub readCompssUsers {
 
 	if (/^(\S.*)/) {
 	    &$map;
-	    /^(.*?)\s*\[icon=(.*?)\]/  and $_ = $1, $compssUsersIcons{$_} = $2;
-	    /^(.*?)\s*\[descr=(.*?)\]/ and $_ = $1, $compssUsersDescr{$_} = $2;
+	    my ($icon, $descr);
+	    /^(.*?)\s*\[icon=(.*?)\](.*)/  and $_ = "$1$3", $icon  = $2;
+	    /^(.*?)\s*\[descr=(.*?)\](.*)/ and $_ = "$1$3", $descr = $2;
+	    $compssUsersIcons{$_} = $icon; 
+	    $compssUsersDescr{$_} = $descr; 
 	    push @sorted, $_;
 	    $compssUsers{$_} = $l = [];
 	} elsif (/\s+\+(\S+)/) {
-- 
cgit v1.2.1