diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2009-04-28 21:41:04 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2009-04-28 21:41:04 +0000 |
| commit | 00112fd5b5ae10b870735bf023f68c329584a43f (patch) | |
| tree | 6f80c5ec1ad735b90ebeede515dd6c017e4b41f5 /distrib/miniroot | |
| parent | a62d43ce486c0fe095c47b74517cecd81866a416 (diff) | |
We have no choice but to ask for the timezone information later, so
all the other questions have been congregating down towards the end.
Might as well ask for the root password down there, too.
Diffstat (limited to 'distrib/miniroot')
| -rw-r--r-- | distrib/miniroot/install.sh | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/distrib/miniroot/install.sh b/distrib/miniroot/install.sh index f6675e51b20..b4ce5c4a713 100644 --- a/distrib/miniroot/install.sh +++ b/distrib/miniroot/install.sh @@ -1,5 +1,5 @@ #!/bin/ksh -# $OpenBSD: install.sh,v 1.172 2009/04/25 03:47:35 deraadt Exp $ +# $OpenBSD: install.sh,v 1.173 2009/04/28 21:41:03 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 @@ -330,9 +330,6 @@ THESETS="$THESETS site$VERSION-$(hostname -s).tgz" donetconfig -askpassword root -_rootpass="$_password" - install_sets # Remount all filesystems in /etc/fstab with the options from /etc/fstab, i.e. @@ -348,9 +345,11 @@ sed -e "/^console.*on.*secure.*$/s/std\.[0-9]*/std.$(stty speed)/" \ # Move ttys back in case questions() needs to massage it more. mv /tmp/ttys /mnt/etc/ttys -# Handle questions... questions +askpassword root +_rootpass="$_password" + user_setup set_timezone |