Early upgrade of debian-archive-keyring.

[carnet-upgrade.git] / src / functions.sh

diff --git a/src/functions.sh b/src/functions.sh
index c51c2d2..e097bc0 100644 (file)
--- a/src/functions.sh
+++ b/src/functions.sh
@@ -445,7 +445,7 @@ check_apache_version () {
 
   if pkg apache-cn && ! pkg apache2-cn; then
     notice "
-Prije prelaska na Debian Lenny potrebno je napraviti nadogradnju sa Apache 1.3 na Apache 2.0.
+Prije prelaska na Debian Etch potrebno je napraviti nadogradnju sa Apache 1.3 na Apache 2.0.
 
 Pokrenite:
   # apt-get update
@@ -487,9 +487,22 @@ Nakon toga ponovno pozovite ovu skriptu."
 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; }' )
+  # try to get default kernel from lilo
+  if type lilo >/dev/null 2>&1; then
+      default_kernel=$( lilo -t -v 2>/dev/null \
+                        | grep -B3 '[*]$' \
+                        | sed -n -e '/^Boot image: / { s///p; q; }' )
+  fi
+
+  # fallback to grub if lilo not installed
+  if [ -z "$default_kernel" -a -r "/boot/grub/menu.lst" ]; then
+      default_kernel=$( awk '
+           $1 == "default" { default = $2; 
+                             if (default != /^[[:digit:]]+$/) { exit } }
+           $1 == "title" { title+=1 }
+           $1 == "kernel" && title==default+1 { print $2; exit }' \
+           /boot/grub/menu.lst 2>/dev/null )
+  fi
 
   if [ -z "$default_kernel" ]; then
       log "Could not find default kernel"
@@ -800,10 +813,10 @@ apt_listchanges () {
 
 # make a silent installation of carnet and srce keyrings
 install_keyrings () {
-  pkgadd carnet-keyring srce-keyring
+  pkgadd carnet-keyring srce-keyring debian-archive-keyring
   pkgadd dpkg apt debconf python-apt
 
-  dpkg-reconfigure carnet-keyring srce-keyring
+  dpkg-reconfigure carnet-keyring srce-keyring debian-archive-keyring
   apt_update
 }