From: Dinko Korunic <kreator@carnet.hr>
Date: Tue, 22 Apr 2008 08:46:58 +0000 (+0200)
Subject: - vise se ne poziva SystemV monit skripta ako je vec onemogucena
X-Git-Tag: v4.10.1-3~10
X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=commitdiff_plain;h=1f6973c4ef9c321cc3bcbb06285770883c080da4;p=monit-cn.git

- vise se ne poziva SystemV monit skripta ako je vec onemogucena
- ispravna usporedba sadrzaja predlozaka i restore ako je potrebno
- precizniji pkill
Signed-off-by: Dinko Korunic <kreator@carnet.hr>
---

diff --git a/debian/changelog b/debian/changelog
index d2258b3..ed9ad8e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ monit-cn (1:4.8.1-6) stable; urgency=low
   * preimenovan ntpd u ntp predlozak za Etch
   * dodan ntp-server predlozak za Sarge
   * u ntp predloske dodana provjera za 127.0.0.1 123/udp portom
+  * vise se ne poziva SystemV monit skripta ako je vec onemogucena
+  * ispravna usporedba sadrzaja predlozaka i restore ako je potrebno
 
  -- Dinko Korunic <kreator@carnet.hr>  Tue, 22 Apr 2008 10:30:29 +0200
 
diff --git a/debian/postinst b/debian/postinst
index 97dd210..113a00b 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -76,17 +76,17 @@ cp_check_and_sed '^startup[[:space:]]*=[[:space:]]*1' \
     '^s/startup[[:space:]]*=.*/startup=0/g' /etc/default/monit || true
 
 # systemv part
-echo "CN: Disabling monit SystemV script"
-if [ -x "/etc/init.d/monit" ]; then
-    update-rc.d -f monit remove >/dev/null 2>&1
-    if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
-        invoke-rc.d monit stop || true
-    else
-        /etc/init.d/monit stop || true
+if ! grep -q 'CARNet package monit-cn' /etc/init.d/monit; then
+    echo "CN: Disabling monit SystemV script"
+    if [ -x "/etc/init.d/monit" ]; then
+        update-rc.d -f monit remove >/dev/null 2>&1
+        if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
+            invoke-rc.d monit stop || true
+        else
+            /etc/init.d/monit stop || true
+        fi
     fi
-fi
-if [ -e "/etc/init.d/monit" ]; then
-    if ! grep -q 'CARNet package monit-cn' /etc/init.d/monit; then
+    if [ -e "/etc/init.d/monit" ]; then
         # shebang
         head -n1 /etc/init.d/monit > /etc/init.d/monit.$$
         # middle part
@@ -116,7 +116,7 @@ fi
 
 # reload init, since we have new configuration
 echo "CN: (Re)starting monit service, please check /var/log/daemon.log"
-pkill -9 -f /usr/sbin/monit || true
+pkill -9 -f '/usr/sbin/monit$' || true
 kill -HUP 1
 
 # dh_installdeb will replace this with shell code automatically
diff --git a/update-monit.d b/update-monit.d
index 8505053..20508c7 100755
--- a/update-monit.d
+++ b/update-monit.d
@@ -110,7 +110,7 @@ check_template() {
         return 0
     fi
 
-    if cmp -s "$filename" "${TEMPLATES_DIR}/${serviceconf}"; then
+    if ! cmp -s "$filename" "${TEMPLATES_DIR}/${serviceconf}"; then
         RET=1
         return 1
     fi