diff --git a/components/provisioning/warewulf-provision/SOURCES/warewulf-provision.wwgetvnfs.patch b/components/provisioning/warewulf-provision/SOURCES/warewulf-provision.wwgetvnfs.patch new file mode 100644 index 0000000000..ee225bc53a --- /dev/null +++ b/components/provisioning/warewulf-provision/SOURCES/warewulf-provision.wwgetvnfs.patch @@ -0,0 +1,23 @@ +--- warewulf-provision-3.7/initramfs/capabilities/transport-http/wwgetvnfs 2017-02-22 09:32:02.000000000 -0800 ++++ warewulf-provision-3.7.patch/initramfs/capabilities/transport-http/wwgetvnfs 2017-02-25 11:03:08.000000000 -0800 +@@ -27,12 +27,19 @@ + fi + + gunzip < /tmp/vnfs-download | bsdtar -pxf - & ++ WAIT_PID=$! ++ + #gunzip < /tmp/vnfs-download | tar -xf - & + + wget -O /tmp/vnfs-download http://$master/WW/vnfs?hwaddr=$WWINIT_HWADDR 2>&1 + WGETEXIT=$? + +- wait ++ if [ $WGETEXIT -ne 0 ];then ++ kill -9 $WAIT_PID ++ continue ++ fi ++ ++ wait $WAIT_PID + if [ -f "$NEWROOT/sbin/init" ]; then + echo + exit 0 diff --git a/components/provisioning/warewulf-provision/SPECS/warewulf-provision.spec b/components/provisioning/warewulf-provision/SPECS/warewulf-provision.spec index 3a5d13eac6..6d094f1670 100644 --- a/components/provisioning/warewulf-provision/SPECS/warewulf-provision.spec +++ b/components/provisioning/warewulf-provision/SPECS/warewulf-provision.spec @@ -40,6 +40,7 @@ BuildRoot: %{?_tmppath}%{!?_tmppath:/var/tmp}/%{pname}-%{version}-%{release}-roo DocDir: %{OHPC_PUB}/doc/contrib Patch1: warewulf-provision.httpdconfdir.patch Patch2: warewulf-provision.sles_stateful.patch +Patch3: warewulf-provision.wwgetvnfs.patch %description Warewulf >= 3 is a set of utilities designed to better enable @@ -107,6 +108,7 @@ cd %{dname} ./autogen.sh %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build cd %{dname}