From cd2aa6ea239f866cfb828ee3c199a7b308cbe6e4 Mon Sep 17 00:00:00 2001
From: seb <seb>
Date: Mon, 12 Aug 2002 14:47:07 +0000
Subject: - Remove $sandbox/etc/localtime before copying
 /usr/share/zoneinfo/GMT over.   This prevent surprise when /etc/localtime
 -previously copied over in the   sandbox by pax/tar- is a symlink to
 /usr/share/zoneinfo/whatever. - Improve somewhat some messages. - Make sure
 $sandbox/$packages and $sandbox/$distfiles are created instead of   $packages
 and $distfiles.

---
 mk/bulk/mksandbox | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'mk')

diff --git a/mk/bulk/mksandbox b/mk/bulk/mksandbox
index af047466a9a..a45d938b6a5 100755
--- a/mk/bulk/mksandbox
+++ b/mk/bulk/mksandbox
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# $NetBSD: mksandbox,v 1.4 2002/08/12 10:12:09 agc Exp $
+# $NetBSD: mksandbox,v 1.5 2002/08/12 14:47:07 seb Exp $
 #
 #
 # Copyright (c) 2002 Alistair G. Crooks.  All rights reserved.
@@ -143,6 +143,7 @@ case "$paxprog" in
 "")	(cd /etc; $gtarprog -cf - . | (cd $sandbox/etc; $gtarprog xf - )) ;;
 *)	(cd /etc; $paxprog -rwpe . $sandbox/etc) ;;
 esac
+rm -f $sandbox/etc/localtime
 $cpprog /usr/share/zoneinfo/GMT $sandbox/etc/localtime
 
 echo "Make empty dirs upon which to mount the null mounts"
@@ -167,16 +168,16 @@ echo "Making /tmp in $sandbox"
 $mkdirprog $sandbox/tmp $sandbox/var/tmp
 $chmodprog 1777 $sandbox/tmp $sandbox/var/tmp
 
-echo "Mount /usr/src in $sandbox"
+echo "Mount $src from $sandbox"
 $mkdirprog $sandbox/usr/src
 $mountprog -r -t null $src $sandbox/usr/src
 
-echo "Mount /usr/pkgsrc in $sandbox"
+echo "Mount $pkgsrc from $sandbox"
 $mkdirprog $sandbox/usr/pkgsrc
 $mountprog -t null $pkgsrc $sandbox/usr/pkgsrc
 
 echo "Mounting $packages and $distfiles from $sandbox"
-$mkdirprog $packages $distfiles
+$mkdirprog $sandbox/$packages $sandbox/$distfiles
 $mountprog -t null $packages $sandbox/$packages
 $mountprog -t null $distfiles $sandbox/$distfiles
 
-- 
cgit v1.2.3