From b4b0494458962f920c283c346ca788e874ca6998 Mon Sep 17 00:00:00 2001 From: Martin Whitaker Date: Sat, 19 Aug 2023 19:51:48 +0100 Subject: 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. --- NEWS | 2 ++ lib/network/connection/ethernet.pm | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index 668efb8..6cea654 100644 --- a/NEWS +++ b/NEWS @@ -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]; -- cgit v1.2.1