diff options
| author | Robert Peichaer <rpe@cvs.openbsd.org> | 2014-07-13 13:53:37 +0000 |
|---|---|---|
| committer | Robert Peichaer <rpe@cvs.openbsd.org> | 2014-07-13 13:53:37 +0000 |
| commit | e042fabf4db90338845231cd91832e32c051ff72 (patch) | |
| tree | d244360e80668e3d65307eed3aec2dfdbfeff872 /distrib/miniroot | |
| parent | 2ffae24f2625bff75ab5151197c7dcabd5c772a0 (diff) | |
- move the ntpd.conf file to examples directory
- move it from BIN1 to EXAMPLES in src/etc/Makefile
- change the installer to create the file instead of editing it
- add a '+' to the corresponding changelist entry
suggested by and OK deraadt@
OK for the installer change krw@
Diffstat (limited to 'distrib/miniroot')
| -rw-r--r-- | distrib/miniroot/install.sub | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub index c90664631ab..27935f14da1 100644 --- a/distrib/miniroot/install.sub +++ b/distrib/miniroot/install.sub @@ -1,4 +1,4 @@ -# $OpenBSD: install.sub,v 1.778 2014/07/12 15:27:15 rpe Exp $ +# $OpenBSD: install.sub,v 1.779 2014/07/13 13:53:36 rpe Exp $ # # Copyright (c) 1997-2009 Todd Miller, Theo de Raadt, Ken Westerback # All rights reserved. @@ -1809,16 +1809,9 @@ apply() if [[ $ntpd == y ]]; then echo "ntpd_flags= # enabled during install" \ >>/mnt/etc/rc.conf.local - if [[ $ntpd_server != default ]]; then - # Comment out the default 'servers' line, and add a - # 'servers' line with the first token in $resp as the - # server. - set -- $ntpd_server - sed "s/^servers /#&/;/#server /a\\ -servers $1 -" /mnt/etc/ntpd.conf >/tmp/ntpd.conf - cp /tmp/ntpd.conf /mnt/etc/ntpd.conf - fi + [[ $ntpd_server == default ]] && ntpd_server=pool.ntp.org + echo "# created during install\nservers ${ntpd_server%% *}" \ + >/mnt/etc/ntpd.conf fi if [[ $x11 == y ]]; then |