diff options
| author | cjep <cjep@pkgsrc.org> | 2002-12-31 13:41:16 +0000 |
|---|---|---|
| committer | cjep <cjep@pkgsrc.org> | 2002-12-31 13:41:16 +0000 |
| commit | bdb055678869dc2d4f285969e3a8d54050a35d65 (patch) | |
| tree | 7de63a266a8c8aa3998f9963149a3bad65c348eb /mk/bulk | |
| parent | 7eabc6f49d8d018d8da144079527b8ed899bd100 (diff) | |
| download | pkgsrc-bdb055678869dc2d4f285969e3a8d54050a35d65.tar.gz | |
Introduce idprog so that Solaris survives the root test.
Diffstat (limited to 'mk/bulk')
| -rwxr-xr-x | mk/bulk/mksandbox | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/mk/bulk/mksandbox b/mk/bulk/mksandbox index ce6a401c859..a199efbbcc6 100755 --- a/mk/bulk/mksandbox +++ b/mk/bulk/mksandbox @@ -1,6 +1,6 @@ #! /bin/sh -# $NetBSD: mksandbox,v 1.12 2002/12/03 18:49:39 agc Exp $ +# $NetBSD: mksandbox,v 1.13 2002/12/31 13:41:16 cjep Exp $ # # # Copyright (c) 2002 Alistair G. Crooks. All rights reserved. @@ -50,6 +50,7 @@ Darwin) chownprog=/usr/sbin/chown cpprog=/bin/cp gtarprog=/usr/bin/gnutar + idprog=/usr/bin/id mkdirprog="/bin/mkdir -p" mountprog=/sbin/mount paxprog=/bin/pax @@ -61,6 +62,7 @@ Linux) chownprog=/bin/chown cpprog=/bin/cp gtarprog=/bin/tar + idprog=/usr/bin/id mkdirprog="/bin/mkdir -p" mountprog=/sbin/mount paxprog="" @@ -72,6 +74,7 @@ NetBSD) chownprog=/usr/sbin/chown cpprog=/bin/cp gtarprog=/usr/bin/tar + idprog=/usr/bin/id mkdirprog="/bin/mkdir -p" mountprog=/sbin/mount paxprog=/bin/pax @@ -83,6 +86,7 @@ SunOS) chownprog=/usr/bin/chown cpprog=/usr/bin/cp gtarprog="" + idprog=/usr/xpg4/bin/id mkdirprog="/usr/bin/mkdir -p" mountprog=/sbin/mount paxprog=/bin/pax @@ -95,6 +99,7 @@ SunOS) chownprog=chown cpprog=cp gtarprog="tar" + idprog="id" mkdirprog="mkdir -p" mountprog=mount paxprog=pax @@ -117,7 +122,7 @@ if [ $# -ne 1 ]; then exit 1 fi -if [ `id -u` -ne 0 ]; then +if [ `$idprog -u` -ne 0 ]; then echo "You must be root to run this script" exit 1 fi |