diff options
| author | agc <agc> | 2004-07-06 22:39:37 +0000 |
|---|---|---|
| committer | agc <agc> | 2004-07-06 22:39:37 +0000 |
| commit | c6fed8c29eb0d4c38e92b804e445ccec575d40b5 (patch) | |
| tree | fb0e063ec61ec8b83347ffe3ea5c87850eb6f9fb | |
| parent | 577b69ec67b02246a87e95e7372cf1a524931292 (diff) | |
| download | pkgsrc-c6fed8c29eb0d4c38e92b804e445ccec575d40b5.tar.gz | |
Pullup ticket 44 to the pkgsrc-2004Q2 branch, requested by Grant Beattie.
Module Name: pkgsrc
Committed By: grant
Date: Thu Jul 1 13:18:20 UTC 2004
Modified Files:
pkgsrc/mk/bulk: mksandbox
Log Message:
the timezone file on Solaris is /etc/TIMEZONE.
| -rw-r--r-- | doc/CHANGES-pkgsrc-2004Q2 | 3 | ||||
| -rwxr-xr-x | mk/bulk/mksandbox | 12 |
2 files changed, 12 insertions, 3 deletions
diff --git a/doc/CHANGES-pkgsrc-2004Q2 b/doc/CHANGES-pkgsrc-2004Q2 index 47870c08c77..1c0d7674f8a 100644 --- a/doc/CHANGES-pkgsrc-2004Q2 +++ b/doc/CHANGES-pkgsrc-2004Q2 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-pkgsrc-2004Q2,v 1.1.2.8 2004/07/06 22:36:56 agc Exp $ +$NetBSD: CHANGES-pkgsrc-2004Q2,v 1.1.2.9 2004/07/06 22:39:37 agc Exp $ Changes to the packages collection and infrastructure on the pkgsrc-2004Q2 branch: @@ -10,4 +10,5 @@ Pullup ticket 40, requested by Grant Beattie [agc 2004-07-06] Pullup ticket 41, requested by Matthias Drochner [agc 2004-07-06] Pullup ticket 42, requested by Dieter Baron [agc 2004-07-06] Pullup ticket 43, requested by Gavan Fantom [agc 2004-07-06] +Pullup ticket 44, requested by Grant Beattie [agc 2004-07-06] diff --git a/mk/bulk/mksandbox b/mk/bulk/mksandbox index 8d57d6ef1f3..e482611caad 100755 --- a/mk/bulk/mksandbox +++ b/mk/bulk/mksandbox @@ -1,6 +1,6 @@ #! /bin/sh -# $NetBSD: mksandbox,v 1.33 2004/06/06 01:33:17 grant Exp $ +# $NetBSD: mksandbox,v 1.33.2.1 2004/07/06 22:39:37 agc Exp $ # # # Copyright (c) 2002 Alistair G. Crooks. All rights reserved. @@ -220,7 +220,15 @@ case "$paxprog" in *) (cd /etc; $paxprog -rwpe . $sandbox/etc) ;; esac rm -f $sandbox/etc/localtime -$cpprog /usr/share/zoneinfo/GMT $sandbox/etc/localtime + +case "$opsys" in +SunOS) + $cpprog /etc/TIMEZONE $sandbox/etc/TIMEZONE + ;; +*) + $cpprog /usr/share/zoneinfo/GMT $sandbox/etc/localtime + ;; +esac echo "Make empty dirs upon which to mount the null mounts" for d in $sandboxMountDirs; do |