summaryrefslogtreecommitdiff
path: root/distrib/miniroot/install.sh
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2010-10-29 07:43:10 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2010-10-29 07:43:10 +0000
commite1a8343f1094c74486009b32841c431e5dbb158e (patch)
treeb697e6d682dc3a1bc6253bebb65a5d4a0dd9365e /distrib/miniroot/install.sh
parent01f215d5cceef17eb0201574a98c8f0e572d54d9 (diff)
for late TZ handling, place the temporarily tzlist file into /mnt/tmp
(which has already been mounted). discussed with halex
Diffstat (limited to 'distrib/miniroot/install.sh')
-rw-r--r--distrib/miniroot/install.sh7
1 files changed, 4 insertions, 3 deletions
diff --git a/distrib/miniroot/install.sh b/distrib/miniroot/install.sh
index d9b4b63a21a..5c930199f23 100644
--- a/distrib/miniroot/install.sh
+++ b/distrib/miniroot/install.sh
@@ -1,5 +1,5 @@
#!/bin/ksh
-# $OpenBSD: install.sh,v 1.208 2010/08/04 07:07:41 halex Exp $
+# $OpenBSD: install.sh,v 1.209 2010/10/29 07:43:09 deraadt Exp $
# $NetBSD: install.sh,v 1.5.2.8 1996/08/27 18:15:05 gwr Exp $
#
# Copyright (c) 1997-2009 Todd Miller, Theo de Raadt, Ken Westerback
@@ -197,9 +197,10 @@ install_sets
# using the timezone names extracted from the base set
if [[ -z $TZ ]]; then
( cd /mnt/usr/share/zoneinfo
- ls -1dF `tar cvf /dev/null [A-Za-y]*` >/tmp/tzlist )
+ ls -1dF `tar cvf /dev/null [A-Za-y]*` >/mnt/tmp/tzlist )
echo
- set_timezone /tmp/tzlist
+ set_timezone /mnt/tmp/tzlist
+ rm -f /mnt/tmp/tzlist
fi
# If we got a timestamp from the ftplist server, and that time diffs by more