From fc734a42e6a29774e47f74445e0ebc3cf376efc2 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <stephen.hemminger@vyatta.com>
Date: Mon, 18 May 2009 15:32:58 -0700
Subject: Avoid restarting NTP server if not needed

On boot if ntp.conf contains proper server, there is no need
to restart ntpd.
---
 templates/system/ntp-server/node.def | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

(limited to 'templates/system/ntp-server')

diff --git a/templates/system/ntp-server/node.def b/templates/system/ntp-server/node.def
index 31840936..21961951 100644
--- a/templates/system/ntp-server/node.def
+++ b/templates/system/ntp-server/node.def
@@ -1,15 +1,11 @@
 multi:
 type: txt
 help: Set name or IP address of Network Time Protocol (NTP) server
-update:sudo sh -c \
-  "if ! grep -q 'server.*$VAR(@)' /etc/ntp.conf; then
-     echo \"server $VAR(@) iburst\" >> /etc/ntp.conf
-   fi
-   if [ $(pgrep -c ntpd) -eq 0 ]; then
-     /usr/sbin/invoke-rc.d ntp start
-   else
-     /usr/sbin/invoke-rc.d ntp restart
-   fi"
+update: if ! grep -q '^server. *$VAR(@)\$' /etc/ntp.conf
+       then sudo sh -c \
+	  "echo \"server $VAR(@) iburst\" >> /etc/ntp.conf;
+           /usr/sbin/invoke-rc.d ntp restart"
+       fi
 delete:sudo sh -c \
   "touch /etc/ntp.conf
    if grep -q 'server.*$VAR(@)' /etc/ntp.conf; then
-- 
cgit v1.2.3