diff options
| author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2006-03-15 01:17:13 +0000 |
|---|---|---|
| committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2006-03-15 01:17:13 +0000 |
| commit | 73b405268693e9e060a1bf8ea91f4d6589fce1bd (patch) | |
| tree | fa35a882e52c19499d942d6267e13731567bc670 /distrib/miniroot/install.sub | |
| parent | 128b0884a31714d6befb4045e67de461681e1344 (diff) | |
Make 'no' the default answer to 'Display the list of XXX servers?'.
Suggested by otto@, various people chiming in to agree.
While here fix one ask_yn misuse and update copyright to 2006.
Diffstat (limited to 'distrib/miniroot/install.sub')
| -rw-r--r-- | distrib/miniroot/install.sub | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub index d8a90a9d865..378d27e9489 100644 --- a/distrib/miniroot/install.sub +++ b/distrib/miniroot/install.sub @@ -1,7 +1,7 @@ -# $OpenBSD: install.sub,v 1.402 2006/03/11 19:23:31 krw Exp $ +# $OpenBSD: install.sub,v 1.403 2006/03/15 01:17:12 krw Exp $ # $NetBSD: install.sub,v 1.5.2.8 1996/09/02 23:25:02 pk Exp $ # -# Copyright (c) 1997-2005 Todd Miller, Theo de Raadt, Ken Westerback +# Copyright (c) 1997-2006 Todd Miller, Theo de Raadt, Ken Westerback # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -1050,9 +1050,8 @@ install_url() { [[ $resp == none ]] || export ftp_proxy=$resp http_proxy=$resp rm -f $SERVERLIST - ask_yn "Display the list of known $_url_type servers?" "${_get_server_list:-yes}" - _get_server_list=$resp - if [[ $_get_server_list == y ]]; then + ask_yn "Display the list of known $_url_type servers?" + if [[ $resp == y ]]; then # ftp.openbsd.org == 129.128.5.191 and will remain at # that address for the forseeable future. echo -n "Getting the list from 129.128.5.191 (ftp.openbsd.org)..." @@ -1557,7 +1556,7 @@ questions() { >>/mnt/etc/rc.conf.local fi - ask_yn "Start ntpd(8) by default?" no + ask_yn "Start ntpd(8) by default?" if [[ $resp == y ]]; then echo "ntpd_flags= # enabled during install" \ >>/mnt/etc/rc.conf.local |