From 15859d28d570cebe504dac6052ed6d28c6482344 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Wed, 19 Apr 2000 20:56:19 +0000
Subject: no_comment

---
 perl-install/install2.pm      | 3 ++-
 perl-install/install_any.pm   | 2 +-
 perl-install/install_steps.pm | 4 ++--
 perl-install/modules.pm       | 7 +++++++
 perl-install/pkgs.pm          | 1 +
 5 files changed, 13 insertions(+), 4 deletions(-)

(limited to 'perl-install')

diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index 40ee09a5d..8073a340a 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -329,10 +329,11 @@ sub formatPartitions {
 
     my $d = "/initrd/loopfs/lnx4win";
     if (-d $d) {
+#-	install_any::useMedium(0);
 	install_any::getAndSaveFile("lnx4win/$_", "$d/$_") foreach qw(loadlin.exe linux.pif lnx4win.exe lnx4win.ico);
     }
 
-    chdir "$o->{prefix}";
+#-    chdir "$o->{prefix}"; was for core dumps
 
     #-noatime option for ext2 fs on laptops (do not wake up the hd)
     #-	 Do  not  update  inode  access times on this
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index 64101102b..824465c9e 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -48,7 +48,7 @@ sub useMedium($) {
     #- does nothing if the function has already been called.
     $_[0] and $::o->{method} eq 'cdrom' and setup_postinstall_rpms($::o->{prefix}, $::o->{packages});
 
-    $asked_medium eq $_[0] or log::l("selecting new medium \"$_[0]\"");
+    $asked_medium eq $_[0] or log::l("selecting new medium '$_[0]'");
     $asked_medium = $_[0];
 }
 sub changeMedium($$) {
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index 3d24cf629..dddc0e1bd 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -231,8 +231,8 @@ sub choosePackages {
     pkgs::unselectAllPackages($packages);
     pkgs::selectPackage($o->{packages}, pkgs::packageByName($o->{packages}, $_) || next) foreach @{$o->{default_packages}};
 
-    add2hash_($o, { compssListLevel => $::expert ? 90 : 80 });
-    pkgs::setSelectedFromCompssList($o->{compssListLevels}, $packages, $o->{compssListLevel}, $available, $o->{installClass});
+    add2hash_($o, { compssListLevel => $::expert ? 90 : 80 }) unless $::auto_install;
+    pkgs::setSelectedFromCompssList($o->{compssListLevels}, $packages, $o->{compssListLevel}, $available, $o->{installClass}) if exists $o->{compssListLevel};
     $available;
 }
 
diff --git a/perl-install/modules.pm b/perl-install/modules.pm
index e8d4563b0..3abbf53d5 100644
--- a/perl-install/modules.pm
+++ b/perl-install/modules.pm
@@ -528,6 +528,13 @@ sub load_thiskind($;&$) {
 	&$f($text, $mod) if $f;
 	load($mod, $type);
     }
+
+    if ($type eq 'scsi') {
+	foreach ("imm", "ppa") {
+	    eval { load($_, $type); push @devs, "imm" };
+	    last if !$@;
+	}
+    }
     @devs, map { [ $_, $_ ] } @{$loaded{$type} || []};
 }
 
diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm
index 16ce2fe27..021bc9c6b 100644
--- a/perl-install/pkgs.pm
+++ b/perl-install/pkgs.pm
@@ -576,6 +576,7 @@ sub readCompssUsers {
 #- }
 
 sub setSelectedFromCompssList {
+    log::l("setSelectedFromCompssList");
     my ($compssListLevels, $packages, $min_level, $max_size, $install_class) = @_;
     my $ind = $compssListLevels->{$install_class}; defined $ind or log::l("unknown install class $install_class in compssList"), return;
     my $nb = selectedSize($packages);
-- 
cgit v1.2.1