summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2003-11-23 21:35:40 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2003-11-23 21:35:40 +0000
commit16e8cd166aec76a67b7643f7ce4d0c676356b6e7 (patch)
treed132ae780a2e87060596ea42a441f74d4dc6c82a
parentc33954b0763e0ba0b27f1a970e23150d92a48fe1 (diff)
downloaddrakx-backup-do-not-use-16e8cd166aec76a67b7643f7ce4d0c676356b6e7.tar
drakx-backup-do-not-use-16e8cd166aec76a67b7643f7ce4d0c676356b6e7.tar.gz
drakx-backup-do-not-use-16e8cd166aec76a67b7643f7ce4d0c676356b6e7.tar.bz2
drakx-backup-do-not-use-16e8cd166aec76a67b7643f7ce4d0c676356b6e7.tar.xz
drakx-backup-do-not-use-16e8cd166aec76a67b7643f7ce4d0c676356b6e7.zip
(detect_timezone, disconnected, type2interface) kill dead code
-rw-r--r--perl-install/network/tools.pm34
1 files changed, 1 insertions, 33 deletions
diff --git a/perl-install/network/tools.pm b/perl-install/network/tools.pm
index d67ffc06f..53f9b1820 100644
--- a/perl-install/network/tools.pm
+++ b/perl-install/network/tools.pm
@@ -9,7 +9,7 @@ use MDK::Common::Globals "network", qw($in $prefix $disconnect_file $connect_pro
use MDK::Common::System qw(getVarsFromSh);
@ISA = qw(Exporter);
-@EXPORT = qw(ask_connect_now ask_info2 connect_backend connected connected_bg disconnect_backend disconnected is_dynamic_ip is_wireless_intf passwd_by_login read_providers_backend read_secret_backend test_connected type2interface write_cnx_script write_initscript write_secret_backend);
+@EXPORT = qw(ask_connect_now ask_info2 connect_backend connected connected_bg disconnect_backend is_dynamic_ip is_wireless_intf passwd_by_login read_providers_backend read_secret_backend test_connected write_cnx_script write_initscript write_secret_backend);
@EXPORT_OK = qw($in);
sub write_cnx_script {
@@ -140,35 +140,6 @@ sub ask_info2 {
1;
}
-sub detect_timezone() {
- my %tmz2country = (
- 'Europe/Paris' => N("France"),
- 'Europe/Amsterdam' => N("Netherlands"),
- 'Europe/Rome' => N("Italy"),
- 'Europe/Brussels' => N("Belgium"),
- 'America/New_York' => N("United States"),
- 'Europe/London' => N("United Kingdom")
- );
- my %tm_parse = MDK::Common::System::getVarsFromSh('/etc/sysconfig/clock');
- my @country;
- foreach (keys %tmz2country) {
- if ($_ eq $tm_parse{ZONE}) {
- unshift @country, $tmz2country{$_};
- } else { push @country, $tmz2country{$_} };
- }
- \@country;
-}
-
-sub type2interface {
- my ($i) = @_;
- $i =~ /$_->[0]/ and return $_->[1] foreach [ modem => 'ppp' ],
- [ isdn_internal => 'ippp' ],
- [ isdn_external => 'ppp' ],
- [ adsl => 'ppp' ],
- [ cable => 'eth' ],
- [ lan => 'eth' ];
-}
-
sub connected() { gethostbyname("mandrakesoft.com") ? 1 : 0 }
my $kid_pipe;
@@ -229,9 +200,6 @@ sub connected2() {
});
}
-sub disconnected() {}
-
-
sub write_initscript() {
$::testing and return;
output_with_perm("$prefix/etc/rc.d/init.d/internet", 0755,