From owner-svn-src-user@FreeBSD.ORG Sun Nov 17 21:31:12 2013 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C9489960; Sun, 17 Nov 2013 21:31:12 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 9F8C625B9; Sun, 17 Nov 2013 21:31:12 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAHLVCc7073600; Sun, 17 Nov 2013 21:31:12 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAHLVC7Q073598; Sun, 17 Nov 2013 21:31:12 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <201311172131.rAHLVC7Q073598@svn.freebsd.org> From: Nathan Whitehorn Date: Sun, 17 Nov 2013 21:31:12 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r258277 - in user/nwhitehorn/condorports/altjailscripts: . unionfs X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 Nov 2013 21:31:12 -0000 Author: nwhitehorn Date: Sun Nov 17 21:31:11 2013 New Revision: 258277 URL: http://svnweb.freebsd.org/changeset/base/258277 Log: Alternative approaches to making build jails. This one goes in the attic because the in-kernel unionfs is a crashfest. Added: user/nwhitehorn/condorports/altjailscripts/ user/nwhitehorn/condorports/altjailscripts/unionfs/ user/nwhitehorn/condorports/altjailscripts/unionfs/prepbuildjail - copied, changed from r258276, user/nwhitehorn/condorports/prepbuildjail user/nwhitehorn/condorports/altjailscripts/unionfs/reapbuildjail - copied unchanged from r258276, user/nwhitehorn/condorports/reapbuildjail Copied and modified: user/nwhitehorn/condorports/altjailscripts/unionfs/prepbuildjail (from r258276, user/nwhitehorn/condorports/prepbuildjail) ============================================================================== --- user/nwhitehorn/condorports/prepbuildjail Sun Nov 17 20:58:31 2013 (r258276, copy source) +++ user/nwhitehorn/condorports/altjailscripts/unionfs/prepbuildjail Sun Nov 17 21:31:11 2013 (r258277) @@ -8,7 +8,7 @@ case $slot in *[^a-zA-Z0-9]* ) echo "Non-alphanumeric slot $slot"; exit 1 esac case $release in - *[^a-zA-Z0-9]* ) echo "Non-alphanumeric release $release"; exit 1 + *[^a-zA-Z0-9/-]* ) echo "Non-alphanumeric release $release"; exit 1 esac case $ports in *[^a-zA-Z0-9/-]* ) echo "Non-alphanumeric ports $ports"; exit 1 Copied: user/nwhitehorn/condorports/altjailscripts/unionfs/reapbuildjail (from r258276, user/nwhitehorn/condorports/reapbuildjail) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/nwhitehorn/condorports/altjailscripts/unionfs/reapbuildjail Sun Nov 17 21:31:11 2013 (r258277, copy of r258276, user/nwhitehorn/condorports/reapbuildjail) @@ -0,0 +1,26 @@ +#!/bin/sh +slot=$1 + +#Audit slot and release names +case $slot in + *[^a-zA-Z0-9]* ) echo "Non-alphanumeric slot $slot"; exit 1 +esac +if [ -z "$slot" ]; then + echo "Zero-length slot or release" + exit 1 +fi + +if [ ! -d /scratch/$slot ]; then + echo "No file system for slot!" + exit 1 +fi + +set +e +set -o noclobber +echo > /scratch/$slot.lock +jail -f /scratch/$slot.conf -r $slot +chflags -R noschg /scratch/$slot +rm -rf /scratch/$slot /scratch/$slot.conf /scratch/$slot.fstab +set +e +rm /scratch/$slot.lock +