Bug#280086: New patch with a small issue solved

[Otavio Salvador]

Hello,

I'm including a new version of patch file since it has a small problem
found by our users on Debian-BR-CDD. It should be OK now.

Please, review ASAP since it solve a serious problem for users.

-------------- next part --------------
--- grub-orig/debian/update-grub	2005-08-18 11:21:57.144589048 -0300
+++ grub-new/debian/update-grub	2005-08-18 11:20:41.936022488 -0300
@@ -688,9 +688,19 @@
 echo >> $buffer
 
 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
+current_splash=`grep '^splashimage=' ${grub_dir}/menu.lst || true`
+splashimage_path="splashimage=${grub_root_device}${grub_dir##${boot_device:+/boot}}/splash.xpm.gz"
+if [ -f "${grub_dir}/splash.xpm.gz" ]  && [ "$current_splash" == "" ]; then
+       echo "found: /boot/grub/splash.xpm.gz"
+       echo "$splashimage_path" >> $buffer
+       echo >> $buffer
+elif [ -f "${grub_dir}/splash.xpm.gz" ]  && [ "$current_splash" == "$splashimage_path" ]; then
+       echo "found: /boot/grub/splash.xpm.gz"
+       echo "$splashimage_path" >> $buffer
+       echo >> $buffer
+elif [ "$current_splash" != "" ] && [ "$current_splash" != "$splashimage_path" ]; then
+       echo "found but preserving previous setting: $(grep '^splashimage=' /boot/grub/menu.lst)"
+       echo "$current_splash" >> $buffer
        echo >> $buffer
 else
        echo "none found, skipping..."
-------------- next part --------------
-- 
        O T A V I O    S A L V A D O R
---------------------------------------------
 E-mail: otavio at debian.org      UIN: 5906116
 GNU/Linux User: 239058     GPG ID: 49A5F855
 Home Page: http://www.freedom.ind.br/otavio
---------------------------------------------
"Microsoft gives you Windows ... Linux gives
 you the whole house."