From e1db87b9b9e4a582e106fb9f24e6be21c8fa0917 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Tue, 21 Dec 1999 18:42:28 +0000
Subject: no_comment

---
 perl-install/install_steps_interactive.pm | 4 ++--
 perl-install/modules.pm                   | 4 ++--
 perl-install/share/compssList             | 2 +-
 perl-install/share/list                   | 1 -
 perl-install/standalone/draksec           | 4 +++-
 5 files changed, 8 insertions(+), 7 deletions(-)

(limited to 'perl-install')

diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 1a7dc1a48..1d6bf4c0c 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -935,9 +935,9 @@ sub setup_thiskind {
 	    my @r = $o->load_module($type) or return;
 	    push @l, \@r;
 	} else {
-	    eval { commands::modprobe("isapnp") };
+	    #-eval { commands::modprobe("isapnp") };
 	    require pci_probing::main;
-	    $o->ask_warn('', [ pci_probing::main::list(), scalar cat_("/proc/isapnp") ]);
+	    $o->ask_warn('', [ pci_probing::main::list() ]); #-, scalar cat_("/proc/isapnp") ]);
 	}
     }
 }
diff --git a/perl-install/modules.pm b/perl-install/modules.pm
index 1c788e505..645825a0a 100644
--- a/perl-install/modules.pm
+++ b/perl-install/modules.pm
@@ -115,7 +115,6 @@ my @drivers_by_category = (
   "a100u2w" => "a100u2w",
   "atp870u" => "atp870u (Acard/Artop)",
   "dc395x_trm" => "dc395x_trm",
-  "ide-scsi" => "ide-scsi",
   "psi240i" => "psi240i",
   "qlogicfc" => "qlogicfc",
   "sim710" => "sim710",
@@ -132,7 +131,6 @@ my @drivers_by_category = (
   "eata" => "EATA SCSI PM2x24/PM3224",
   "eata_pio" => "EATA PIO Adapters",
   "eata_dma" => "EATA DMA Adapters",
-  "st" => "st",
   "ppa" => "Iomega PPA3 (parallel port Zip)",
   "imm" => "Iomega Zip (new driver)",
 }],
@@ -248,7 +246,9 @@ my @drivers_by_category = (
   "vfat" => "vfat",
 }],
 [ 'other', {
+  "st" => "st",
   "sg" => "sg",
+  "ide-scsi" => "ide-scsi",
   "loop" => "Loopback device",
   "lp" => "Parallel Printer",
   "ide-floppy" => "ide-floppy",
diff --git a/perl-install/share/compssList b/perl-install/share/compssList
index 161bef2c0..b26ce6a71 100644
--- a/perl-install/share/compssList
+++ b/perl-install/share/compssList
@@ -346,7 +346,7 @@ kweather                                      72     0    59
 kwvdial                                       73     0    56
 ltrace                                        10     0     0
 ld.so                                          0     0    94
-lftp                                          80    35    58
+lftp                                          78    78    83
 lha                                           40     0    72
 libc                                          10    15    75
 libelf                                        10    15    80
diff --git a/perl-install/share/list b/perl-install/share/list
index 66887047d..d9329a80d 100644
--- a/perl-install/share/list
+++ b/perl-install/share/list
@@ -54,7 +54,6 @@
 /usr/lib/perl5/5.00503/vars.pm
 /usr/lib/perl5/site_perl/5.005/i386-linux/Gtk.pm
 /usr/lib/perl5/site_perl/5.005/i386-linux/Gtk/Types.pm
-/usr/lib/perl5/site_perl/5.005/i386-linux/Gtk/XmHTML.pm
 /usr/lib/perl5/site_perl/5.005/i386-linux/Net/Cmd.pm
 /usr/lib/perl5/site_perl/5.005/i386-linux/Net/Config.pm
 /usr/lib/perl5/site_perl/5.005/i386-linux/Net/FTP.pm
diff --git a/perl-install/standalone/draksec b/perl-install/standalone/draksec
index 2eb11319c..8e17f8c54 100755
--- a/perl-install/standalone/draksec
+++ b/perl-install/standalone/draksec
@@ -26,7 +26,9 @@ my %m = reverse (my %l = (
 ));
 delete @l{0,1,5} unless $::expert;
 
-if (my $level = $in->ask_from_list('', _("Choose security level"), [ values %l ], $l{$ENV{SECURE_LEVEL}})) {
+if (my $level = $in->ask_from_list('', 
+_("Choose security level"), 
+				   [ values %l ], $l{$ENV{SECURE_LEVEL}})) {
     my $w = $in->wait_message('', _("Setting security level"));
     $in->suspend;
 
-- 
cgit v1.2.1