From 6f8e87ec63dcf5d79f4f9b46fcb193d71f791867 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <stephen.hemminger@vyatta.com>
Date: Fri, 22 May 2009 14:35:25 -0700
Subject: Fix ntp.conf management

Had incorrect grep expressions, and don't need to use sudo
unless changing values.
---
 templates/system/ntp-server/node.def | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

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

diff --git a/templates/system/ntp-server/node.def b/templates/system/ntp-server/node.def
index 21961951..f1318b28 100644
--- a/templates/system/ntp-server/node.def
+++ b/templates/system/ntp-server/node.def
@@ -1,18 +1,15 @@
 multi:
 type: txt
 help: Set name or IP address of Network Time Protocol (NTP) server
-update: if ! grep -q '^server. *$VAR(@)\$' /etc/ntp.conf
+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
-     sed -i '/server $VAR(@)/d' /etc/ntp.conf
-     if grep -q '^server ' /etc/ntp.conf; then
-       /usr/sbin/invoke-rc.d ntp restart
-     else
-       /usr/sbin/invoke-rc.d ntp stop
-     fi
-   fi"
+delete: if grep -q '^server.*$VAR(@) ' /etc/ntp.conf
+	then sudo sed -i '/^server $VAR(@) /d' /etc/ntp.conf
+	     if grep -q '^server ' /etc/ntp.conf
+             then sudo /usr/sbin/invoke-rc.d ntp restart
+	     else sudo /usr/sbin/invoke-rc.d ntp stop
+             fi
+	fi
-- 
cgit v1.2.3