- add some default configuration (commented out)

Changed files:
    ntp.conf -> 1.3
    ntp.init -> 1.6
    ntp.sysconfig -> 1.2

diff --git a/ntp.conf b/ntp.conf
index 0de1bf746435b592f4a5ede0c56208abd2d383c8..abc8e0f7871d4342e7f3571563facfe2cd8ad649 100644 (file)
--- a/ntp.conf
+++ b/ntp.conf
@@ -1,3 +1,8 @@
+#
+# Default ntp stratum 1 servers:
+#
+# server       ntp.nasa.gov
+# server       clock.isc.org
 
 #
 # Undisciplined Local Clock. This is a fake driver intended for backup

diff --git a/ntp.init b/ntp.init
index d53bf9410a7f4370cb54aeacafb6819b12af9872..9bdd17bb142fa900d9b12bfdff6076e19f6b0ac8 100644 (file)
--- a/ntp.init
+++ b/ntp.init
@@ -22,8 +22,10 @@ case "$1" in
   start)
        # Check if the service is already running?
         if [ ! -f /var/lock/subsys/ntp ]; then
-               # Adjust time to make life easy for ntp
-                       run_cmd "Syncing time for ntp" /usr/sbin/ntpdate -o 1 ntp.nasa.gov clock.isc.org
+               if is_yes "$SYNC_TIME"; then
+                       # Adjust time to make life easy for ntp
+                               run_cmd "Syncing time for ntp" /usr/sbin/ntpdate $NTPDATE_OPTIONS $NTPDATE_SERVERS
+               fi
                msg_starting ntp
                daemon ntpd -c /etc/ntp/ntp.conf
                RETVAL=$?

diff --git a/ntp.sysconfig b/ntp.sysconfig
index fb8d89a3d31a8067ca2efec413b5937ae272b325..e05a4f424987d75abff4911d2257952c757e7221 100644 (file)
--- a/ntp.sysconfig
+++ b/ntp.sysconfig
@@ -2,3 +2,8 @@
 
 # Define services nice level
 SERVICE_RUN_NICE_LEVEL="+1"
+
+# Sync time at startup
+SYNC_TIME=no
+NTPDATE_OPTIONS="-o 1"
+NTPDATE_SERVERS="ntp.nasa.gov clock.isc.org"