diff options
| author | Olivier Blin <oblin@mandriva.org> | 2005-03-09 16:44:43 +0000 |
|---|---|---|
| committer | Olivier Blin <oblin@mandriva.org> | 2005-03-09 16:44:43 +0000 |
| commit | ce971f65c6ba5901b3ec57da501b45b78fab256d (patch) | |
| tree | 1d8d8527283b6017094bbe069822e6b62c5dd54b /perl-install/network/netconnect.pm | |
| parent | e4b00449f014c0e2000e360114634a24bde6899d (diff) | |
| download | drakx-backup-do-not-use-ce971f65c6ba5901b3ec57da501b45b78fab256d.tar drakx-backup-do-not-use-ce971f65c6ba5901b3ec57da501b45b78fab256d.tar.gz drakx-backup-do-not-use-ce971f65c6ba5901b3ec57da501b45b78fab256d.tar.bz2 drakx-backup-do-not-use-ce971f65c6ba5901b3ec57da501b45b78fab256d.tar.xz drakx-backup-do-not-use-ce971f65c6ba5901b3ec57da501b45b78fab256d.zip | |
write selected dhcp client in ifcfg files
Diffstat (limited to 'perl-install/network/netconnect.pm')
| -rw-r--r-- | perl-install/network/netconnect.pm | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm index 19ad857bf..2d45e2998 100644 --- a/perl-install/network/netconnect.pm +++ b/perl-install/network/netconnect.pm @@ -1011,8 +1011,7 @@ Do you really want to reconfigure this device?"), delete $ethntf->{NETWORK}; delete $ethntf->{BROADCAST}; delete $ethntf->{TYPE} if $netcnx->{type} ne 'adsl' || !member($adsl_type, qw(manual dhcp)); - $netc->{dhcp_client} ||= (find { -x "$::prefix/sbin/$_" } qw(dhclient dhcpcd pump dhcpxd)) || "dhcp-client"; - $netc->{dhcp_client} = "dhcp-client" if $netc->{dhcp_client} eq "dhclient"; + $ethntf->{DHCP_CLIENT} ||= (find { -x "$::prefix/sbin/$_" } qw(dhclient dhcpcd pump dhcpxd)); }, name => sub { join('', N("Configuring network device %s (driver %s)", $ethntf->{DEVICE}, $module), @@ -1037,7 +1036,7 @@ notation (for example, 1.2.3.4).")), { text => N("Start at boot"), val => \$onboot, type => "bool" }, ), if_($auto_ip, - { label => N("DHCP client"), val => \$netc->{dhcp_client}, + { label => N("DHCP client"), val => \$ethntf->{DHCP_CLIENT}, list => \@network::ethernet::dhcp_clients, advanced => 1 }, { label => N("DHCP timeout (in seconds)"), val => \$ethntf->{DHCP_TIMEOUT}, advanced => 1 }, { text => N("Get DNS servers from DHCP"), val => \$peerdns, type => "bool", advanced => 1 }, @@ -1081,7 +1080,6 @@ notation (for example, 1.2.3.4).")), $ethntf->{HWADDR} = $track_network_id or delete $ethntf->{HWADDR}; $netc->{$_} = $ethntf->{DEVICE} foreach qw(NET_DEVICE NET_INTERFACE); if ($auto_ip) { - $in->do_pkgs->install($netc->{dhcp_client}); #- delete gateway settings if gateway device is invalid or if reconfiguring the gateway interface to dhcp $delete_gateway_settings->($ntf_name); } |