X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?p=carnet-upgrade.git;a=blobdiff_plain;f=src%2Ffunctions.sh;h=27fa13d70be49857cf7237aa2cccd6a0183c0b21;hp=90eed9d5d7e6cd76ccb466d28282a5073754f4c0;hb=593a505177247c3eedf76b9018b37c2b8be10789;hpb=bd6e63dd7803fb0eed748605a2bd3aeb20d7040b

diff --git a/src/functions.sh b/src/functions.sh
index 90eed9d..27fa13d 100644
--- a/src/functions.sh
+++ b/src/functions.sh
@@ -721,6 +721,7 @@ restore_configs () {
 
   if pkg amavisd-cn lt 3:2.6.5; then
      restore_file /etc/init.d/amavisd-cn
+     rm -f /etc/init.d/amavisd-cn.$backup_ext
   fi
 
   if pkg console-tools lt 1:0.2.3dbs-69.1; then
@@ -778,7 +779,6 @@ apt_listchanges () {
 # make a silent installation of carnet and srce keyrings
 install_keyrings () {
   pkgadd carnet-keyring srce-keyring debian-archive-keyring
-  pkgupgrade dpkg apt debconf python-apt dpkg-dev
 
   dpkg-reconfigure carnet-keyring srce-keyring debian-archive-keyring
   apt_update
@@ -881,9 +881,7 @@ upgrade_amavis () {
 
 # handle freerdius upgrade
 upgrade_freeradius () {
-  local template config_new password realm hostname basedn
-
-  pkg freeradius-aai lt 2.1.3-0lenny0 || return 0
+  pkg freeradius-aai lt 2.1.10-1 || return 0
 
   # aai team prevents a clean upgrade
   cp -av /etc/freeradius /etc/freeradius.$backup_ext
@@ -891,47 +889,11 @@ upgrade_freeradius () {
   pkgadd freeradius-aai
 }
 
-# prepare for slapd upgrade (caused by freeradius installation)
-prepare_openldap () {
-  pkg openldap-aai lt 2.4 || return 0
-
-  # openldap-aai expects org.ldif to exists
-  local ldif=/var/lib/ldap/org.ldif
-  local ldif_backup=/var/lib/carnet-upgrade/org.ldif
-  if [ -f $ldif ]; then
-    cp -v $ldif $ldif_backup
-  fi
-}
-
-# fix openldap-aai postinst user handling
+# handle openldap upgrade
 upgrade_openldap () {
-  pkg openldap-aai lt 2.4 || return 0
-
-  # slapd postinst fails if move_old_database is false
-  echo 'slapd slapd/move_old_database boolean true' | debconf-set-selections 
+  # aai does not depend on the new openldap version
   pkgadd slapd
-
-  # slapd removes org.ldif during switch from ldap -> openldap user
-  local ldif=/var/lib/ldap/org.ldif
-  local ldif_backup=/var/lib/carnet-upgrade/org.ldif
-  if [ -f $ldif_backup -a ! -f $ldif ]; then
-    cp -v $ldif_backup $ldif
-  fi
-
-  # openldap-aai postinst fails here because of database permissions
-  apt-get -y install openldap-aai || true
-  chown -R openldap:openldap /var/lib/ldap
-  /etc/init.d/slapd restart
-  dpkg --configure -a
-
-  # remove ldap user if openldap works
-  if getent passwd ldap      > /dev/null && \
-     getent passwd openldap  > /dev/null && \
-     pgrep -U openldap slapd > /dev/null
-  then
-     log "userdel ldap (replaced by openldap)"
-     userdel ldap || true
-  fi
+  pkgadd openldap-aai
 }
 
 # fix postgresql deinstallation during upgrade
@@ -1055,7 +1017,7 @@ check_kernel_space() {
   log "Kernel package: $pkg"
   log "Kernel size: ${kernel_size}MB"
 
-  if LC_ALL=C apt-get -s install kernel-2.6-cn \
+  if LC_ALL=C apt-get -s install kernel-2.6-cn 2>/dev/null \
      | grep -q '^kernel-2.6-cn is already the newest version.$'
   then
      log "Not checking free space in /: kernel-2.6-cn already installed"