diff options
| author | Jason Dixon <jdixon@cvs.openbsd.org> | 2008-07-07 15:53:16 +0000 |
|---|---|---|
| committer | Jason Dixon <jdixon@cvs.openbsd.org> | 2008-07-07 15:53:16 +0000 |
| commit | c876820f6edb4eb03f734d949aad2f9c88e2c318 (patch) | |
| tree | 73b8fe2d17f3b7136afc3d6ed29effaf1ba9eecc /distrib | |
| parent | 6e50ae7a4e877fe7e5f98f2da779e291c0e9a628 (diff) | |
Rework the ntpd question to default to no, and ask for the NTP server only if user chooses yes. Easier than the 3-part question and requires far fewer keystrokes to enable the 'default'.
ok krw@
Diffstat (limited to 'distrib')
| -rw-r--r-- | distrib/miniroot/install.sub | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub index 62c329fb3b2..4c5bc8393df 100644 --- a/distrib/miniroot/install.sub +++ b/distrib/miniroot/install.sub @@ -1,4 +1,4 @@ -# $OpenBSD: install.sub,v 1.435 2008/07/06 14:31:19 krw Exp $ +# $OpenBSD: install.sub,v 1.436 2008/07/07 15:53:15 jdixon Exp $ # $NetBSD: install.sub,v 1.5.2.8 1996/09/02 23:25:02 pk Exp $ # # Copyright (c) 1997-2007 Todd Miller, Theo de Raadt, Ken Westerback @@ -1530,10 +1530,11 @@ questions() { >>/mnt/etc/rc.conf.local fi - ask "NTP server? (host, 'none' or 'default')" default - if [[ $resp != none ]]; then + ask_yn "Start ntpd(8) by default?" no + if [[ $resp == y ]]; then echo "ntpd_flags= # enabled during install" \ >>/mnt/etc/rc.conf.local + ask "NTP server? (hostname or 'default')" default if [[ $resp != default ]]; then # Comment out the default 'servers' line, and add a # 'server' line with the first token in $resp as the |