From: Valentin Vidic <vvidic@carnet.hr>
Date: Tue, 1 Apr 2008 09:43:58 +0000 (+0200)
Subject: Disable old amavis config during upgrade.
X-Git-Tag: debian/4.0.1~5
X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?p=carnet-upgrade.git;a=commitdiff_plain;h=a4fb6e2faae3c448c19ffe68bca18491f02b8965

Disable old amavis config during upgrade.
---

diff --git a/src/functions.sh b/src/functions.sh
index f1fbc02..b0ebdb3 100644
--- a/src/functions.sh
+++ b/src/functions.sh
@@ -667,10 +667,11 @@ upgrade_amavis () {
   fi
 
   # move old config aside
-  conf=/etc/amavis/amavisd.conf
-  if [ -e $conf -a ! -e $conf.$backup_ext ]; then
-    mv -v $conf $conf.$backup_ext
-  fi
+  for conf in /etc/amavisd.conf /etc/amavis/amavisd.conf; do
+    if [ -e $conf -a ! -e $conf.$backup_ext ]; then
+      mv -v $conf $conf.$backup_ext
+    fi
+  done
 
   # install new packages
   pkgadd amavisd-cn amavisd-new