From: Zeljko Boros <Zeljko.Boros@carnet.hr>
Date: Wed, 12 Oct 2016 18:54:17 +0000 (+0200)
Subject: workaround za amavisd-cn insserv i start skriptu
X-Git-Tag: debian/8.0.1^0
X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=commitdiff_plain;h=refs%2Fheads%2Fjessie;p=carnet-upgrade.git

workaround za amavisd-cn insserv i start skriptu
---

diff --git a/debian/changelog b/debian/changelog
index 15f749d..4e69b83 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+carnet-upgrade (8.0.1) stable; urgency=medium
+
+   * insserv workaround
+   * amavisd-cn -> amavis in functions.sh
+
+ -- Zeljko Boros <Zeljko.Boros@CARNet.hr>  Wed, 12 Oct 2016 13:26:13 +0200
+
 carnet-upgrade (8.0.0) stable; urgency=medium
 
   * Rename wheezy -> jessie.
diff --git a/debian/control b/debian/control
index 9a733a6..04380e2 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: carnet-upgrade
 Section: admin
 Priority: extra
 Maintainer: Grupa za izradu paketa <paketi@carnet.hr>
-Uploaders: Valentin Vidic <Valentin.Vidic@CARNet.hr>
+Uploaders: Valentin Vidic <Valentin.Vidic@CARNet.hr>, Zeljko Boros <Zeljko.Boros@carnet.hr>
 Build-Depends: debhelper (>= 7), po-debconf, debiandoc-sgml, texlive,
  texlive-latex-extra, ghostscript
 Standards-Version: 3.9.6
diff --git a/src/functions.sh b/src/functions.sh
index 4c98608..2dde2af 100644
--- a/src/functions.sh
+++ b/src/functions.sh
@@ -885,11 +885,27 @@ upgrade_amavis () {
     fi
   done
 
+  # workaround for insserv complaining
+  if [ -x /sbin/insserv ]; then
+    if [ -r /etc/init.d/amavis.amavisd-new ]; then
+      /sbin/insserv amavis.amavisd-new
+    fi
+  fi
+
   # install new packages
   pkgadd amavisd-cn amavisd-new
 
+  # workaround for insserv complaining
+  if [ -x /sbin/insserv ]; then
+    if [ -r /etc/init.d/amavis.amavisd-new ]; then
+      /sbin/insserv amavis.amavisd-new
+    fi
+  fi
+
   # start new packages
-  /etc/init.d/amavisd-cn restart
+  ### By zelja, nema vise amavisd-cn, vjerujemo systemd-u
+  ### /etc/init.d/amavisd-cn restart
+  /etc/init.d/amavis restart
 }
 
 # handle mysql 5.0 to 5.1 upgrade