From 67dcfd37f6ce000f1e78b5a2c120b2f3ff503241 Mon Sep 17 00:00:00 2001
From: damien <damien@mandriva.com>
Date: Mon, 24 Sep 2001 15:10:56 +0000
Subject: corrected type assignation

---
 perl-install/network/adsl.pm    | 4 ++--
 perl-install/network/isdn.pm    | 4 ++--
 perl-install/standalone/draknet | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/perl-install/network/adsl.pm b/perl-install/network/adsl.pm
index f8a236344..f26a45708 100644
--- a/perl-install/network/adsl.pm
+++ b/perl-install/network/adsl.pm
@@ -84,12 +84,12 @@ sub adsl_conf {
     adsl_ask_info ($adsl, $netc, $intf) or return;
   adsl_conf_step_2:
     $adsl_type eq 'speedtouch' or conf_network_card($netc, $intf, 'static' , '10.0.0.10' ) or goto adsl_conf_step_1;
-    adsl_conf_backend($adsl, $netc, $adsl_type);
+    adsl_conf_backend($adsl, $netc, $adsl_type, $netcnx);
     1;
 }
 
 sub adsl_conf_backend {
-    my ($adsl, $netc, $adsl_type) = @_;
+    my ($adsl, $netc, $adsl_type, $netcnx) = @_;
 
     mkdir_p("$prefix/etc/ppp");
     output("$prefix/etc/ppp/options",
diff --git a/perl-install/network/isdn.pm b/perl-install/network/isdn.pm
index dc2d11b50..c08f2dd5b 100644
--- a/perl-install/network/isdn.pm
+++ b/perl-install/network/isdn.pm
@@ -62,12 +62,12 @@ We recommand the light configuration.
     run_program::rooted($prefix, "rpm", "-e", "$rmpackage");
     $in->do_pkgs->install($instpackage, if_($isdn->{speed} =~ /128/, 'ibod'), 'isdn4k-utils');
     my $light = $e =~ /light/ ? 1 : 0;
-    isdn_write_config_backend($isdn, $light, $netc);
+    isdn_write_config_backend($isdn, $light, $netc, $netcnx);
     1;
 }
 
 sub isdn_write_config_backend {
-    my ($isdn, $light, $netc) = @_;
+    my ($isdn, $light, $netc, $netcnx) = @_;
     if ($light) {
 	modules::mergein_conf("$prefix/etc/modules.conf");
 	if ($isdn->{id}) {
diff --git a/perl-install/standalone/draknet b/perl-install/standalone/draknet
index c0e8358fd..c6cc5df0f 100755
--- a/perl-install/standalone/draknet
+++ b/perl-install/standalone/draknet
@@ -376,10 +376,10 @@ sub apply {
     network::netconnect::save_conf($netcnx, $netc, $intf);
 
     $netcnx->{type} eq 'modem' and any::pppConfig($in, $netcnx->{$netcnx->{type}}, '');
-    $netcnx->{type} eq 'isdn_internal' and network::isdn::isdn_write_config_backend($netcnx->{$netcnx->{type}}, 1, $netc); #$light
+    $netcnx->{type} eq 'isdn_internal' and network::isdn::isdn_write_config_backend($netcnx->{$netcnx->{type}}, 1, $netc, $netcnx); #$light
     $netcnx->{type} eq 'isdn_external' and any::pppConfig($in, $netcnx->{$netcnx->{type}}, '');
-    $netcnx->{type} eq 'adsl_ppoe' and network::adsl::adsl_conf_backend($netcnx->{$netcnx->{type}}, $netc, 'pppoe');
-    $netcnx->{type} eq 'adsl_pptp' and network::adsl::adsl_conf_backend($netcnx->{$netcnx->{type}}, $netc, 'pptp');
+    $netcnx->{type} eq 'adsl_ppoe' and network::adsl::adsl_conf_backend($netcnx->{$netcnx->{type}}, $netc, 'pppoe', $netcnx);
+    $netcnx->{type} eq 'adsl_pptp' and network::adsl::adsl_conf_backend($netcnx->{$netcnx->{type}}, $netc, 'pptp', $netcnx);
 
     $netcnx->{dhcp_client} and $netc->{dhcp_client} = $netcnx->{dhcp_client};
     network::configureNetwork2($in, $prefix, $netc, $intf);
-- 
cgit v1.2.1