summaryrefslogtreecommitdiffstats
path: root/perl-install/network/isdn.pm
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.org>2005-07-21 09:35:44 +0000
committerOlivier Blin <oblin@mandriva.org>2005-07-21 09:35:44 +0000
commit3507800100da6fde08167f34d6e685fbe36e2948 (patch)
treeb9893f4be82dfa52db8f6e079745dee84a48064d /perl-install/network/isdn.pm
parenta2fc2a36a5261bca7eacfeb8e5deba4905e98f06 (diff)
downloaddrakx-3507800100da6fde08167f34d6e685fbe36e2948.tar
drakx-3507800100da6fde08167f34d6e685fbe36e2948.tar.gz
drakx-3507800100da6fde08167f34d6e685fbe36e2948.tar.bz2
drakx-3507800100da6fde08167f34d6e685fbe36e2948.tar.xz
drakx-3507800100da6fde08167f34d6e685fbe36e2948.zip
don't use global $in (fix ISDN configuration)
Diffstat (limited to 'perl-install/network/isdn.pm')
-rw-r--r--perl-install/network/isdn.pm9
1 files changed, 4 insertions, 5 deletions
diff --git a/perl-install/network/isdn.pm b/perl-install/network/isdn.pm
index 766769504..740741b16 100644
--- a/perl-install/network/isdn.pm
+++ b/perl-install/network/isdn.pm
@@ -7,12 +7,11 @@ use modules;
use run_program;
use log;
use network::tools;
-use MDK::Common::Globals "network", qw($in);
use services;
sub write_config {
- my ($isdn) = @_;
+ my ($in, $isdn) = @_;
$in->do_pkgs->install('isdn4net', if_($isdn->{speed} =~ /128/, 'ibod'), 'isdn4k-utils');
output_with_perm("$::prefix/etc/isdn/profile/link/myisp", 0600,
@@ -47,7 +46,7 @@ defaultroute
services::stop("isdn4linux"); #- to be stopped before capi is loaded
if ($isdn->{driver} eq "capidrv") {
- setup_capi_conf(get_capi_card($isdn));
+ setup_capi_conf($in, get_capi_card($in, $isdn));
services::enable('capi4linux');
} else {
services::disable('capi4linux');
@@ -61,7 +60,7 @@ defaultroute
sub setup_capi_conf {
- my ($capi_card) = @_;
+ my ($in, $capi_card) = @_;
$in->do_pkgs->ensure_is_installed('isdn4k-utils', "/etc/rc.d/init.d/capi4linux"); #- capi4linux service
is_module_installed($capi_card->{driver}) or $in->do_pkgs->install(@{$capi_card->{packages}});
@@ -176,7 +175,7 @@ sub is_module_installed {
sub get_capi_card {
- my ($isdn) = @_;
+ my ($in, $isdn) = @_;
my $capi_card = find {
hex($isdn->{vendor}) == $_->{vendor} && hex($isdn->{id}) == $_->{id};