Bug#504114: mkbimage: fails to check stage2

[Al Nikolov]

Package: grub
Version: 0.97-27etch1
Severity: normal
Tags: patch

If a chrootable environment, the source of a target bootable image, contains two or more files named stage2 (for instance: /usr/lib/grub/i386-pc/stage2; /boot/grub/stage2), then mkbimage fails. But 
in fact, the grub itself expects stage2 in /boot/grub, so we probably could fix that easy.

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

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

grub recommends no packages.

-- no debconf information
-------------- next part --------------
--- /usr/bin/mkbimage.orig	2008-10-31 15:58:32.000000000 +0300
+++ /usr/bin/mkbimage	2008-10-31 16:47:26.000000000 +0300
@@ -366,7 +366,7 @@
 mkbimage_cp
 
 #We verify that the stage2 exists and we search the name
-stage2_os_name=`find ${image}1 -name stage2 -type f`
+stage2_os_name=`find ${image}1/boot -name stage2 -type f`
 
 [ -r "$stage2_os_name" ] || { echo "I can't find stage2!"; exit 1;}