X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?p=ntp-cn.git;a=blobdiff_plain;f=debian%2Fpostinst;h=58fa1da29a61e6eb9e6104c66353b1e716663769;hp=eeb706826aea2fdf4d243b3658a42f58256fe98a;hb=b220642b55c2ce32c33117c0f955c91f27df39b8;hpb=5bf5ece162242b434df89eb4fbe859a78eec8501

diff --git a/debian/postinst b/debian/postinst
index eeb7068..58fa1da 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -1,6 +1,9 @@
 #!/bin/sh
 
+set -e
+
 [ "$1" = "configure" ] || exit 0
+[ "$DEBIAN_SCRIPT_DEBUG" ] && set -vx
 
 konfiguriraj() {
   if [ -f /etc/ntp.conf ]; then
@@ -11,11 +14,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
+
+  # Load CARNet Tools
+  . /usr/share/carnet-tools/functions.sh
 
-  cat > /etc/default/ntp-servers <<EOF
-NTPSERVERS="zg1.ntp.carnet.hr ri.ntp.carnet.hr zg2.ntp.carnet.hr 127.127.1.0"
-EOF
+  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
@@ -27,16 +33,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