diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2009-05-31 00:02:51 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2009-05-31 00:02:51 +0000 |
| commit | 5565c542a537d8f402f1d714442f51b0e3f0d8b1 (patch) | |
| tree | 87552c5dd204374853d25b7e643660ee46cb61cb /distrib/miniroot/install.sub | |
| parent | bae2dded735b4ca383485686ce4099f8484cf573 (diff) | |
Change the order of the installer questions again, because it is better.
hostname, network, root password, misc, timezone, and then the disks
and sets.
ok krw
Diffstat (limited to 'distrib/miniroot/install.sub')
| -rw-r--r-- | distrib/miniroot/install.sub | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub index 19a403bac02..362cc053cea 100644 --- a/distrib/miniroot/install.sub +++ b/distrib/miniroot/install.sub @@ -1,4 +1,4 @@ -# $OpenBSD: install.sub,v 1.560 2009/05/30 20:40:59 deraadt Exp $ +# $OpenBSD: install.sub,v 1.561 2009/05/31 00:02:50 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 @@ -1361,7 +1361,6 @@ set_timezone() { : ${TZ:=GMT} - echo while :; do _zonepath="" @@ -1864,6 +1863,14 @@ if [[ $MODE == install ]]; then [[ ${resp%%.*} != $(hostname -s) ]] && hostname $resp THESETS="$THESETS site$VERSION-$(hostname -s).tgz" + echo + donetconfig + + if [[ $nifs != 0 ]]; then + startftplist + fi + + echo while :; do askpassword root _rootpass="$_password" @@ -1874,14 +1881,8 @@ if [[ $MODE == install ]]; then questions user_setup + set_timezone /var/tzlist echo - donetconfig - - if [[ $nifs == 0 ]]; then - set_timezone /var/tzlist - else - startftplist - fi fi # Get ROOTDISK, ROOTDEV and SWAPDEV. |