diff options
| author | Bob Gilligan <gilligan@vyatta.com> | 2009-06-17 15:54:59 -0700 |
|---|---|---|
| committer | Bob Gilligan <gilligan@vyatta.com> | 2009-06-17 15:54:59 -0700 |
| commit | 08d0d9ed2d8824a446bfe6a1ba660db854f1a8f5 (patch) | |
| tree | 44ae06b1c3821a84e6aa0c4b26672240d07b47ff /sysconf | |
| parent | ebb0524cc5eb8732d12c1dfcac612fd567c15144 (diff) | |
| download | vyatta-cfg-system-08d0d9ed2d8824a446bfe6a1ba660db854f1a8f5.tar.gz vyatta-cfg-system-08d0d9ed2d8824a446bfe6a1ba660db854f1a8f5.zip | |
Bugfix 4592: Generate NTP config file from Vyatta configuration parameters.
This fix changes the way that the /etc/ntp.conf file is generated. Now
it is generated at boot time using a fixed section that contains
only parameters that users don't change, plus a section that is generated
from any "system ntp-servers" parameters that are configured. The fixed
section does not contain any "server" definitions, so all server definitions
come from the Vyatta config.
The Vyatta configuration template for this parameter and code
at other places in the system will now start the NTP server ONLY if
there is at least one NTP server configured. So the user can "turn off"
the NTP server by just deleting all NTP servers from the configuration.
The default "config.boot" file does contiain one built-in "system ntp-servers"
parameter, so a newly installed system will start the NTP server.
Diffstat (limited to 'sysconf')
| -rw-r--r-- | sysconf/ntp.conf | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/sysconf/ntp.conf b/sysconf/ntp.conf index 2bd9a711..248cdc2d 100644 --- a/sysconf/ntp.conf +++ b/sysconf/ntp.conf @@ -1,5 +1,12 @@ # /etc/ntp.conf, configuration for ntpd; see ntp.conf(5) for help +# This configuration file is automatically generated by the Vyatta +# configuration subsystem. Please do not manually edit it. +# +# The first section of this file consists of static parameters +# that can not be changed via the Vyatta configuration subsystem. +# + driftfile /var/lib/ntp/ntp.drift # By default, exchange time with everybody, but don't allow configuration. @@ -10,5 +17,8 @@ restrict -6 default kod notrap nomodify nopeer noquery restrict 127.0.0.1 restrict ::1 -# You do need to talk to an NTP server or two (or three). -server 0.vyatta.pool.ntp.org iburst +# +# The remainder of this file is for parameters that are set up via +# the Vyatta configuration subsystem. +# + |