From 578186f159c984efec60d32bf1687cf361381ba5 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tvignaud@mandriva.org>
Date: Tue, 2 Mar 2004 13:35:57 +0000
Subject: preselect first availlable dhcp client

---
 perl-install/network/netconnect.pm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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),
-- 
cgit v1.2.1