X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=src%2Ffunctions.sh;h=776c5dd1ab26ff8e54dc84daa5dc37ad6ec4d737;hb=ac1853d401b9f68550614afb960ddfcafdcb239a;hp=bdb78e9bb72efd5024a1e06d06204b2ce47fc5bd;hpb=33da5f865daf104ca29d21bb1780d490ac6ea023;p=carnet-upgrade.git

diff --git a/src/functions.sh b/src/functions.sh
index bdb78e9..776c5dd 100644
--- a/src/functions.sh
+++ b/src/functions.sh
@@ -146,6 +146,12 @@ apt_download() {
 }
 
 dist_upgrade () {
+  log "Running upgrade ..."
+  apt-get -y$s upgrade || {
+    dpkg --configure -a
+    apt-get -y$s upgrade
+  }
+
   log "Running dist-upgrade ..."
   apt-get -y$s dist-upgrade || {
     dpkg --configure -a
@@ -574,7 +580,7 @@ reboot_required () {
 
   if [ ! -e "$default_kernel" ]; then
       # /boot prefix might be missing
-      default_kernel="/boot/$default_kernel"
+      default_kernel="/boot/${default_kernel#/}"
       if [ ! -e "$default_kernel" ]; then
           log "Default kernel image doesn't exist!?"
           return 1
@@ -1050,14 +1056,6 @@ upgrade_apache2 () {
 upgrade_amavis () {
   local conf
 
-  # remove init script diversion before upgrade
-  if pkg amavisd-cn lt 3:2.6.1-1; then 
-    if [ -L /etc/init.d/amavis -a -f /etc/init.d/amavis.amavisd-new ]; then
-      rm -vf /etc/init.d/amavis
-      dpkg-divert --remove /etc/init.d/amavis
-    fi
-  fi
-
   # move old config aside
   for conf in /etc/amavisd.conf /etc/amavis/amavisd.conf; do
     if [ -e $conf -a ! -e $conf.$backup_ext ]; then
@@ -1068,18 +1066,8 @@ upgrade_amavis () {
   # install new packages
   pkgadd amavisd-cn amavisd-new
 
-  # fix new packages
-  check_and_sed '^clamd.*5.clamav.log$' \
-                's/^\(clamd.*\)5.clamav.log$/\14\tsocket/g' \
-                /etc/init.d/amavisd-cn || true
-
-  # check if link got lost
-  if pkg amavisd-cn && [ ! -L /etc/init.d/amavis ]; then
-    apt-get install --reinstall --yes amavisd-cn
-  fi
-
   # start new packages
-  /etc/init.d/amavis restart
+  /etc/init.d/amavisd-cn restart
 }
 
 # handle freerdius upgrade
@@ -1266,11 +1254,15 @@ check_archives_space() {
 }
 
 check_kernel_space() {
-  local available_disk_space kernel_size linux_images pkg ret
+  local available_disk_space kernel_size linux_images metapkg pkg ret
   available_disk_space=$(free_space /)
   linux_images=$(apt-cache show kernel-2.6-cn | grep ^Depends: \
-    | grep -o 'linux-image[^ ]*')
-  for pkg in $linux_images; do
+    | grep -o 'linux-image[^, ]*')
+  for metapkg in $linux_images; do
+    pkg=$(apt-cache show $metapkg | grep ^Depends: \
+          | grep -o 'linux-image[^, ]*' | head -1)
+    [ "$pkg" ] || continue
+
     kernel_size=$(installed_size $pkg)
     ret=$?
     [ $ret -eq 0 ] && break