summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2001-06-12 23:23:34 +0000
committerPascal Rigaux <pixel@mandriva.com>2001-06-12 23:23:34 +0000
commitaf925bb47f73e716618cc063c56b4cfc4b04e6b4 (patch)
tree7d80bfb3c8a9919b9c853390c0b745f8482b3b8e /perl-install
parentcc529231413f4ab54f20e60f7e1c08b42c250d46 (diff)
downloaddrakx-backup-do-not-use-af925bb47f73e716618cc063c56b4cfc4b04e6b4.tar
drakx-backup-do-not-use-af925bb47f73e716618cc063c56b4cfc4b04e6b4.tar.gz
drakx-backup-do-not-use-af925bb47f73e716618cc063c56b4cfc4b04e6b4.tar.bz2
drakx-backup-do-not-use-af925bb47f73e716618cc063c56b4cfc4b04e6b4.tar.xz
drakx-backup-do-not-use-af925bb47f73e716618cc063c56b4cfc4b04e6b4.zip
(load_thiskind): pass "options" to load
(get_that_type): special case for ISDN
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/modules.pm15
1 files changed, 12 insertions, 3 deletions
diff --git a/perl-install/modules.pm b/perl-install/modules.pm
index 19842bea2..6b8495da7 100644
--- a/perl-install/modules.pm
+++ b/perl-install/modules.pm
@@ -717,7 +717,7 @@ sub load_thiskind {
);
grep {
$f->($_->{description}, $_->{driver}) if $f;
- eval { load($_->{driver}, $type) };
+ eval { load($_->{driver}, $type, $_->{options}) };
$_->{error} = $@;
!($@ && $_->{try});
@@ -729,8 +729,17 @@ sub get_that_type {
my ($type) = @_;
grep {
- my $l = $drivers{$_->{driver}};
- ($_->{type} =~ /$type/ || $l && $l->{type} =~ /$type/) && detect_devices::check($_);
+ if ($type eq 'isdn') {
+ my $b = $_->{driver} =~ /ISDN:(.*),?(.*)/;
+ if ($b) {
+ $_->{driver} = $1;
+ $_->{options} = $2;
+ }
+ $b;
+ } else {
+ my $l = $drivers{$_->{driver}};
+ ($_->{type} =~ /$type/ || $l && $l->{type} =~ /$type/) && detect_devices::check($_);
+ }
} detect_devices::probeall('');
}