X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=src%2Ffunctions.sh;h=970d3db2f5fd6ebf841dbf72b3a0893f84ad6a87;hb=34fae0d4853ef205525f1fc864652e3181117160;hp=2399e2de1f6e591e6f1bc6f71b73908a5ea1d639;hpb=8399eac47011395722b0fec41a51c69524843081;p=carnet-upgrade.git

diff --git a/src/functions.sh b/src/functions.sh
index 2399e2d..970d3db 100644
--- a/src/functions.sh
+++ b/src/functions.sh
@@ -346,6 +346,9 @@ fix_sarge_sources () {
 
       # install fixed version
       cp -av $fixed_sources $apt_sources
+
+      # update the database
+      apt_update
   fi
 
   # delete temporary
@@ -402,7 +405,7 @@ check_grsec_kernel () {
     return 0
   fi
 
-  if [ "$ver" = "${ver#2.6.2[4-9]}" ]; then
+  if [ "$ver" = "${ver#2.6.2[4-9]}" ] || reboot_required; then
     # kernel too old
     notice "
 Prije prelaska na Debian Etch potrebno je napraviti nadogradnju na najnoviji grsec kernel.
@@ -418,6 +421,53 @@ Nakon toga ponovno pozovite ovu skriptu."
   fi
 }
 
+# check if the latest kernel is booted
+reboot_required () {
+  local default_kernel kernel_package running_release running_version
+
+  default_kernel=$( lilo -t -v 2>/dev/null \
+                    | grep -B3 '[*]$' \
+                    | sed -n -e '/^Boot image: / { s///p; q; }' )
+
+  if [ -z "$default_kernel" ]; then
+      log "Could not find default kernel"
+      return 1
+  fi
+
+  log "Default kernel image: $default_kernel"
+
+  if [ ! -e "$default_kernel" ]; then
+      log "Default kernel image doesn't exist!?"
+      return 1
+  fi
+
+  kernel_package=$( dpkg -S $default_kernel | cut -d: -f 1 )
+
+  if [ -z "$kernel_package" ]; then
+      log "Default kernel not installed from a package"
+      return 1
+  fi
+
+  log "Default kernel package: $kernel_package"
+
+  if [ "$kernel_package" != "kernel-2.6-cn" ]; then
+      log "Default kernel package is not kernel-2.6-cn"
+      return 1
+  fi
+
+  running_release=$( uname -r )
+  running_version=$( uname -v )
+  log "Running kernel: $running_release $running_version"
+
+  if grep -q "$running_release .* $running_version" $default_kernel; then
+      log "Latest kernel version is running." 
+      return 1
+  else
+      log "Reboot to latest version required."
+      return 0
+  fi
+}
+
 upgrade () {
   local i to_install packages
   case "$1" in