Use dhcpcd instead of dhclient (RHBZ#2247057)

This commit is contained in:
Richard W.M. Jones 2023-10-30 14:13:38 +00:00
parent 007cc47bef
commit 15f0fe6b03
2 changed files with 35 additions and 2 deletions

View File

@ -0,0 +1,26 @@
From 0e37e5feeaf4380bc971a3105ead8e779a94fa36 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Mon, 30 Oct 2023 14:31:26 +0000
Subject: [PATCH] appliance: Allow dhcpcd to be used on Red Hat platforms
Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=2247057
Fixes: https://github.com/libguestfs/libguestfs/issues/121
---
appliance/packagelist.in | 1 +
1 file changed, 1 insertion(+)
diff --git a/appliance/packagelist.in b/appliance/packagelist.in
index d3a945792e..3095234431 100644
--- a/appliance/packagelist.in
+++ b/appliance/packagelist.in
@@ -28,6 +28,7 @@ ifelse(REDHAT,1,
cryptsetup
cryptsetup-luks dnl old name used before Fedora 17
dhclient
+ dhcpcd
gfs-utils
gfs2-utils
glibc-gconv-extra dnl syslinux requires IBM850 iconv converter
--
2.42.0

View File

@ -50,7 +50,7 @@ Summary: Access and modify virtual machine disk images
Name: libguestfs
Epoch: 1
Version: 1.51.7
Release: 4%{?dist}
Release: 5%{?dist}
License: LGPL-2.1-or-later
# Build only for architectures that have a kernel
@ -88,6 +88,10 @@ Source8: copy-patches.sh
# Upstream in >= 1.51.8
Patch: 0001-daemon-Find-lcamlstr-nat-byt-and-lunix-nat-byt-and-r.patch
# Allow dhcpcd to be used on Red Hat platforms
# Upstream in >= 1.51.8
Patch: 0001-appliance-Allow-dhcpcd-to-be-used-on-Red-Hat-platfor.patch
%if 0%{patches_touch_autotools}
BuildRequires: autoconf, automake, libtool, gettext-devel
%endif
@ -211,7 +215,7 @@ BuildRequires: clevis-luks
BuildRequires: coreutils
BuildRequires: cpio
BuildRequires: cryptsetup
BuildRequires: dhclient
BuildRequires: dhcpcd
BuildRequires: diffutils
BuildRequires: dosfstools
BuildRequires: e2fsprogs
@ -1098,6 +1102,9 @@ rm ocaml/html/.gitignore
%changelog
* Mon Oct 30 2023 Richard W.M. Jones <rjones@redhat.com> - 1:1.51.7-5
- Use dhcpcd instead of dhclient (RHBZ#2247057)
* Fri Oct 06 2023 Richard W.M. Jones <rjones@redhat.com> - 1:1.51.7-4
- Add upstream patch to fix linking the daemon with OCaml 5.1