xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2026-05-02 21:17:48 +00:00
Code Issues Releases Wiki Activity

fix: Fix dhcp-client dependency failure during genimage

Browse Source 
Signed-off-by: Daniel Hilst Selli <392820+dhilst@users.noreply.github.com>
This commit is contained in:
Daniel Hilst Selli
2026-04-01 13:02:35 -03:00
parent fccdc3ec64
commit 1b0deaf9af
2 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
xCAT-server/lib/xcat/plugins/anaconda.pm
View File

@@ -2392,7 +2392,11 @@ sub copycd
my @ret = xCAT::SvrUtils->update_tables_with_mgt_image($distname, $arch, $path, $osdistroname);
my @ret = xCAT::SvrUtils->update_tables_with_diskless_image($distname, $arch, undef, "netboot", $path, $osdistroname);
# @FIXME: (2.19+) dhcp-client is pulled by genimage but not provided by OS repositories. Because
# of that we provide it as an xCAT dependency in xCAT 2.18 unified repository and copy it
# to /install/dhcp_packages/ during post install, and append to the pkgdir of the netboot image below.
# Remove this in 2.19+ and use a supported DHCP implementation.
my @ret = xCAT::SvrUtils->update_tables_with_diskless_image($distname, $arch, undef, "netboot", "$path,/install/dhcp_pkgs/", $osdistroname);
#if ($ret[0] != 0) {
#$callback->({data => "Error when updating the osimage tables for stateless: " . $ret[1]});

10
xCAT-server/xCAT-server.spec
View File

@@ -507,6 +507,16 @@ then
cp /etc/%httpconfigdir/conf.orig/xcat-ws.conf.apache24 /etc/apache2/conf.d/xcat-ws.conf
fi
# @FIXME: (for v2.19+) Remove this and use the supported dhcp
%ifos linux
# In EL10 dhcp-client is not provided by the O.S repositories anymore
# so we download it to a directory which is appended to netboot
# pkgdir during copycds, s.t. genimage <netboot> succeds without
# need for human intervention. At the moment of writing the dhcp-client
# is provided by xCAT 2.18 unified repository as a dependency.
dnf download --destdir=/install/dhcp_pkgs/ dhcp-client
%endif
exit 0
%preun