GRUB_BACKGROUND support.

	* util/grub-mkconfig.in: Export GRUB_BACKGROUND.
	* util/grub.d/00_header.in: Parse GRUB_BACKGROUND.

diff --git a/ChangeLog b/ChangeLog
index 0b77ea6a48e0a2ee423a1f8722d4e93a33696bc1..1fdd2a21b72fc011b424ba137bae955cf33d1574 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,14 @@
+2010-04-09  Mario Vazquez <mariovazq@gmail.com>
+
+       GRUB_BACKGROUND support.
+
+       * util/grub-mkconfig.in: Export GRUB_BACKGROUND.
+       * util/grub.d/00_header.in: Parse GRUB_BACKGROUND.
+
 2010-04-09  Vladimir Serbinenko  <phcoder@gmail.com>
 
        Load fonts and modules for gfxmenu in grub-mkconfig.
-       Idea by: Mario Vasquez
+       Idea by: Mario Vazquez
 
        * util/grub.d/00_header.in: Load pf2 and image modules.
 

diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
index 94cd2e199ffe866d17857e3bde014a00fa479477..b98bbc993e6d5ea92eac585a9c8c12bc79b04d3c 100644 (file)
--- a/util/grub-mkconfig.in
+++ b/util/grub-mkconfig.in
@@ -233,6 +233,7 @@ export GRUB_DEFAULT \
   GRUB_DISABLE_LINUX_UUID \
   GRUB_DISABLE_LINUX_RECOVERY \
   GRUB_GFXMODE \
+  GRUB_BACKGROUND \
   GRUB_THEME \
   GRUB_GFXPAYLOAD_LINUX \
   GRUB_DISABLE_OS_PROBER \

diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in
index f99010d6dfcbd80e1ab0cf5adfb76d75d5a7c9c7..beb9653da7dc17034e6baa9797b73c19c281451b 100644 (file)
--- a/util/grub.d/00_header.in
+++ b/util/grub.d/00_header.in
@@ -125,6 +125,20 @@ EOF
            
        cat << EOF
   set theme=(\$root)`make_system_path_relative_to_its_root $GRUB_THEME`
+EOF
+    elif [ "x$GRUB_BACKGROUND" != x ] && [ -f "$GRUB_BACKGROUND" ] \
+           && is_path_readable_by_grub "$GRUB_BACKGROUND"; then
+       echo "Found background: $GRUB_BACKGROUND" >&2
+       case "$GRUB_BACKGROUND" in 
+           *.png)         reader=png ;;
+           *.tga)         reader=tga ;;
+           *.jpg|*.jpeg)  reader=jpeg ;;
+           *)             echo "Unsupported image format" >&2; exit 1 ;;
+       esac
+       prepare_grub_to_access_device `${grub_probe} --target=device "$GRUB_BACKGROUND"` | sed -e "s/^/  /"
+       cat << EOF
+  insmod $reader
+  background_image -m stretch `make_system_path_relative_to_its_root "$GRUB_BACKGROUND"`
 EOF
     fi
     cat << EOF