summaryrefslogtreecommitdiffstats
path: root/release
diff options
context:
space:
mode:
authormatusita <matusita@FreeBSD.org>2002-06-19 15:06:38 +0000
committermatusita <matusita@FreeBSD.org>2002-06-19 15:06:38 +0000
commitb8430132a85fde394ea3dae8a0a44ed6f43623a5 (patch)
treeeab6d6056f6d831c2aa2b8860ba80ea2753eb2ca /release
parent71120b685ab868328a4ca521ddb6f08f51b6c44e (diff)
downloadFreeBSD-src-b8430132a85fde394ea3dae8a0a44ed6f43623a5.zip
FreeBSD-src-b8430132a85fde394ea3dae8a0a44ed6f43623a5.tar.gz
Set PATH statically, and use 'env -i' to kick chroot(8). As a result,
the second buildworld environment is fully isolated from parent's environment variables. Tested virtually on: snapshots.jp.FreeBSD.org Approved by: arch@ (silently) MFC after: 2 weeks
Diffstat (limited to 'release')
-rw-r--r--release/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/release/Makefile b/release/Makefile
index ba0eb39..530c3a3 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -392,7 +392,7 @@ rerelease release:
.endif
# Don't remove this, or the build will fall over!
echo "export RELEASEDIR=${_R}" >> ${CHROOTDIR}/mk
- echo "export PATH=$${PATH}:${LOCALDIR}" >> ${CHROOTDIR}/mk
+ echo "export PATH=/bin:/usr/bin:/sbin:/usr/sbin:${LOCALDIR}" >> ${CHROOTDIR}/mk
echo "export TMPDIR=/tmp" >> ${CHROOTDIR}/mk
echo "export MAKEOBJDIRPREFIX=/usr/obj" >> ${CHROOTDIR}/mk
echo "export MANBUILDCAT=YES" >> ${CHROOTDIR}/mk
@@ -406,7 +406,7 @@ rerelease release:
echo "make \$${_RELTARGET}" >> ${CHROOTDIR}/mk
echo "echo \">>> make ${.TARGET} for ${TARGET} finished on \`LC_ALL=C TZ=GMT date\`\"" >> ${CHROOTDIR}/mk
chmod 755 ${CHROOTDIR}/mk
- chroot ${CHROOTDIR} /mk
+ env -i /usr/sbin/chroot ${CHROOTDIR} /mk
clean:
rm -rf boot_crunch release.[0-9]
OpenPOWER on IntegriCloud