X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=debian%2Fpostinst;h=62fb438913cbaecd4983dcb051f0606180b80149;hb=4a4dd3920272bdf26b6ced6a09c66032c6b4760c;hp=e0cc13c00e14f79cb931475a82e0226dad1b613b;hpb=7f61baf03be194bea86d0e01a2ecaedb08cfb13b;p=ntp-cn.git

diff --git a/debian/postinst b/debian/postinst
index e0cc13c..62fb438 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -12,11 +12,14 @@ konfiguriraj() {
     cp -p /etc/default/ntp-servers /etc/default/ntp-servers.dpkg-old
   fi
 
-  cp /usr/share/doc/ntp-cn/ntp.conf.tmpl /etc
+  cp /usr/share/doc/ntp-cn/ntp.conf.tmpl /etc/ntp.conf
 
-  cat > /etc/default/ntp-servers <<EOF
-NTPSERVERS="zg1.ntp.carnet.hr ri.ntp.carnet.hr zg2.ntp.carnet.hr 127.127.1.0"
-EOF
+  # Load CARNet Tools
+  . /usr/share/carnet-tools/functions.sh
+
+  cp_check_and_sed 'NTPSERVERS' \
+                   "s/^.*NTPSERVERS.*/NTPSERVERS=\"zg1.ntp.carnet.hr ri.ntp.carnet.hr zg2.ntp.carnet.hr st.ntp.carnet.hr os.ntp.carnet.hr 127.127.1.0\"/g" \
+                   /etc/default/ntpdate || true
 }
 
 if [ -f /usr/share/doc/ntp-cn/ntp.conf.tmpl -a -f /etc/ntp.conf ]; then
@@ -28,16 +31,8 @@ fi
 # restartaj sve
 if [ -x /etc/init.d/ntp ]; then
   if [ -x /usr/sbin/invoke-rc.d ]; then
-    invoke-rc.d ntp stop
-    for i in 1 2 3 4 5 6 7 8 9 0; do
-      pgrep -u root -f /usr/sbin/ntpd >/dev/null && sleep 1 || break
-    done
-    invoke-rc.d ntp start
+    invoke-rc.d ntp restart
   else
-    /etc/init.d/ntp stop
-    for i in 1 2 3 4 5 6 7 8 9 0; do
-      pgrep -u root -f /usr/sbin/ntpd >/dev/null && sleep 1 || break
-    done
-    /etc/init.d/ntp start
+    /etc/init.d/ntp restart
   fi
 fi