Bug#468824: grub: problems with non-xen kernels containing "xen" in name

[Roland Stigge]

Package: grub
Version: 0.97-30
Severity: normal
Tags: patch

Hi,

kernels containing "xen" in the name create problems with grub, e.g.
"xenomai" (not related to xen at all). I propose the attached patch.

Thanks,

Roland

-- System Information:
Debian Release: lenny/sid
  APT prefers unstable
  APT policy: (500, 'unstable')
Architecture: i386 (i686)

Kernel: Linux 2.6.24-rt1 (SMP w/1 CPU core; PREEMPT)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8) (ignored: LC_ALL set to en_GB.UTF-8)
Shell: /bin/sh linked to /bin/bash

Versions of packages grub depends on:
ii  libc6                     2.7-6          GNU C Library: Shared libraries
ii  libncurses5               5.6+20080119-1 Shared libraries for terminal hand

grub recommends no packages.

-- no debconf information
-------------- next part --------------
--- grub-0.97/debian/update-grub.orig	2008-02-20 21:25:47.000000000 +0100
+++ grub-0.97/debian/update-grub	2008-02-20 21:25:58.000000000 +0100
@@ -915,7 +915,7 @@
 
 sortedKernels=""
 for kern in $(/bin/ls -1vr /boot | grep -v "dpkg-*" | grep "^vmlinuz-") ; do
-	if `echo "$xenKernels" | grep -q "$kern "` || `echo "$kern" | grep -q "xen"`; then
+	if `echo "$xenKernels" | grep -q "$kern "` || `echo "$kern" | grep -q -e "-xen-"`; then
 		is_xen=1
 	else
 		is_xen=