summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2004-03-02 13:35:57 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2004-03-02 13:35:57 +0000
commit578186f159c984efec60d32bf1687cf361381ba5 (patch)
tree17a08bc9f6f64b34537fd60efca16403fc1ec406
parent952d99318b5370fc7eff9e0c7493c015b9f6d8eb (diff)
downloaddrakx-578186f159c984efec60d32bf1687cf361381ba5.tar
drakx-578186f159c984efec60d32bf1687cf361381ba5.tar.gz
drakx-578186f159c984efec60d32bf1687cf361381ba5.tar.bz2
drakx-578186f159c984efec60d32bf1687cf361381ba5.tar.xz
drakx-578186f159c984efec60d32bf1687cf361381ba5.zip
preselect first availlable dhcp client
-rw-r--r--perl-install/network/netconnect.pm3
1 files changed, 2 insertions, 1 deletions
diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm
index fb8baf423..0d11bd562 100644
--- a/perl-install/network/netconnect.pm
+++ b/perl-install/network/netconnect.pm
@@ -789,7 +789,8 @@ Modifying the fields below will override this configuration."),
delete $ethntf->{NETWORK};
delete $ethntf->{BROADCAST};
@fields = qw(IPADDR NETMASK);
- $netc->{dhcp_client} ||= "dhcp-client";
+ $netc->{dhcp_client} ||= (find { -x "/sbin/$_" } qw(dhclient dhcpcd pump dhcpxd)) || "dhcp-client";
+ $netc->{dhcp_client} = "dhcp-client" if $netc->{dhcp_client} eq "dhclient";
},
name => sub { join('',
N("Configuring network device %s (driver %s)", $ethntf->{DEVICE}, $module),