From 35cdeec997163a9195f1c6c917554cbed5892261 Mon Sep 17 00:00:00 2001
From: Martin Whitaker <mageia@martin-whitaker.me.uk>
Date: Sat, 24 Jun 2023 09:07:16 +0100
Subject: Change default DHCP client to dhcpcd (mga#30938)

---
 perl-install/install/NEWS   | 2 ++
 perl-install/install/any.pm | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'perl-install/install')

diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index c7b7bb762..53d766333 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,5 @@
+- change default DHCP client to dhcpcd (mga#30938)
+
 Version 18.63 - 6 June 2023
 
 - rescue: mount efivars in chroot on UEFI systems (mga#31844)
diff --git a/perl-install/install/any.pm b/perl-install/install/any.pm
index 47809b240..317f2fba9 100644
--- a/perl-install/install/any.pm
+++ b/perl-install/install/any.pm
@@ -811,7 +811,7 @@ sub default_packages {
     add_n_log("CPU needs cpupower", 'cpupower') if detect_devices::hasCPUFreq();
     add_n_log("APM support needed", 'apmd') if -e "/proc/apm";
     add_n_log("needed by hardware", detect_devices::probe_name('Pkg'));
-    my @ltmp = map { $_->{BOOTPROTO} eq 'dhcp' ? $_->{DHCP_CLIENT} || 'dhcp-client' : () } values %{$o->{net}{ifcfg}};
+    my @ltmp = map { $_->{BOOTPROTO} eq 'dhcp' ? $_->{DHCP_CLIENT} || 'dhcpcd' : () } values %{$o->{net}{ifcfg}};
     add_n_log("needed by networking", @ltmp) if @ltmp;
     # will get auto selected at summary stage for bootloader:
     add_n_log("needed later at summary stage", qw(acpi acpid));
-- 
cgit v1.2.1