X-Git-Url: http://ftp.carnet.hr/pub/carnet-debian/scm?a=blobdiff_plain;f=src%2Ffunctions.sh;h=7037e0deb1c67ce47f78399ddba3bfba44235342;hb=5bd4bb217b8017cc7da5bff5c61414b26ecc556d;hp=06cbbc2d349b36ad8263f242569d516544b2bde9;hpb=16db4b7768ea6594c7e13c4231a1a62a5b627ee1;p=carnet-upgrade.git

diff --git a/src/functions.sh b/src/functions.sh
index 06cbbc2..7037e0d 100644
--- a/src/functions.sh
+++ b/src/functions.sh
@@ -480,7 +480,9 @@ reboot_required () {
   running_version=$( uname -v )
   log "Running kernel: $running_release $running_version"
 
-  if grep -q "$running_release .* $running_version" $default_kernel; then
+  if [ "$kernel_package" != "${kernel_package#linux-image-3.2.0-}" ] ||
+     grep -q "$running_release .* $running_version" $default_kernel
+  then
       log "Latest kernel version is running." 
       return 1
   else
@@ -903,8 +905,9 @@ upgrade_libc () {
 # upgrade apache2/php5
 upgrade_apache2 () {
   pkgrm apache-common # prevents installation of apache2-suexec
+  pkgrm php5-suhosin # not available for wheezy
   pkgupgrade libapache2-mod-php5 php5-cli php5-cn apache2-cn \
-    php5-odbc php5-suhosin php-suhosin-cn
+    php5-odbc
 }
 
 upgrade_amavis () {
@@ -928,7 +931,7 @@ upgrade_amavis () {
 upgrade_freeradius () {
   local password
 
-  pkg freeradius-aai lt 2.1.10-1 || return 0
+  pkg freeradius-aai lt 2.1.12~srce1 || return 0
 
   # aai team prevents a normal upgrade
   cp -av /etc/freeradius /etc/freeradius.$backup_ext