svn commit: r258279 - user/nwhitehorn/condorports

[Nathan Whitehorn]

Author: nwhitehorn
Date: Sun Nov 17 21:36:19 2013
New Revision: 258279
URL: http://svnweb.freebsd.org/changeset/base/258279

Log:
  Something that is not a crashfest: use tmpfs and tar. This imposes a
  two second per job penalty on my powermac G5. Larger penalties could
  be expected for slow storage. For platforms that support it, and where
  the repo is local, zfs clone could also work. We should really fix FUSE
  not to crash.

Modified:
  user/nwhitehorn/condorports/prepbuildjail
  user/nwhitehorn/condorports/reapbuildjail

Modified: user/nwhitehorn/condorports/prepbuildjail
==============================================================================
--- user/nwhitehorn/condorports/prepbuildjail	Sun Nov 17 21:33:32 2013	(r258278)
+++ user/nwhitehorn/condorports/prepbuildjail	Sun Nov 17 21:36:19 2013	(r258279)
@@ -47,20 +47,18 @@ $slot {
 	mount.fstab="/scratch/$slot.fstab";
 }
 EOF
-# TODO: Setting nosuid seems to break "below"
-echo "/scratch/$release /scratch/$slot unionfs below,noatime 0 0" > /scratch/$slot.fstab
+
+mkdir -p /scratch/$slot
+mount -t tmpfs tmpfs /scratch/$slot
+
+#cp -a /scratch/$release/ /scratch/$slot
+tar -C /scratch/$slot -xf /scratch/$release.tar
 if [ -n "$ports" ]; then
 	mkdir -p /scratch/$slot/$ports
 	echo "$ports /scratch/$slot/$ports nullfs ro 0 0" >> /scratch/$slot.fstab
 fi
 
-mkdir -p /scratch/$slot
-
 jail -f /scratch/$slot.conf -c $slot
-ls /scratch/$slot/dev > /dev/null # Hack around unionfs bugs
-if [ -n "$ports" ]; then
-	ls /scratch/$slot/$ports > /dev/null # And once more
-fi
 trap true EXIT
 rm /scratch/$slot.lock
 

Modified: user/nwhitehorn/condorports/reapbuildjail
==============================================================================
--- user/nwhitehorn/condorports/reapbuildjail	Sun Nov 17 21:33:32 2013	(r258278)
+++ user/nwhitehorn/condorports/reapbuildjail	Sun Nov 17 21:36:19 2013	(r258279)
@@ -19,7 +19,7 @@ set +e
 set -o noclobber
 echo > /scratch/$slot.lock
 jail -f /scratch/$slot.conf -r $slot
-chflags -R noschg /scratch/$slot
+umount -f /scratch/$slot || true
 rm -rf /scratch/$slot /scratch/$slot.conf /scratch/$slot.fstab
 set +e
 rm /scratch/$slot.lock