summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2009-05-05 21:26:10 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2009-05-05 21:26:10 +0000
commit5d2f74cc38c217e87db8f031adc363d6121d8629 (patch)
tree01c6c2b2b7da476d90f45f2b5a2477c25fc66e52
parent548d4aa059eab9d12f0f328a316d5d1540151abc (diff)
accept TZ hints from the ftplist
-rw-r--r--distrib/miniroot/install.sub8
1 files changed, 7 insertions, 1 deletions
diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub
index 9249582e884..d6597cc032e 100644
--- a/distrib/miniroot/install.sub
+++ b/distrib/miniroot/install.sub
@@ -1,4 +1,4 @@
-# $OpenBSD: install.sub,v 1.529 2009/05/05 21:23:58 deraadt Exp $
+# $OpenBSD: install.sub,v 1.530 2009/05/05 21:26:09 deraadt Exp $
# $NetBSD: install.sub,v 1.5.2.8 1996/09/02 23:25:02 pk Exp $
#
# Copyright (c) 1997-2009 Todd Miller, Theo de Raadt, Ken Westerback
@@ -1383,6 +1383,12 @@ set_timezone() {
TZ=${TZ#*${_zoneroot#/mnt}}
fi
+ waitftplist
+ if [[ -s $SERVERLISTALL ]]; then
+ _tz=$(sed -ne '/^TZ=/s/TZ=//p' <$SERVERLISTALL)
+ [[ -n $_tz ]] && TZ=$_tz
+ fi
+
: ${TZ:=GMT}
while :; do