X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=src%2Ffunctions.sh;h=0e12ecb12ebfab26bee75a55aaa2f59ff2f94489;hb=d0c4bd1d1ddee4d6d64ef91e3a84b46373ac5ddb;hp=ed7833291722cb1b108c2ddf5c5e161f1ee03bb9;hpb=f73a1d013f3dc420c206d8ba3acb200de8c6df4f;p=carnet-upgrade.git

diff --git a/src/functions.sh b/src/functions.sh
index ed78332..0e12ecb 100644
--- a/src/functions.sh
+++ b/src/functions.sh
@@ -998,6 +998,16 @@ upgrade_fail2ban() {
   fi
 }
 
+# manual upgrade of mailman to avoid two copies of mailman running
+# first started by python upgrade and second started by mailman itself
+upgrade_mailman() {
+  if pkg mailman-cn lt 2:2.1.15~cn0; then
+    /etc/init.d/mailman stop || true
+    pkgadd python
+    pkgadd mailman mailman-cn
+  fi
+}
+
 get_variable () {
   local name=$1 file=$2 val
 
@@ -1040,24 +1050,6 @@ upgrade_munin () {
   dpkg-reconfigure munin-cn
 }
 
-# try not to overwrite user modified issue files
-fix_issue () {
-  if cmp /etc/issue $cnup/files/etc/issue.expect.new >/dev/null; then
-    cp -av /etc/issue /etc/issue.$backup_ext
-    cat > /etc/issue <<EOF
-Debian GNU/Linux 6.0 (CARNet Debian 6.0) \\n \\l
-
-EOF
-  fi
-
-  if cmp /etc/issue.net $cnup/files/etc/issue.net.expect.new >/dev/null; then
-    cp -av /etc/issue.net /etc/issue.net.$backup_ext
-    cat > /etc/issue.net <<EOF
-Debian GNU/Linux 6.0 (CARNet Debian 6.0) %h
-EOF
-  fi
-}
-
 check_archives_space() {
   local available_disk_space archives_size
   available_disk_space=$(free_space /var/cache/apt/archives/)