Bug#280086: /sbin/update-grub: fix for splashimage where /boot is not on /

[Debian User]

This is a multi-part MIME message sent by reportbug.

--===============1400061605==
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

Package: grub
Version: 0.95+cvs20040624-12
Followup-For: Bug #280086

Subject sums it up.  Attached is a patch that fixes this problem.

Unfortunately it uncovers a new problem.  If the user has a non-auto-generated
item in the menu, the splash screen doesn't appear.


-- System Information:
Debian Release: 3.1
  APT prefers unstable
  APT policy: (500, 'unstable'), (500, 'testing')
Architecture: i386 (i686)
Kernel: Linux 2.6.9-1-686
Locale: LANG=en_US, LC_CTYPE=en_US (charmap=ISO-8859-1)

Versions of packages grub depends on:
ii  libc6                       2.3.2.ds1-18 GNU C Library: Shared libraries an
ii  libncurses5                 5.4-4        Shared libraries for terminal hand

-- no debconf information

--===============1400061605==
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename="update-grub.patch"

--- update-grub.orig	2004-11-22 18:05:11.000000000 -0500
+++ update-grub	2004-11-27 18:57:50.000000000 -0500
@@ -673,7 +673,7 @@
 echo -n "Searching for splash image... "
 if [ -f /boot/grub/splash.xpm.gz ]; then
        echo "found: /boot/grub/splash.xpm.gz ."
-       echo "splashimage=${grub_root_device}${grub_dir}/splash.xpm.gz" >> $buffer
+       echo "splashimage=${grub_root_device}${grub_dir##${boot_device:+/boot}}/splash.xpm.gz" >> $buffer
        echo >> $buffer
 else
        echo "none found, skipping..."

--===============1400061605==--