diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2009-05-30 18:17:17 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2009-05-30 18:17:17 +0000 |
| commit | 1e8d004fadf3491905a2f257c50f8a1ff3aea94d (patch) | |
| tree | a12e554d2985d238024ee6a9c324681bc87c4dde | |
| parent | 2f338589fae7dc75e17662234b825f5ccc4fa532 (diff) | |
The TZ question can be asked at 3 different places. In the "media which
lacks the names but we have net" case, we end up with installed sets.
Remove the code which guesses the TZ from the sets just installed. We
now default to GMT, unless the ftplist.cgi made a better guess.
| -rw-r--r-- | distrib/miniroot/install.sub | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub index 6a634d4cd52..4cb9fff17e5 100644 --- a/distrib/miniroot/install.sub +++ b/distrib/miniroot/install.sub @@ -1,4 +1,4 @@ -# $OpenBSD: install.sub,v 1.557 2009/05/29 00:46:41 deraadt Exp $ +# $OpenBSD: install.sub,v 1.558 2009/05/30 18:17:16 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 @@ -1358,11 +1358,6 @@ set_timezone() { # If configured in a previous call, return immediately [[ -n $TZ ]] && return - if [[ -L /mnt/etc/localtime ]]; then - TZ=$(ls -l /mnt/etc/localtime 2>/dev/null) - TZ=${TZ#*${_zoneroot#/mnt}} - fi - waitftplist if [[ -s $SERVERLISTALL ]]; then _tz=$(sed -ne '/^TZ=/s/TZ=//p' <$SERVERLISTALL) |