From fe9d92c84e2888c470a72d903b78f74288c84a9b Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Sun, 7 Nov 1999 13:51:08 +0000
Subject: no_comment

---
 perl-install/devices.pm                   | 11 +++++------
 perl-install/install_steps_interactive.pm |  3 ++-
 perl-install/pkgs.pm                      |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'perl-install')

diff --git a/perl-install/devices.pm b/perl-install/devices.pm
index 6e1b7ccf4..ffc1aeaef 100644
--- a/perl-install/devices.pm
+++ b/perl-install/devices.pm
@@ -77,12 +77,12 @@ sub make($) {
     } elsif (/(.*)(\d+)$/) {
 	    ($type, $major, $minor) =
 	     @{ ${{"fd"     => [ c::S_IFBLK(), 2,  0 ],
-		   "md"     => [ c::S_IFBLK(), 9,  0 ],
+		   "hidbp-mse-" => [ c::S_IFCHR(), 10, 32 ],
 		   "lp"     => [ c::S_IFCHR(), 6,  0 ],
-		   "scd"    => [ c::S_IFBLK(), 11, 0 ],
+		   "md"     => [ c::S_IFBLK(), 9,  0 ],
 		   "nst"    => [ c::S_IFCHR(), 9, 128],
+		   "scd"    => [ c::S_IFBLK(), 11, 0 ],
 		   "ttyS"   => [ c::S_IFCHR(), 4, 64 ],
-		   "hidbp-mse-" => [ c::S_IFCHR(), 10, 32 ],
 	       }}{$1}};
 	    $minor += $2;
     }
@@ -93,17 +93,16 @@ sub make($) {
 		   "cdu31a"  => [ c::S_IFBLK(), 15, 0 ],
 		   "cdu535"  => [ c::S_IFBLK(), 24, 0 ],
 		   "cm206cd" => [ c::S_IFBLK(), 32, 0 ],
-		   "tty"     => [ c::S_IFCHR(),  5, 0 ],
 		   "gscd"    => [ c::S_IFBLK(), 16, 0 ],
 		   "mcd"     => [ c::S_IFBLK(), 23, 0 ],
 		   "mcdx"    => [ c::S_IFBLK(), 20, 0 ],
 		   "mem"     => [ c::S_IFCHR(), 1,  1 ],
+		   "optcd"   => [ c::S_IFBLK(), 17, 0 ],
 		   "psaux"   => [ c::S_IFCHR(), 10, 1 ],
 		   "random"  => [ c::S_IFCHR(), 1,  8 ],
-		   "optcd"   => [ c::S_IFBLK(), 17, 0 ],
 		   "sbpcd"   => [ c::S_IFBLK(), 25, 0 ],
 		   "sjcd"    => [ c::S_IFBLK(), 18, 0 ],
-		   "psaux"   => [ c::S_IFCHR(), 10, 1 ],
+		   "tty"     => [ c::S_IFCHR(),  5, 0 ],
 		   "usbmouse"=> [ c::S_IFCHR(), 10, 32], #- aka hidbp-mse-0
 		   "zero"    => [ c::S_IFCHR(), 1,  5 ],		     
 	       }}{$_} or die "unknown device $_" };
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 533926784..782a8f3cc 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -969,7 +969,8 @@ sub setup_thiskind {
 	    my @r = $o->load_module($type) or return;
 	    push @l, \@r;
 	} else {
-	    $o->ask_warn('', [ pci_probing::main::list() ]);
+	    eval { commands::modprobe("isapnp") };
+	    $o->ask_warn('', [ pci_probing::main::list(), cat_("/proc/isapnp") ]);
 	}
     }
 }
diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm
index 53fca5a99..bb83ab3ca 100644
--- a/perl-install/pkgs.pm
+++ b/perl-install/pkgs.pm
@@ -270,7 +270,7 @@ sub setSelectedFromCompssList($$$$$$) {
     my ($compssListLevels, $packages, $size, $install_class, $lang, $isUpgrade) = @_;
     my ($level, $ind) = 100;
 
-    my @packages = values %$packages;
+    my @packages = allpackages($packages);
     my @places = do {
 	map_index { $ind = $::i if $_ eq $install_class } @{$compssListLevels};
 	defined $ind or log::l("unknown install class $install_class in compssList"), return;
-- 
cgit v1.2.1