From 9ff7af06907da2605f137d16d7197a7ebe121051 Mon Sep 17 00:00:00 2001
From: Frederic Lepied <flepied@mandriva.com>
Date: Tue, 19 Nov 2002 16:57:35 +0000
Subject: default dhcp client is dhcp-client

---
 perl-install/network/ethernet.pm | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'perl-install/network')

diff --git a/perl-install/network/ethernet.pm b/perl-install/network/ethernet.pm
index bda415549..97d368843 100644
--- a/perl-install/network/ethernet.pm
+++ b/perl-install/network/ethernet.pm
@@ -26,24 +26,24 @@ sub configure_cable {
     #  					       [N("Host name:")], [ \$netcnx->{cable}{hostname} ]);
     if ($::expert) {
 	my @m = (
-	       { description => "dhcpcd",
+	       { description => "dhcp-client",
 		 c => 1 },
-	       { description => "dhcpxd",
+	       { description => "dhcpcd",
 		 c => 3 },
-	       { description => "dhcp-client",
+	       { description => "dhcpxd",
 		 c => 4 },
 	      );
 	if (my $f = $in->ask_from_listf(N("Connect to the Internet"),
 					N("Which dhcp client do you want to use?
-Default is dhcpcd"),
+Default is dhcp-client"),
 					sub { $_[0]{description} },
 					\@m)) {
-	    $f->{c} == 1 and $netcnx->{dhcp_client} = "dhcpcd" and $in->do_pkgs->install(qw(dhcpcd));
-	    $f->{c} == 3 and $netcnx->{dhcp_client} = "dhcpxd" and $in->do_pkgs->install(qw(dhcpxd));
-	    $f->{c} == 4 and $netcnx->{dhcp_client} = "dhcp-client" and $in->do_pkgs->install(qw(dhcp-client));
+	    $f->{c} == 3 and $netcnx->{dhcp_client} = "dhcpcd" and $in->do_pkgs->install(qw(dhcpcd));
+	    $f->{c} == 4 and $netcnx->{dhcp_client} = "dhcpxd" and $in->do_pkgs->install(qw(dhcpxd));
+	    $f->{c} == 1 and $netcnx->{dhcp_client} = "dhcp-client" and $in->do_pkgs->install(qw(dhcp-client));
 	}
     } else {
-	$in->do_pkgs->install(qw(dhcpcd));
+	$in->do_pkgs->install(qw(dhcp-client));
     }
     go_ethernet($netc, $intf, 'dhcp', '', '', $first_time);
     write_cnx_script($netc, "cable",
-- 
cgit v1.2.1