diff options
| author | jlam <jlam> | 2008-02-26 05:06:32 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2008-02-26 05:06:32 +0000 |
| commit | 6ddee73a08cb4a5224fedf4f5f25c32aef58b4ae (patch) | |
| tree | 4ab74d5821b7fbda8c8ddcf4a9a002d85dbf811c /mk/bulk | |
| parent | ece6b799685df5e2544f150665946af4e8a8e52a (diff) | |
| download | pkgsrc-6ddee73a08cb4a5224fedf4f5f25c32aef58b4ae.tar.gz | |
Add a --without-x flag to the mksandbox script.
Diffstat (limited to 'mk/bulk')
| -rwxr-xr-x | mk/bulk/mksandbox | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/mk/bulk/mksandbox b/mk/bulk/mksandbox index 45ea3966b61..ac463a731d4 100755 --- a/mk/bulk/mksandbox +++ b/mk/bulk/mksandbox @@ -1,6 +1,6 @@ #! /bin/sh -# $NetBSD: mksandbox,v 1.47 2008/01/04 15:49:07 rillig Exp $ +# $NetBSD: mksandbox,v 1.48 2008/02/26 05:06:32 jlam Exp $ # # # Copyright (c) 2002 Alistair G. Crooks. All rights reserved. @@ -34,7 +34,7 @@ # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -# Usage: mksandbox [--pkgsrc=dir] [--src=srcdir] [--xsrc=xsrcdir] [--verbose] sandbox-dir +# Usage: mksandbox [--pkgsrc=dir] [--src=srcdir] [--xsrc=xsrcdir] [--without-x] [--verbose] sandbox-dir # # A small shell script to set up a sandbox (usually for a pkgsrc bulk # build), using null mounts. @@ -42,6 +42,7 @@ pkgsrc=/usr/pkgsrc src=/usr/src xsrc=/usr/xsrc +with_x=yes kernel="" sandboxMountDirs="/bin /sbin /lib /libexec /usr/X11R6 /usr/bin /usr/games /usr/include /usr/lib /usr/libdata /usr/libexec /usr/lkm /usr/share /usr/sbin /var/mail" @@ -50,7 +51,7 @@ sandboxEmptyFiles="/var/run/utmp /var/run/utmpx /var/log/wtmp /var/log/wtmpx /va usage() { - echo "Usage: mksandbox [--pkgsrc=dir] [--src=srcdir] [--xsrc=xsrcdir] [--verbose] sandbox-dir" + echo "Usage: mksandbox [--pkgsrc=dir] [--src=srcdir] [--xsrc=xsrcdir] [--without-x] [--verbose] sandbox-dir" exit 1 } @@ -154,6 +155,7 @@ while [ $# -gt 0 ]; do --pkgsrc=*) pkgsrc=`echo $1 | $sedprog -e 's|^--pkgsrc=||'` ;; --src=*) src=`echo $1 | $sedprog -e 's|^--src=||'` ;; --xsrc=*) xsrc=`echo $1 | $sedprog -e 's|^--xsrc=||'` ;; + --without-x) with_x=no ;; --verbose) set -x ;; -*) usage ;; *) break ;; @@ -165,6 +167,10 @@ if [ $# -ne 1 ]; then usage fi +if [ "$with_x" = "no"; then + need_xsrc=no +fi + if [ `$idprog -u` -ne 0 ]; then err "You must be root to run this script." fi |