diff options
| author | Martin Whitaker <mageia@martin-whitaker.me.uk> | 2023-08-19 19:41:50 +0100 |
|---|---|---|
| committer | Martin Whitaker <mageia@martin-whitaker.me.uk> | 2023-08-19 19:41:50 +0100 |
| commit | 66fe9e18812c5009eee369144dd75e81fe0dc6ce (patch) | |
| tree | f5b1270a189cec91f24a922ecca51b7674f93cb2 | |
| parent | 023a3cfaf17f28ce4e6f191f0991fd512989a4eb (diff) | |
| download | drakx-66fe9e18812c5009eee369144dd75e81fe0dc6ce.tar drakx-66fe9e18812c5009eee369144dd75e81fe0dc6ce.tar.gz drakx-66fe9e18812c5009eee369144dd75e81fe0dc6ce.tar.bz2 drakx-66fe9e18812c5009eee369144dd75e81fe0dc6ce.tar.xz drakx-66fe9e18812c5009eee369144dd75e81fe0dc6ce.zip | |
Revert "Change default DHCP client to dhcpcd (mga#30938)"
This reverts commit 35cdeec997163a9195f1c6c917554cbed5892261.
The change broke the ability to bring up networking (to add
on-line media) when using the classical installer ISO to
update a system that used the legacy network scripts.
| -rw-r--r-- | perl-install/install/NEWS | 2 | ||||
| -rw-r--r-- | perl-install/install/any.pm | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index cb25b3821..cb2fadeac 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,3 +1,5 @@ +- Revert change of default DHCP client to dhcpcd (mga#30938) + Version 18.65 - 11 July 2023 - add ntfs3 to isFat_or_NTFS() diff --git a/perl-install/install/any.pm b/perl-install/install/any.pm index 317f2fba9..47809b240 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} || 'dhcpcd' : () } values %{$o->{net}{ifcfg}}; + my @ltmp = map { $_->{BOOTPROTO} eq 'dhcp' ? $_->{DHCP_CLIENT} || 'dhcp-client' : () } 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)); |