diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2015-05-18 13:48:39 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2015-05-18 13:48:39 +0000 |
| commit | 99ee9dfef2c862303a6cf4ccf7d32dd061c7db0e (patch) | |
| tree | cc91d93503d1eeac5c134e6f57f94d3ee371cb0c /distrib/miniroot/install.sub | |
| parent | 7adbbc5749cf91f7871775bbd84d919bb5f596c6 (diff) | |
enable ntpd by default at install time. We use pools and a reliable
constraint to keep them in check. in the worst case of being on a
dark net, nothing changes.
this is being enabled by default to allow gathering of more operational
information from users. and if the operational heuristics in ntpd can be
suitable refined, this may stay the default into the future. if not, ntpd
will become even more awesome along the way.
with reyk rpe
Diffstat (limited to 'distrib/miniroot/install.sub')
| -rw-r--r-- | distrib/miniroot/install.sub | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub index 9a0fde9c42c..4d3e770579b 100644 --- a/distrib/miniroot/install.sub +++ b/distrib/miniroot/install.sub @@ -1,4 +1,4 @@ -# $OpenBSD: install.sub,v 1.838 2015/05/15 07:41:30 rpe Exp $ +# $OpenBSD: install.sub,v 1.839 2015/05/18 13:48:37 deraadt Exp $ # # Copyright (c) 1997-2015 Todd Miller, Theo de Raadt, Ken Westerback # Copyright (c) 2015, Robert Peichaer <rpe@openbsd.org> @@ -1506,13 +1506,6 @@ questions() { ask_yn "Start sshd(8) by default?" yes sshd=$resp - ask_yn "Start ntpd(8) by default?" - ntpd=$resp - if [[ $resp == y ]]; then - ask "NTP server? (hostname or 'default')" default - ntpd_server=$resp - fi - aperture= resp= xdm= @@ -2044,12 +2037,6 @@ apply() { cp /tmp/sshd_config /mnt/etc/ssh/sshd_config fi - if [[ $ntpd == y ]]; then - echo "ntpd_flags=" >>/mnt/etc/rc.conf.local - [[ $ntpd_server == default ]] && ntpd_server=pool.ntp.org - echo "servers ${ntpd_server%% *}" >>/mnt/etc/ntpd.conf - fi - [[ -n $aperture ]] && echo "machdep.allowaperture=$aperture # See xf86(4)" \ >>/mnt/etc/sysctl.conf |