Package: grub-pc
Version: 1.98+20100710-1

Hello,

when choosing multiple terminal outputs via
        /etc/default/grub:GRUB_TERMINAL_OUTPUT="gfxterm serial"
05_debian_theme fails to configure a background image for gfxterm.

The attached patch fixes this.

Altough the patch looks quite long, it really isn't: most of it is
changed indenting. Here is a diff -w marking the real changes:
        25c25,26
        < if [ "$GRUB_TERMINAL_OUTPUT" = "gfxterm" ] ; then
        ---
        > for output in ${GRUB_TERMINAL_OUTPUT}; do
        >   if [ "$output" = "gfxterm" ] ; then
        40a42
        >     break
        41a44
        > done
The changes are somewhat similar to GRUB_TERMINAL_OUTPUT handling in
00_header.


regards
   Mario
-- 
> As Luke Leighton said once on samba-ntdom, "now, what was that about
> rebooting?   that was so long ago, i had to look it up with man -k."
--- /etc/grub.d/05_debian_theme.orig	2010-06-12 12:06:57.000000000 +0200
+++ /etc/grub.d/05_debian_theme	2010-07-16 18:44:37.000000000 +0200
@@ -22,23 +22,26 @@
 
 # check for usable backgrounds
 use_bg=false
-if [ "$GRUB_TERMINAL_OUTPUT" = "gfxterm" ] ; then
-  for i in /boot/grub/`basename ${WALLPAPER}` ${WALLPAPER} ; do
-    if is_path_readable_by_grub $i ; then 
-      bg=$i
-      case ${bg} in
-        *.png)		reader=png ;;
-        *.tga)		reader=tga ;;
-        *.jpg|*.jpeg)	reader=jpeg ;;
-      esac
-      if test -e /boot/grub/${reader}.mod ; then
-        echo "Found background image: `basename ${bg}`" >&2
-        use_bg=true
-        break
+for output in ${GRUB_TERMINAL_OUTPUT}; do
+  if [ "$output" = "gfxterm" ] ; then
+    for i in /boot/grub/`basename ${WALLPAPER}` ${WALLPAPER} ; do
+      if is_path_readable_by_grub $i ; then 
+        bg=$i
+        case ${bg} in
+          *.png)		reader=png ;;
+          *.tga)		reader=tga ;;
+          *.jpg|*.jpeg)	reader=jpeg ;;
+        esac
+        if test -e /boot/grub/${reader}.mod ; then
+          echo "Found background image: `basename ${bg}`" >&2
+          use_bg=true
+          break
+        fi
       fi
-    fi
-  done
-fi
+    done
+    break
+  fi
+done
 
 # set the background if possible
 if ${use_bg} ; then

Attachment: signature.asc
Description: Digital signature

Reply via email to