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 ++++++++--------
 perl-install/share/po/DrakX.pot     |  2 +-
 perl-install/share/po/no.po         |  4 ++--
 perl-install/share/po/sp.po         |  4 ++--
 perl-install/standalone/drakconnect |  2 +-
 5 files changed, 14 insertions(+), 14 deletions(-)

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",
diff --git a/perl-install/share/po/DrakX.pot b/perl-install/share/po/DrakX.pot
index 2005b432e..bbc49047d 100644
--- a/perl-install/share/po/DrakX.pot
+++ b/perl-install/share/po/DrakX.pot
@@ -5666,7 +5666,7 @@ msgstr ""
 #: ../../network/ethernet.pm_.c:37
 msgid ""
 "Which dhcp client do you want to use?\n"
-"Default is dhcpcd"
+"Default is dhcp-client"
 msgstr ""
 
 #: ../../network/ethernet.pm_.c:88
diff --git a/perl-install/share/po/no.po b/perl-install/share/po/no.po
index 271da36ed..afe3c8ad2 100644
--- a/perl-install/share/po/no.po
+++ b/perl-install/share/po/no.po
@@ -6670,10 +6670,10 @@ msgstr "Test porter"
 #: ../../network/ethernet.pm_.c:37
 msgid ""
 "Which dhcp client do you want to use?\n"
-"Default is dhcpcd"
+"Default is dhcp-client"
 msgstr ""
 "Hvilken dhcp klient јnsker du х bruke?\n"
-"Standard er dhcpcd"
+"Standard er dhcp-client"
 
 #: ../../network/ethernet.pm_.c:88
 msgid ""
diff --git a/perl-install/share/po/sp.po b/perl-install/share/po/sp.po
index dad566de8..4c7ef7f20 100644
--- a/perl-install/share/po/sp.po
+++ b/perl-install/share/po/sp.po
@@ -7207,8 +7207,8 @@ msgstr "
 #: ../../network/ethernet.pm_.c:37
 msgid ""
 "Which dhcp client do you want to use?\n"
-"Default is dhcpcd"
-msgstr "Ког dhcp клиjента желите да користитe ?Постављени jе dhcpcd"
+"Default is dhcp-client"
+msgstr "Ког dhcp клиjента желите да користитe ?Постављени jе dhcp-client"
 
 #: ../../network/ethernet.pm_.c:88
 msgid ""
diff --git a/perl-install/standalone/drakconnect b/perl-install/standalone/drakconnect
index 5a9e897d8..7d5f5ac36 100755
--- a/perl-install/standalone/drakconnect
+++ b/perl-install/standalone/drakconnect
@@ -624,7 +624,7 @@ Create one first by clicking on 'Configure'")),1,1,0);
 		     [N("First DNS Server (optional)"), \$cnx->{dns1} ],
 		     [N("Second DNS Server (optional)"), \$cnx->{dns2} ],
 		     [N("Ethernet Card"), \$netc->{NET_DEVICE}, [ 'eth0', 'eth1', 'eth2', 'eth3', 'eth4', 'eth5','eth6', 'eth7', 'eth8', 'eth9' ]],
-		     [N("DHCP Client"), \$netcnx->{dhcp_client}, ["dhcpcd", "dhcpxd", "dhcp-client"] ],
+		     [N("DHCP Client"), \$netcnx->{dhcp_client}, ["dhcp-client", "dhcpcd", "dhcpxd"] ],
 		     [N("Connection speed"), \$cnx->{speed}, ["64 Kb/s", "128 Kb/s"]],
 		     [N("Connection timeout (in sec)"), \$cnx->{huptimeout} ]
 );
-- 
cgit v1.2.1