diff options
| author | Damien Chaumette <dchaumette@mandriva.com> | 2003-01-23 19:00:44 +0000 |
|---|---|---|
| committer | Damien Chaumette <dchaumette@mandriva.com> | 2003-01-23 19:00:44 +0000 |
| commit | 5440545569825924186ea56fffeff86a3ca1d78d (patch) | |
| tree | 11758419e8b43ec97730431110442a000442352b /perl-install/network/ethernet.pm | |
| parent | 798c1489d5dbe43eda2fe1b02e26b5477d248792 (diff) | |
| download | drakx-5440545569825924186ea56fffeff86a3ca1d78d.tar drakx-5440545569825924186ea56fffeff86a3ca1d78d.tar.gz drakx-5440545569825924186ea56fffeff86a3ca1d78d.tar.bz2 drakx-5440545569825924186ea56fffeff86a3ca1d78d.tar.xz drakx-5440545569825924186ea56fffeff86a3ca1d78d.zip | |
- perl_checker compliant
- s/$pump/$auto_ip/
- use join('', if_(..), if_(..))
- each_index instead of for
- various fixes
Diffstat (limited to 'perl-install/network/ethernet.pm')
| -rw-r--r-- | perl-install/network/ethernet.pm | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/perl-install/network/ethernet.pm b/perl-install/network/ethernet.pm index b0b15ff42..db95c1a17 100644 --- a/perl-install/network/ethernet.pm +++ b/perl-install/network/ethernet.pm @@ -184,7 +184,7 @@ sub configureNetwork { } $last or return; - if ($last->{BOOTPROTO} =~ /dhcp|bootp|zeroconf/) { + if ($last->{BOOTPROTO} !~ /static/) { $netc->{minus_one} = 1; $netc->{DHCP} = 1; $::isInstall and $in->set_help('configureNetworkHostDHCP'); @@ -194,8 +194,6 @@ 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; - #$netc->{HOSTNAME} ne $dhcp_hostname and $netc->{DHCP_HOSTNAME} = $netc->{HOSTNAME}; - $intf->{DHCP_HOSTNAME} = $netc->{HOSTNAME}; } else { configureNetworkNet($in, $netc, $last ||= {}, @l) or goto configureNetwork_step_1; } |