X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=src%2Ffunctions.sh;h=2dde2af7338203a7d7985baab68d2e7ee21f324a;hb=refs%2Fheads%2Fjessie;hp=34b9022a488054f8e8e88d432cf096b36da887c5;hpb=6d042d931b7f42f77624c866e91ef8dcc90c5b99;p=carnet-upgrade.git

diff --git a/src/functions.sh b/src/functions.sh
index 34b9022..2dde2af 100644
--- a/src/functions.sh
+++ b/src/functions.sh
@@ -530,16 +530,18 @@ create_sources_list () {
 
         # backup old version
         if [ -f $sl -a ! -f $sl.$backup_ext ]; then
-            cp -av $sl $sl.$backup_ext
+            cp -v $sl $sl.$backup_ext
         fi
 
         # install new version
-        cp -av $sl_new $sl
+        cp -v $sl_new $sl
         notice "Novi sadrzaj datoteke /etc/apt/sources.list:
 
 `cat /etc/apt/sources.list`"
     fi
 
+    # make sure permissions are correct
+    chmod 0644 $sl
     rm $sl_new
 }
 
@@ -883,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