--- installkernel	2008-07-11 01:48:18.000000000 +0200
+++ installkernel-symlink	2008-07-11 02:20:47.000000000 +0200
@@ -42,9 +42,10 @@
     # The presence of "$dir/$1" is unusual in modern intallations, and
     # the results are mostly unused.  So only recreate them if they
     # already existed.
-    if test -L "$dir/$1" &&
-        [ "$(readlink -f ${dir}/${1})" = "${dir}/${1}-${ver}" ]; then
-        ln -sf "$1-$ver.old" "$dir/$1.old"
+    if test -L "$dir/$1"; then
+        if [ "$(readlink -f ${dir}/${1})" = "${dir}/${1}-${ver}" ]; then
+            ln -sf "$1-$ver.old" "$dir/$1.old"
+        fi
         ln -sf "$1-$ver" "$dir/$1"
     else
         mv "$dir/$1" "$dir/$1.old"
--- installkernel	2008-07-11 01:48:18.000000000 +0200
+++ installkernel-mkboot	2008-07-11 02:57:13.000000000 +0200
@@ -66,13 +66,12 @@
   updatever config "$config"
 fi
 
-## This is very far from existing practice in modern Debian installations
-########################################################################
-# if [ "$(basename $img)" = "vmlinux" ] && [ "$(id -u)" = "0" ] ; then #
-#   mkboot -i ${dir}/vmlinux-${ver}                                    #
-# else                                                                 #
-#   mkboot -i ${dir}/vmlinuz-${ver}                                    #
-# fi                                                                   #
-########################################################################
+if test -L "$dir/vmlinu[xz]" && \
+  [ "$(basename $img)" = "vmlinux" ] \
+  && [ "$(id -u)" = "0" ] ; then
+  mkboot -i ${dir}/vmlinux-${ver}
+else
+  mkboot -i ${dir}/vmlinuz-${ver}
+fi
  
 exit 0