Bug#393488: update-grub does not handle separate /boot partition for xen

[Christian Eckerle]

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

update-grub always prepends /boot in front of the kernel line for xen even if /boot is on its on partition


title           Xen 3.0-unstable-1-i386 / Debian GNU/Linux, kernel 2.6.18-1-xen-686
root            (hd0,0)
kernel          /boot/xen-3.0-unstable-1-i386.gz
module          /vmlinuz-2.6.18-1-xen-686 root=/dev/evms/dallas_root ro elevator=cfq console=tty0
module          /initrd.img-2.6.18-1-xen-686
savedefault


-- System Information:
Debian Release: testing/unstable
  APT prefers testing
  APT policy: (500, 'testing')
Architecture: i386 (i686)
Shell:  /bin/sh linked to /bin/bash
Kernel: Linux 2.6.18-1-xen-686
Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8)

Versions of packages grub depends on:
ii  libc6                        2.3.6.ds1-4 GNU C Library: Shared libraries
ii  libncurses5                  5.5-3       Shared libraries for terminal hand

grub recommends no packages.

-- no debconf information
-------------- next part --------------
--- /usr/sbin/update-grub.real	2006-09-20 21:46:31.000000000 +0200
+++ update-grub	2006-10-16 16:47:12.000000000 +0200
@@ -1003,7 +1003,7 @@
 
 			write_kernel_entry "$kernelVersion" '' '' "$grub_root_device" \
 			  "$kernel" "$currentOpt $xenkopt" '' "$initrd" true '' \
-			  Xen "$hypervisor" "$hypervisorVersion" "$xenhopt"
+			  Xen "$kernel_dir/xen-$hypervisorVersion.gz" "$hypervisorVersion" "$xenhopt"
 		fi
 	done
 
@@ -1011,7 +1011,7 @@
 		for hypervisor in $hypervisors; do
 			hypVersion=`basename "$hypervisor" .gz | sed s%xen-%%`
 		
-			echo "Found Xen hypervisor $hypVersion,  kernel: $kernel"
+			echo "Found Xen hypervisor $hypVersion,  kernel: $kernel $hypervisor"
 
 			write_kernel_entry "$kernelVersion" '' '' "$grub_root_device" \
 			  "$kernel" "$currentOpt $xenkopt" '' "$initrd" true '' \