X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;ds=inline;f=src%2Ffunctions.sh;h=c6dbd85b30e1c9a510ddc83be0a7bbf642fe0384;hb=cce8f05540161810b020c725285c904196f889ae;hp=95dd0e380bf10df7c20f9faf4618bf300dbfd0ac;hpb=22426cb04f83c7e95d7e05d9e49d9fab23a4c03c;p=carnet-upgrade.git

diff --git a/src/functions.sh b/src/functions.sh
index 95dd0e3..c6dbd85 100644
--- a/src/functions.sh
+++ b/src/functions.sh
@@ -892,6 +892,12 @@ upgrade_freeradius () {
 
 # handle openldap upgrade
 upgrade_openldap () {
+  # aai discovers database type from debconf
+  if [ -f /etc/ldap/slapd.conf ] && grep -q ^database.*bdb /etc/ldap/slapd.conf
+  then
+     echo set slapd/backend BDB | debconf-communicate >/dev/null
+  fi
+
   # aai does not depend on the new openldap version
   pkgadd slapd
   pkgadd openldap-aai
@@ -901,8 +907,8 @@ upgrade_openldap () {
 upgrade_mysql () {
   if pkg mysql-server || pkg mysql-server-5.0; then
      pkgadd mysql-server
-     pkgrm mysql-server-5.0
-     /etc/init.d/mysql start
+     dpkg -P mysql-server-5.0
+     /etc/init.d/mysql restart
   fi
 }