summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--perl-install/ChangeLog6
-rw-r--r--perl-install/install_steps_interactive.pm2
-rw-r--r--perl-install/modules.pm5
3 files changed, 11 insertions, 2 deletions
diff --git a/perl-install/ChangeLog b/perl-install/ChangeLog
index 68517d30a..03a79a4dc 100644
--- a/perl-install/ChangeLog
+++ b/perl-install/ChangeLog
@@ -1,3 +1,9 @@
+2000-08-18 dam's <damien@mandrakesoft.com>
+
+ * modules.pm: added isdn type in @drivers_by_category. corrected
+ load_thiskind (thx pixel) : it's not unsafe anymore
+ * Netconnect.pm: just display PCI isdn card recognized.
+
2000-08-17 Pixel <pixel@mandrakesoft.com>
* install_any.pm: many cleanup. moved some functions to common,
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 5664b4d0c..988945cd5 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -501,7 +501,7 @@ such as ``mybox.mylab.myco.com''."),
#- (dam's)
if (!$::beginner && $o->ask_yesorno([ _("Modem Configuration") ],
_("Do you want to configure a ISDN connection for your system?"), 0)) {
- Netconnect::isdn($o->{prefix}, $o->{netc}, $o, bool($o->{pcmcia}));
+ Netconnect::isdn($o->{prefix}, $o->{isdn}, $o, bool($o->{pcmcia}));
}
}
diff --git a/perl-install/modules.pm b/perl-install/modules.pm
index 9fc52570e..56b04629a 100644
--- a/perl-install/modules.pm
+++ b/perl-install/modules.pm
@@ -96,6 +96,9 @@ arch() =~ /^sparc/ ? (
"parport_pc" => "parport_pc",
"sunrpc" => "sunrpc",
}],
+[ 'isdn', {
+ "hisax" => "hisax",
+}],
[ 'scsi', {
arch() =~ /^sparc/ ? (
"qlogicpti" => "Performance Technologies ISP",
@@ -524,7 +527,7 @@ sub load_thiskind($;&$) {
my ($type, $f, $pcic) = @_;
my %loaded_text;
- my @devs = detect_devices::matching_type($type, $pcic);
+ my @devs = grep { my $l = $drivers{$_->{driver}}; $l && $l->{type} eq $type } detect_devices::probeall('', $pcip);
log::l("probe found " . scalar @devs . " $type devices");
my %devs; foreach (@devs) {