From 46bed17a5b13ff4a43edd280a91e4a2475e92b88 Mon Sep 17 00:00:00 2001 From: Christian Goll Date: Tue, 2 Apr 2024 11:50:35 +0200 Subject: [PATCH] change ipxe at built time Signed-off-by: Christian Goll --- CHANGELOG.md | 1 + warewulf.spec.in | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 670f5b03..8dd72354 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -39,6 +39,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Fix a rendering bug in the documentation for GRUB boot support. #1132 - Replace slice in templates with sprig substr. #1093 - Don't attempt to rebuild protocol buffers in offline mode. #1155 +- Fix Suse package by moving yq command to `%install` section. #1169 ## [4.5.0] 2024-02-08 diff --git a/warewulf.spec.in b/warewulf.spec.in index c83dd823..e1c252b7 100644 --- a/warewulf.spec.in +++ b/warewulf.spec.in @@ -108,10 +108,6 @@ export NO_BRP_STALE_LINK_ERROR=yes make install \ DESTDIR=%{buildroot} - -%pre -getent group %{wwgroup} >/dev/null || groupadd -r %{wwgroup} -# use ipxe images from the distribution %if 0%{?suse_version} || 0%{?sle_version} yq e ' .tftp.ipxe."00:00" = "undionly.kpxe" | @@ -121,6 +117,10 @@ yq e ' -i %{buildroot}%{_sysconfdir}/warewulf/warewulf.conf %endif +%pre +getent group %{wwgroup} >/dev/null || groupadd -r %{wwgroup} +# use ipxe images from the distribution + %post %systemd_post warewulfd.service