summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authordamien <damien@mandriva.com>2001-07-03 15:53:22 +0000
committerdamien <damien@mandriva.com>2001-07-03 15:53:22 +0000
commit357a954b184c558ec7d6805b4acf59c837b43de3 (patch)
treed967231b7fe8f2c86dc72eaa190decfd9bf85772 /perl-install
parent7c9805a5ab7c9b7fb99d4f5deab313c33451ac67 (diff)
downloaddrakx-357a954b184c558ec7d6805b4acf59c837b43de3.tar
drakx-357a954b184c558ec7d6805b4acf59c837b43de3.tar.gz
drakx-357a954b184c558ec7d6805b4acf59c837b43de3.tar.bz2
drakx-357a954b184c558ec7d6805b4acf59c837b43de3.tar.xz
drakx-357a954b184c558ec7d6805b4acf59c837b43de3.zip
network subsystem now compiles. Enjoy
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/network/adsl.pm5
-rw-r--r--perl-install/network/isdn.pm22
-rw-r--r--perl-install/network/modem.pm5
-rw-r--r--perl-install/network/netconnect.pm1
-rw-r--r--perl-install/network/tools.pm2
5 files changed, 19 insertions, 16 deletions
diff --git a/perl-install/network/adsl.pm b/perl-install/network/adsl.pm
index a09f58823..53b4a440c 100644
--- a/perl-install/network/adsl.pm
+++ b/perl-install/network/adsl.pm
@@ -1,6 +1,9 @@
package network::adsl;
-#use network::tools;
+use common qw(:common :file);
+use run_program;
+use network::tools;
+use network::ethernet;
use vars qw(@ISA @EXPORT);
diff --git a/perl-install/network/isdn.pm b/perl-install/network/isdn.pm
index 25c18cebf..718aa11fe 100644
--- a/perl-install/network/isdn.pm
+++ b/perl-install/network/isdn.pm
@@ -1,8 +1,10 @@
package network::isdn;
-#use network::tools;
+use common qw(:common :file);
+use any;
use modules;
-use common qw(:file);
+use log;
+use network::tools;
use vars qw(@ISA @EXPORT);
@ISA = qw(Exporter);
@@ -27,7 +29,8 @@ sub configure {
$netcnx->{isdn_external}={};
$netcnx->{isdn_external}{device}=$netc->{autodetect}{modem};
$netcnx->{isdn_external}{special_command}='AT&F&O2B40';
- pppConfig($netcnx->{isdn_external}, $mouse, $netc) or goto isdn_step_1;
+ require network::modem;
+ network::modem::pppConfig($netcnx->{isdn_external}, $mouse, $netc) or goto isdn_step_1;
}
1;
}
@@ -123,17 +126,6 @@ defaultroute
1;
}
-#- get_info_isdn_backend : fills the infos from the line of the tree returned into $isdn and $netc
-#- input :
-#- $isdn
-#- $netc
-#- $name : the line choosen in the tree of ISP : string : /^(.*)\|(.*)\|(.*)$/ with $1=Land $2=City $3=ISP_name
-#- $file : 1st location of the file : ISDN_DB_FILE
-#- $file2 : 2nd location of the file : ISDN_DB_FILE
-#- $isdn ouput
-#- $isdn->{user_name}, $isdn->{phone_out}, $netc->{DOMAINNAME2}, $netc->{dnsServer2}, $netc->{dnsServer3},
-#- $netc output
-#- $netc->{DOMAINNAME2}, $netc->{dnsServer2}, $netc->{dnsServer3}
sub get_info_providers_backend {
my ($isdn, $netc, $name, $file) = @_;
$name eq 'Unlisted - edit manually' and return;
@@ -153,7 +145,7 @@ sub isdn_ask_info {
$f = "$prefix$f" if !-e $f;
my $str= $in->ask_from_treelist( _("ISDN Configuration"), _("Select your provider.\n If it's not in the list, choose Unlisted"),
'|', ['Unlisted - edit manually',
- netconnect::read_providers_backend($f)], 'Unlisted - edit manually')
+ read_providers_backend($f)], 'Unlisted - edit manually')
or return;
get_info_providers_backend($isdn, $netc, $str || 'Unlisted - edit manually', $f);
$isdn->{$_} ||= '' foreach qw(phone_in phone_out dialing_mode login passwd passwd2 idl);
diff --git a/perl-install/network/modem.pm b/perl-install/network/modem.pm
index e97ad13fd..347351254 100644
--- a/perl-install/network/modem.pm
+++ b/perl-install/network/modem.pm
@@ -1,5 +1,10 @@
package network::modem;
+
use common qw(:common :file);
+use any;
+use modules;
+use detect_devices;
+use mouse;
use network::tools;
use vars qw(@ISA @EXPORT);
diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm
index dd2ca6ad9..8447df8d8 100644
--- a/perl-install/network/netconnect.pm
+++ b/perl-install/network/netconnect.pm
@@ -1,3 +1,4 @@
+
package network::netconnect;
use diagnostics;
diff --git a/perl-install/network/tools.pm b/perl-install/network/tools.pm
index 8f89b9cc0..5f064ee73 100644
--- a/perl-install/network/tools.pm
+++ b/perl-install/network/tools.pm
@@ -1,5 +1,7 @@
package network::tools;
+use common qw(:common :file)
+use run_program;
use vars qw(@ISA @EXPORT);
@ISA = qw(Exporter);