From d597ec480f527ba8be1d78db350fa0916c7dfc23 Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Tue, 11 Jul 2023 07:05:47 +0000 Subject: [PATCH] warewulf-provision: apply fix from upstream Signed-off-by: Adrian Reber --- ...ece02892caf2cbd3b8d74a1f3e01052b9844.patch | 25 +++++++++++++++++++ .../SPECS/warewulf-provision.spec | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 components/provisioning/warewulf-provision/SOURCES/ecb8ece02892caf2cbd3b8d74a1f3e01052b9844.patch diff --git a/components/provisioning/warewulf-provision/SOURCES/ecb8ece02892caf2cbd3b8d74a1f3e01052b9844.patch b/components/provisioning/warewulf-provision/SOURCES/ecb8ece02892caf2cbd3b8d74a1f3e01052b9844.patch new file mode 100644 index 0000000000..d47bd1fe1a --- /dev/null +++ b/components/provisioning/warewulf-provision/SOURCES/ecb8ece02892caf2cbd3b8d74a1f3e01052b9844.patch @@ -0,0 +1,25 @@ +From ecb8ece02892caf2cbd3b8d74a1f3e01052b9844 Mon Sep 17 00:00:00 2001 +From: "Benjamin S. Allen" +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 diff --git a/components/provisioning/warewulf-provision/SPECS/warewulf-provision.spec b/components/provisioning/warewulf-provision/SPECS/warewulf-provision.spec index 678a3293c7..76947105b0 100644 --- a/components/provisioning/warewulf-provision/SPECS/warewulf-provision.spec +++ b/components/provisioning/warewulf-provision/SPECS/warewulf-provision.spec @@ -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 Group: %{PROJ_NAME}/provisioning ExclusiveOS: linux Requires: warewulf-common%{PROJ_DELIM} @@ -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/