summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBob Gilligan <gilligan@vyatta.com>2009-06-17 15:54:59 -0700
committerAn-Cheng Huang <ancheng@vyatta.com>2009-07-17 14:56:04 -0700
commitb9c4028829be7cee545e1eb4321d74846904d558 (patch)
tree061df15f4a7e4ca7844912e0a4eab4cf31203ae8
parent5ec82316b089d0be4f544937fbd3ed5d3333c829 (diff)
downloadvyatta-cfg-quagga-b9c4028829be7cee545e1eb4321d74846904d558.tar.gz
vyatta-cfg-quagga-b9c4028829be7cee545e1eb4321d74846904d558.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. (cherry picked from commit 08d0d9ed2d8824a446bfe6a1ba660db854f1a8f5)
-rw-r--r--debian/vyatta-cfg-system.postinst.in3
1 files changed, 0 insertions, 3 deletions
diff --git a/debian/vyatta-cfg-system.postinst.in b/debian/vyatta-cfg-system.postinst.in
index 38d276ec..38757106 100644
--- a/debian/vyatta-cfg-system.postinst.in
+++ b/debian/vyatta-cfg-system.postinst.in
@@ -107,9 +107,6 @@ EOF
fi
done
- # replace debian /etc/ntp.conf with Vyatta version
- cp $sysconfdir/ntp.conf /etc/ntp.conf
-
# purge off ancient devfs stuff from /etc/securetty
cp $sysconfdir/securetty /etc/securetty
fi