Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

warewulf-provision: apply fix from upstream #1844

Merged
merged 1 commit into from
Jul 11, 2023
Merged

warewulf-provision: apply fix from upstream #1844

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions ...ts/provisioning/warewulf-provision/SOURCES/ecb8ece02892caf2cbd3b8d74a1f3e01052b9844.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
From ecb8ece02892caf2cbd3b8d74a1f3e01052b9844 Mon Sep 17 00:00:00 2001
From: "Benjamin S. Allen" <bsallen@alcf.anl.gov>
Date: Wed, 2 Feb 2022 17:13:03 -0500
Subject: [PATCH] Fix syntax error with extra quote, and fix shellcheck SC2166
on -a use vs &&

---
.../initramfs/capabilities/provision-vnfs/70-kernelmodules | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/provision/initramfs/capabilities/provision-vnfs/70-kernelmodules b/provision/initramfs/capabilities/provision-vnfs/70-kernelmodules
index feea4ca4..adbc9c9e 100644
--- a/provision/initramfs/capabilities/provision-vnfs/70-kernelmodules
+++ b/provision/initramfs/capabilities/provision-vnfs/70-kernelmodules
@@ -33,8 +33,8 @@ if [ -x "${NEWROOT}${DEPMOD}" ]; then
chroot "${NEWROOT}" /sbin/depmod -a
fi

-if [ -e "${NEWROOT}"/lib/modules/"${KVERSION}"/sysctl.conf -a ! -e "${NEWROOT}"/boot/sysctl.conf-"${KVERSION}" ]; then
- ln -s /lib/modules/"${KVERSION}"/sysctl.conf" "${NEWROOT}"/boot/sysctl.conf-"${KVERSION}"
+if [ -e "${NEWROOT}"/lib/modules/"${KVERSION}"/sysctl.conf ] && [ ! -e "${NEWROOT}"/boot/sysctl.conf-"${KVERSION}" ]; then
+ ln -s /lib/modules/"${KVERSION}"/sysctl.conf "${NEWROOT}"/boot/sysctl.conf-"${KVERSION}"
fi

exit 0
2 changes: 2 additions & 0 deletions components/provisioning/warewulf-provision/SPECS/warewulf-provision.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ Patch4: warewulf-provision.sle_tftpboot.patch
Patch5: warewulf-provision.wwgetfiles.patch
Patch6: warewulf-provision.update_ipxe_to_09e8a15.patch
Patch7: warewulf-provision.zstd.patch
Patch8: https://github.com/warewulf/warewulf3/commit/ecb8ece02892caf2cbd3b8d74a1f3e01052b9844.patch
adrianreber marked this conversation as resolved.
Show resolved Hide resolved
Group: %{PROJ_NAME}/provisioning
ExclusiveOS: linux
Requires: warewulf-common%{PROJ_DELIM}
Expand Down Expand Up @@ -131,6 +132,7 @@ cd %{_builddir}
%patch6 -p1
%define _default_patch_fuzz 3
%patch7 -p2
%patch8 -p2
%{__rm} -f 3rd_party/GPL/ipxe-2265a65.tar.xz
%{__cp} %SOURCE1 3rd_party/GPL/

Expand Down