diff options
| author | Thierry Vignaud <tvignaud@mandriva.org> | 2004-01-30 11:10:21 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tvignaud@mandriva.org> | 2004-01-30 11:10:21 +0000 |
| commit | 12ec0e6bcf5c7bf794d66ac2f3fbdaebd25082d5 (patch) | |
| tree | 21d80ee4ce285486914afa5962ad1b792bc9a379 | |
| parent | da1293ec901e9afcb4bbdc057a26d720c7b09a05 (diff) | |
| download | drakx-12ec0e6bcf5c7bf794d66ac2f3fbdaebd25082d5.tar drakx-12ec0e6bcf5c7bf794d66ac2f3fbdaebd25082d5.tar.gz drakx-12ec0e6bcf5c7bf794d66ac2f3fbdaebd25082d5.tar.bz2 drakx-12ec0e6bcf5c7bf794d66ac2f3fbdaebd25082d5.tar.xz drakx-12ec0e6bcf5c7bf794d66ac2f3fbdaebd25082d5.zip | |
(conf_network_card_backend) make type and interface arguments mandatory
| -rw-r--r-- | perl-install/network/ethernet.pm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/perl-install/network/ethernet.pm b/perl-install/network/ethernet.pm index 8b74b5bb1..28a0fe99e 100644 --- a/perl-install/network/ethernet.pm +++ b/perl-install/network/ethernet.pm @@ -85,18 +85,18 @@ sub get_eth_cards() { #- output: #- $device : only returned in case $interface was given it's $interface, but filtered by /eth[0-9+]/ : string : /eth[0-9+]/ sub conf_network_card_backend { - my ($netc, $intf, $o_type, $o_interface, $o_ipadr, $o_netadr) = @_; + my ($netc, $intf, $type, $interface, $o_ipadr, $o_netadr) = @_; #-type =static or dhcp - $o_interface =~ /eth[0-9]+/ or die("the interface is not an ethx"); + $interface =~ /eth[0-9]+/ or die("the interface is not an ethx"); # FIXME: this is wrong regarding some wireless interfaces or/and if user play if ifname(1): - $netc->{NET_DEVICE} = $o_interface; #- one consider that there is only ONE Internet connection device.. + $netc->{NET_DEVICE} = $interface; #- one consider that there is only ONE Internet connection device.. - @{$intf->{$o_interface}}{qw(DEVICE BOOTPROTO NETMASK NETWORK ONBOOT)} = ($o_interface, $o_type, '255.255.255.0', $o_netadr, 'yes'); + @{$intf->{$interface}}{qw(DEVICE BOOTPROTO NETMASK NETWORK ONBOOT)} = ($interface, $type, '255.255.255.0', $o_netadr, 'yes'); - $intf->{$o_interface}{IPADDR} = $o_ipadr if $o_ipadr; - $o_interface; + $intf->{$interface}{IPADDR} = $o_ipadr if $o_ipadr; + $interface; } # automatic net aliases configuration |