From b0d554c4155060ed665844fdf7b2a08db9bb3356 Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Wed, 27 Nov 2002 20:50:12 +0000 Subject: perl_checker adaptations --- perl-install/network/adsl.pm | 2 +- perl-install/network/ethernet.pm | 2 +- perl-install/network/isdn.pm | 4 ++-- perl-install/network/isdn_consts.pm | 2 +- perl-install/network/network.pm | 4 ++-- perl-install/network/tools.pm | 12 ++++++------ 6 files changed, 13 insertions(+), 13 deletions(-) (limited to 'perl-install/network') diff --git a/perl-install/network/adsl.pm b/perl-install/network/adsl.pm index 79f186426..35b5bcd34 100644 --- a/perl-install/network/adsl.pm +++ b/perl-install/network/adsl.pm @@ -20,7 +20,7 @@ sub configure { # N("The most common way to connect with adsl is pppoe. # Some connections use pptp, a few ones use dhcp. # If you don't know, choose 'use pppoe'"), [N_("use pppoe"), N_("use pptp"), N_("use dhcp"), N_("Alcatel speedtouch usb"), N_("ECI Hi-Focus")]) or return; - my $l = [N_("use pppoe"), + my $l = [ N_("use pppoe"), N_("use pptp"), N_("use dhcp"), N_("Alcatel speedtouch usb") . if_($netc->{autodetect}{adsl}{speedtouch}, " - detected"), diff --git a/perl-install/network/ethernet.pm b/perl-install/network/ethernet.pm index 9458eb292..4752258ce 100644 --- a/perl-install/network/ethernet.pm +++ b/perl-install/network/ethernet.pm @@ -202,7 +202,7 @@ N("Please enter your host name if you know it. Some DHCP servers require the hostname to work. Your host name should be a fully-qualified host name, such as ``mybox.mylab.myco.com''."), - [ { label => N("Host name"), val => \$netc->{HOSTNAME} }]) or goto configureNetwork_step_1; + [ { label => N("Host name"), val => \$netc->{HOSTNAME} } ]) or goto configureNetwork_step_1; $netc->{HOSTNAME} ne $dhcp_hostname and $netc->{DHCP_HOSTNAME} = $netc->{HOSTNAME}; } else { configureNetworkNet($in, $netc, $last ||= {}, @l) or goto configureNetwork_step_1; diff --git a/perl-install/network/isdn.pm b/perl-install/network/isdn.pm index 8879ffd82..0466c4030 100644 --- a/perl-install/network/isdn.pm +++ b/perl-install/network/isdn.pm @@ -19,7 +19,7 @@ sub configure { defined $netc->{autodetect}{isdn}{id} and goto intern_pci; $::isInstall and $in->set_help('configureNetworkISDN'); my $e = $in->ask_from_list_(N("Network Configuration Wizard"), - N("What kind is your ISDN connection?"), [ N_("Internal ISDN card"), N_("External ISDN modem")] + N("What kind is your ISDN connection?"), [ N_("Internal ISDN card"), N_("External ISDN modem") ] ) or return; if ($e =~ /card/) { intern_pci: @@ -51,7 +51,7 @@ sub isdn_write_config { standard, but with less tools. We recommand the light configuration. -"), [ N_("New configuration (isdn-light)"), N_("Old configuration (isdn4net)")] +"), [ N_("New configuration (isdn-light)"), N_("Old configuration (isdn4net)") ] ) or return; my ($rmpackage, $instpackage) = $e =~ /light/ ? ('isdn4net', 'isdn-light') : ('isdn-light', 'isdn4net'); if (!$::isStandalone) { diff --git a/perl-install/network/isdn_consts.pm b/perl-install/network/isdn_consts.pm index eff83b0b5..b93a75e11 100644 --- a/perl-install/network/isdn_consts.pm +++ b/perl-install/network/isdn_consts.pm @@ -1,6 +1,6 @@ package network::isdn; # $Id$ -@isdndata = +our @isdndata = ( { description => "Teles 16.0 (ISA)", #1 irq, mem, io driver => 'hisax', diff --git a/perl-install/network/network.pm b/perl-install/network/network.pm index 55d5c324b..b99bc38b7 100644 --- a/perl-install/network/network.pm +++ b/perl-install/network/network.pm @@ -176,7 +176,7 @@ sub guessHostname { write_resolv_conf("$prefix/etc/resolv.conf", $netc); - my $name = gethostbyaddr(Socket::inet_aton($intf->{IPADDR}), AF_INET) or log::l("reverse name lookup failed"), return 0; + my $name = gethostbyaddr(Socket::inet_aton($intf->{IPADDR}), Socket::AF_INET()) or log::l("reverse name lookup failed"), return 0; log::l("reverse name lookup worked"); @@ -317,7 +317,7 @@ notation (for example, 1.2.3.4)."); { label => N("Automatic IP"), val => \$pump, type => "bool", text => N("(bootp/dhcp)") }, if_($::expert, { label => N("Start at boot"), val => \$onboot, type => "bool" }), if_($intf->{wireless_eth}, - { label => "WIRELESS_MODE", val => \$intf->{WIRELESS_MODE}, list => [ "Ad-hoc", "Managed", "Master", "Repeater", "Secondary", "Auto"] }, + { label => "WIRELESS_MODE", val => \$intf->{WIRELESS_MODE}, list => [ "Ad-hoc", "Managed", "Master", "Repeater", "Secondary", "Auto" ] }, { label => "WIRELESS_ESSID", val => \$intf->{WIRELESS_ESSID} }, { label => "WIRELESS_NWID", val => \$intf->{WIRELESS_NWID} }, { label => "WIRELESS_FREQ", val => \$intf->{WIRELESS_FREQ} }, diff --git a/perl-install/network/tools.pm b/perl-install/network/tools.pm index 07d8e5d6e..78075fd68 100644 --- a/perl-install/network/tools.pm +++ b/perl-install/network/tools.pm @@ -129,12 +129,12 @@ sub detect_timezone { sub type2interface { my ($i) = @_; - $i =~ /$_->[0]/ and return $_->[1] foreach [ modem => 'ppp'], - [ isdn_internal => 'ippp'], - [ isdn_external => 'ppp'], - [ adsl => 'ppp'], - [ cable => 'eth'], - [ lan => 'eth']; + $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 } -- cgit v1.2.1