diff options
| author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2004-03-18 00:25:13 +0000 |
|---|---|---|
| committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2004-03-18 00:25:13 +0000 |
| commit | 5daa1b20fa79a11a509ea53dcaf81659ca3c55ce (patch) | |
| tree | 7cd4005b91a587647ab17883d2c856387bc0926e /distrib/miniroot | |
| parent | 4411e9d5cd4e15b97bd49a24a128ddad39a5d3df (diff) | |
Don't ask for timezone info during an upgrade.
Suggestion by Tom Cosgrove.
ok miod@ millert@ deraadt@.
Diffstat (limited to 'distrib/miniroot')
| -rw-r--r-- | distrib/miniroot/install.sh | 4 | ||||
| -rw-r--r-- | distrib/miniroot/install.sub | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/distrib/miniroot/install.sh b/distrib/miniroot/install.sh index fa70c36e403..ea3b8c488f8 100644 --- a/distrib/miniroot/install.sh +++ b/distrib/miniroot/install.sh @@ -1,5 +1,5 @@ #!/bin/sh -# $OpenBSD: install.sh,v 1.140 2003/12/04 18:43:38 deraadt Exp $ +# $OpenBSD: install.sh,v 1.141 2004/03/18 00:25:12 krw Exp $ # $NetBSD: install.sh,v 1.5.2.8 1996/08/27 18:15:05 gwr Exp $ # # Copyright (c) 1997-2002 Todd Miller, Theo de Raadt, Ken Westerback @@ -425,5 +425,7 @@ dd if=/mnt/dev/urandom of=host.random bs=1024 count=64 >/dev/null 2>&1 chmod 600 host.random >/dev/null 2>&1 ) echo "done." +set_timezone + # Perform final steps common to both an install and an upgrade. finish_up diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub index 314027fe0f2..fd47ce53c94 100644 --- a/distrib/miniroot/install.sub +++ b/distrib/miniroot/install.sub @@ -1,4 +1,4 @@ -# $OpenBSD: install.sub,v 1.335 2004/03/16 01:11:57 deraadt Exp $ +# $OpenBSD: install.sub,v 1.336 2004/03/18 00:25:12 krw Exp $ # $NetBSD: install.sub,v 1.5.2.8 1996/09/02 23:25:02 pk Exp $ # # Copyright (c) 1997-2003 Todd Miller, Theo de Raadt, Ken Westerback @@ -1643,8 +1643,6 @@ questions() { finish_up() { local _dev _mp _fstype _rest - set_timezone - # Mount all known swap partitions. This gives systems with little # memory a better chance at running 'MAKEDEV all'. if [[ -x /mnt/sbin/swapctl ]]; then |