r1984 - Minor tweaks ...

[com...@warewulf.lbl.gov]

Author: jms
Date: 2016-04-14 18:07:05 -0700 (Thu, 14 Apr 2016)
New Revision: 1984

Modified:
trunk/provision/initramfs/capabilities/provision-vnfs/60-runtimesupport
trunk/provision/initramfs/capabilities/transport-http/wwgetfiles
Log:
Minor tweaks ...


Modified: trunk/provision/initramfs/capabilities/provision-vnfs/60-runtimesupport
===================================================================
--- trunk/provision/initramfs/capabilities/provision-vnfs/60-runtimesupport 2016-04-13 18:39:15 UTC (rev 1983)
+++ trunk/provision/initramfs/capabilities/provision-vnfs/60-runtimesupport 2016-04-15 01:07:05 UTC (rev 1984)
@@ -64,6 +64,6 @@
echo "WWFQDN=$WWFQDN" >> $NEWROOT/warewulf/config
echo "export WWFQDN" >> $NEWROOT/warewulf/config

- echo "0,5,10,15,20,25,30,35,40,45,50,55 * * * * root export WWGETFILES_INTERVAL=180; /warewulf/bin/wwgetfiles >/var/log/warewulf/wwgetfiles.log 2>&1" > $NEWROOT/etc/cron.d/wwupdatefiles
+ echo "0,5,10,15,20,25,30,35,40,45,50,55 * * * * root WWGETFILES_INTERVAL=180 /warewulf/bin/wwgetfiles >/var/log/warewulf/wwgetfiles.log 2>&1" > $NEWROOT/etc/cron.d/wwupdatefiles
echo "0,5,10,15,20,25,30,35,40,45,50,55 * * * * root . /warewulf/config; /warewulf/bin/wwgetscript runtime 2>/var/log/warewulf/wwgetfiles.log | /bin/sh" > $NEWROOT/etc/cron.d/wwrunscript
fi

Modified: trunk/provision/initramfs/capabilities/transport-http/wwgetfiles
===================================================================
--- trunk/provision/initramfs/capabilities/transport-http/wwgetfiles 2016-04-13 18:39:15 UTC (rev 1983)
+++ trunk/provision/initramfs/capabilities/transport-http/wwgetfiles 2016-04-15 01:07:05 UTC (rev 1984)
@@ -29,6 +29,8 @@
exit
fi

+WWGETFILES_INTERVAL=${WWGETFILES_INTERVAL:-180}
+
if [ -n "$WWGETFILES_INTERVAL" -a $WWGETFILES_INTERVAL -gt 0 ];then
if [ -n "$RANDOM" -a ! -f "/init" ]; then
SLEEPTIME=`expr $RANDOM % $WWGETFILES_INTERVAL`