diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2002-07-31 22:40:00 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2002-07-31 22:40:00 +0000 |
| commit | 5a08b6763c4a2efd6da24fc7a3d0149618e086ea (patch) | |
| tree | dadf7b0060bdf672762e458f936b4e20b7949bfa /perl-install/network | |
| parent | 2c2ac91cdc7f1bd86dfd222fc8edeb4edea46a5d (diff) | |
| download | drakx-backup-do-not-use-5a08b6763c4a2efd6da24fc7a3d0149618e086ea.tar drakx-backup-do-not-use-5a08b6763c4a2efd6da24fc7a3d0149618e086ea.tar.gz drakx-backup-do-not-use-5a08b6763c4a2efd6da24fc7a3d0149618e086ea.tar.bz2 drakx-backup-do-not-use-5a08b6763c4a2efd6da24fc7a3d0149618e086ea.tar.xz drakx-backup-do-not-use-5a08b6763c4a2efd6da24fc7a3d0149618e086ea.zip | |
make perl_checker happy again (replacing "{xx}->{yy}" by "{xx}{yy}")
Diffstat (limited to 'perl-install/network')
| -rw-r--r-- | perl-install/network/ethernet.pm | 6 | ||||
| -rw-r--r-- | perl-install/network/netconnect.pm | 18 | ||||
| -rw-r--r-- | perl-install/network/network.pm | 2 |
3 files changed, 13 insertions, 13 deletions
diff --git a/perl-install/network/ethernet.pm b/perl-install/network/ethernet.pm index aa2339fe2..8a71f60c7 100644 --- a/perl-install/network/ethernet.pm +++ b/perl-install/network/ethernet.pm @@ -87,7 +87,7 @@ sub conf_network_card { my $interface; @all_cards == () and $in->ask_warn('', _("No ethernet network adapter has been detected on your system. I cannot set up this connection type.")) and return; - @all_cards == 1 and $interface = $all_cards[0]->[0] and goto l1; + @all_cards == 1 and $interface = $all_cards[0][0] and goto l1; again : $interface = $in->ask_from_list(_("Choose the network interface"), _("Please choose which network adapter you want to use to connect to Internet"), @@ -155,7 +155,7 @@ sub conf_network_card_backend { @{$intf->{$device}}{qw(DEVICE BOOTPROTO NETMASK NETWORK ONBOOT)} = ($device, $type, '255.255.255.0', $netadr, 'yes'); - $intf->{$device}->{IPADDR} = $ipadr if $ipadr; + $intf->{$device}{IPADDR} = $ipadr if $ipadr; $device; } @@ -185,7 +185,7 @@ sub configureNetwork { my $intf2 = findIntf($intf ||= {}, $_); add2hash($intf2, $last); add2hash($intf2, { NETMASK => '255.255.255.0' }); - configureNetworkIntf($netc, $in, $intf2, $netc->{NET_DEVICE}, 0, $all_cards[$n_card]->[1]) or return; + configureNetworkIntf($netc, $in, $intf2, $netc->{NET_DEVICE}, 0, $all_cards[$n_card][1]) or return; $last = $intf2; $n_card++; diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm index 8aef0b3c8..3bfc02768 100644 --- a/perl-install/network/netconnect.pm +++ b/perl-install/network/netconnect.pm @@ -373,7 +373,7 @@ DNSThirdIP=$netc->{dnsServer3} AdminInterface= " . join ('', map { -"Eth${_}Known=" . ($intf->{"eth$_"}->{DEVICE} eq "eth$_" ? 'true' : 'false') . " +"Eth${_}Known=" . ($intf->{"eth$_"}{DEVICE} eq "eth$_" ? 'true' : 'false') . " Eth${_}IP=" . $intf->{"eth$_"}{IPADDR} . " Eth${_}Mask=" . $intf->{"eth$_"}{NETMASK} . " Eth${_}Mac= @@ -381,7 +381,7 @@ Eth${_}BootProto=" . $intf->{"eth$_"}{BOOTPROTO} . " Eth${_}OnBoot=" . $intf->{"eth$_"}{ONBOOT} . " Eth${_}Hostname=$netc->{HOSTNAME} Eth${_}HostAlias=" . do { $netc->{HOSTNAME} =~ /([^\.]*)\./; $1 } . " -Eth${_}Driver=$all_cards[$_]->[1] +Eth${_}Driver=$all_cards[$_][1] Eth${_}Irq= Eth${_}Port= Eth${_}DHCPClient=" . ($intf->{"eth$_"}{BOOTPROTO} eq 'dhcp' ? $netcnx->{dhcp_client} : '') . " @@ -528,13 +528,13 @@ sub load_conf { /^InternetGateway=(.*)$/ and $netc->{GATEWAY} = $1; /^SystemName=(.*)$/ and $system_name = $1; /^DomainName=(.*)$/ and $domain_name = $1; - /^Eth([0-9])Known=true$/ and $intf->{"eth$1"}->{DEVICE} = "eth$1"; - /^Eth([0-9])IP=(.*)$/ && $intf->{"eth$1"}->{DEVICE} and $intf->{"eth$1"}{IPADDR} = $2; - /^Eth([0-9])Mask=(.*)\n/ && $intf->{"eth$1"}->{DEVICE} and $intf->{"eth$1"}{NETMASK} = $2; - /^Eth([0-9])BootProto=(.*)\n/ && $intf->{"eth$1"}->{DEVICE} and $intf->{"eth$1"}{BOOTPROTO} = $2; - /^Eth([0-9])OnBoot=(.*)\n/ && $intf->{"eth$1"}->{DEVICE} and $intf->{"eth$1"}{ONBOOT} = $2; - /^Eth([0-9])Hostname=(.*)\n/ && $intf->{"eth$1"}->{DEVICE} and $netc->{HOSTNAME} = $2; - /^Eth([0-9])Driver=(.*)\n/ && $intf->{"eth$1"}->{DEVICE} and $intf->{"eth$1"}{driver} = $2; + /^Eth([0-9])Known=true$/ and $intf->{"eth$1"}{DEVICE} = "eth$1"; + /^Eth([0-9])IP=(.*)$/ && $intf->{"eth$1"}{DEVICE} and $intf->{"eth$1"}{IPADDR} = $2; + /^Eth([0-9])Mask=(.*)\n/ && $intf->{"eth$1"}{DEVICE} and $intf->{"eth$1"}{NETMASK} = $2; + /^Eth([0-9])BootProto=(.*)\n/ && $intf->{"eth$1"}{DEVICE} and $intf->{"eth$1"}{BOOTPROTO} = $2; + /^Eth([0-9])OnBoot=(.*)\n/ && $intf->{"eth$1"}{DEVICE} and $intf->{"eth$1"}{ONBOOT} = $2; + /^Eth([0-9])Hostname=(.*)\n/ && $intf->{"eth$1"}{DEVICE} and $netc->{HOSTNAME} = $2; + /^Eth([0-9])Driver=(.*)\n/ && $intf->{"eth$1"}{DEVICE} and $intf->{"eth$1"}{driver} = $2; /^ISDNDriver=(.*)$/ and $isdn->{driver} = $1; /^ISDNDeviceType=(.*)$/ and $isdn->{type} = $1; /^ISDNIrq=(.*)/ and $isdn->{irq} = $1; diff --git a/perl-install/network/network.pm b/perl-install/network/network.pm index 880b23aa6..4305d6011 100644 --- a/perl-install/network/network.pm +++ b/perl-install/network/network.pm @@ -207,7 +207,7 @@ sub dnsServers { sub findIntf { my ($intf, $device) = @_; - $intf->{$device}->{DEVICE} = $device; + $intf->{$device}{DEVICE} = $device; $intf->{$device}; } #PAD \s* a la fin |