X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=src%2Ffunctions.sh;h=4a37c256706fd90159890271da033a057fd7aaf0;hb=8c37a487ea35a7fb3ed001c694019e0f3b1def48;hp=e9f8cdf96e0aca5505b60480aab1a50e1270e7bb;hpb=e4155197112942db5cb42c9f69b4b9059db506a6;p=carnet-upgrade.git

diff --git a/src/functions.sh b/src/functions.sh
index e9f8cdf..4a37c25 100644
--- a/src/functions.sh
+++ b/src/functions.sh
@@ -852,7 +852,7 @@ pkgupgrade () {
 
 # make a silent upgrade to new libc6
 upgrade_libc () {
-  DEBIAN_FRONTEND=noninteractive pkgupgrade libc6 libc6-dev tzdata udev
+  DEBIAN_FRONTEND=noninteractive pkgupgrade libc6 libc6-dev tzdata
 }
 
 # upgrade apache2/php5
@@ -883,14 +883,21 @@ upgrade_amavis () {
 upgrade_freeradius () {
   pkg freeradius-aai lt 2.1.10-1 || return 0
 
-  # aai team prevents a clean upgrade
+  # aai team prevents a normal upgrade
   cp -av /etc/freeradius /etc/freeradius.$backup_ext
   pkgrm freeradius-aai freeradius-ldap freeradius
+  rm -rf /etc/freeradius/certs
   pkgadd freeradius-aai
 }
 
 # 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
@@ -900,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
 }