summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Whitaker <mageia@martin-whitaker.me.uk>2023-06-24 09:07:16 +0100
committerMartin Whitaker <mageia@martin-whitaker.me.uk>2023-06-24 10:46:01 +0100
commit35cdeec997163a9195f1c6c917554cbed5892261 (patch)
treea0562aa86ad2ec5b21e3bce1231075e74ace7f8f
parentaf595da3540b894e39435ab41119802f45b49e5d (diff)
downloaddrakx-35cdeec997163a9195f1c6c917554cbed5892261.tar
drakx-35cdeec997163a9195f1c6c917554cbed5892261.tar.gz
drakx-35cdeec997163a9195f1c6c917554cbed5892261.tar.bz2
drakx-35cdeec997163a9195f1c6c917554cbed5892261.tar.xz
drakx-35cdeec997163a9195f1c6c917554cbed5892261.zip
Change default DHCP client to dhcpcd (mga#30938)
-rw-r--r--perl-install/install/NEWS2
-rw-r--r--perl-install/install/any.pm2
2 files changed, 3 insertions, 1 deletions
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));