diff options
author | Martin Whitaker <mageia@martin-whitaker.me.uk> | 2023-08-19 19:51:48 +0100 |
---|---|---|
committer | Martin Whitaker <mageia@martin-whitaker.me.uk> | 2023-08-19 19:51:48 +0100 |
commit | b4b0494458962f920c283c346ca788e874ca6998 (patch) | |
tree | f41b7bcb91c8a50769fb22d03c0c5a003f7d8494 | |
parent | 1d6ab438752bb4b4187ce9965210ce3af290da3e (diff) | |
download | drakx-net-b4b0494458962f920c283c346ca788e874ca6998.tar drakx-net-b4b0494458962f920c283c346ca788e874ca6998.tar.gz drakx-net-b4b0494458962f920c283c346ca788e874ca6998.tar.bz2 drakx-net-b4b0494458962f920c283c346ca788e874ca6998.tar.xz drakx-net-b4b0494458962f920c283c346ca788e874ca6998.zip |
Revert "Change default DHCP client to dhcpcd and remove dhclient (mga#30938)"
This reverts commit 69b30df9af481c62601aa3a42b965f9ffebc921d.
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-- | NEWS | 2 | ||||
-rw-r--r-- | lib/network/connection/ethernet.pm | 4 |
2 files changed, 4 insertions, 2 deletions
@@ -1,3 +1,5 @@ +- revert change of default DHCP client to dhcpcd and removal of dhclient (mga#30938) + 2.57 - change default DHCP client to dhcpcd and remove dhclient (mga#30938) diff --git a/lib/network/connection/ethernet.pm b/lib/network/connection/ethernet.pm index 47ff49b..0450149 100644 --- a/lib/network/connection/ethernet.pm +++ b/lib/network/connection/ethernet.pm @@ -7,7 +7,7 @@ use lib qw(/usr/lib/libDrakX); # helps perl_checker use common; use network::tools; -our @dhcp_clients = qw(dhcpcd pump dhcpxd); +our @dhcp_clients = qw(dhclient dhcpcd pump dhcpxd); sub get_type_name() { N("Ethernet") } sub get_type_description() { N("Wired (Ethernet)") } @@ -318,7 +318,7 @@ use run_program; sub install_dhcp_client { my ($in, $client) = @_; my %packages = ( - "dhcpcd" => "dhcpcd", + "dhclient" => "dhcp-client", ); #- use default dhcp client if none is provided $client ||= $dhcp_clients[0]; |