Bug#630568: grub-common: 10_linux also generates entries for xen kernels.

[Han Boetes]

Package: grub-common
Version: 1.98+20100804-14
Severity: normal
Tags: patch


/etc/grub.d/10_linux also includes xen-kernels which are properly detected by 20_linux_xen. This results in duplicate entries for xen kernels and a lack of controlability -- by modifying the leading number -- of the prefered kernel.

This patch aims to remedy this problem, although it doesn't take other configurations in account.


--- 10_linux.orig  2011-01-18 12:43:20.000000000 +0100
+++ 10_linux	   2011-06-15 11:12:58.016373186 +0200
@@ -51,6 +51,11 @@ else
   LINUX_ROOT_DEVICE=UUID=${GRUB_DEVICE_UUID}
 fi
 
+not_xen_kernel()
+{
+    echo $1 | grep -qvi xen
+}
+
 linux_entry ()
 {
   os="$1"
@@ -95,7 +100,7 @@ EOF
 }
 
 list=`for i in /boot/vmlinu[zx]-* /vmlinu[zx]-* ; do
-        if grub_file_is_not_garbage "$i" ; then echo -n "$i " ; fi
+        if grub_file_is_not_garbage "$i" && not_xen_kernel "$i"; then echo -n "$i " ; fi
       done`
 prepare_boot_cache=
 



-- System Information:
Debian Release: 6.0.1
  APT prefers stable
  APT policy: (990, 'stable'), (500, 'stable-updates'), (500, 'testing')
Architecture: amd64 (x86_64)

Kernel: Linux 2.6.32-5-xen-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF8, LC_CTYPE=en_US.UTF8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

Versions of packages grub-common depends on:
ii  base-files              6.0squeeze1      Debian base system miscellaneous f
ii  dpkg                    1.15.8.10        Debian package management system
ii  gettext-base            0.18.1.1-3       GNU Internationalization utilities
ii  install-info            4.13a.dfsg.1-6   Manage installed documentation in 
ii  libc6                   2.11.2-10        Embedded GNU C Library: Shared lib
ii  libdevmapper1.02.1      2:1.02.48-5      The Linux Kernel Device Mapper use
ii  libfreetype6            2.4.2-2.1        FreeType 2 font engine, shared lib
ii  zlib1g                  1:1.2.3.4.dfsg-3 compression library - runtime

Versions of packages grub-common recommends:
ii  os-prober                     1.42       utility to detect other OSes on a 

Versions of packages grub-common suggests:
pn  grub-emu                      <none>     (no description available)
pn  multiboot-doc                 <none>     (no description available)
pn  xorriso                       <none>     (no description available)

-- Configuration Files:
/etc/grub.d/10_linux changed [not included]

-- no debconf information