2010-02-14 Samuel Thibault <samuel.thibault@ens-lyon.org>

	* util/grub-mkconfig.in: Export GRUB_INIT_TUNE.
	* util/grub.d/00_header.in: Handle GRUB_INIT_TUNE.

diff --git a/ChangeLog b/ChangeLog
index 1817ad7321834ba633481c566bbaad7c2f018997..38bb39ac9380f25b6eff5bca495b52bccb690b5f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-02-14  Samuel Thibault  <samuel.thibault@ens-lyon.org>
+
+       * util/grub-mkconfig.in: Export GRUB_INIT_TUNE.
+       * util/grub.d/00_header.in: Handle GRUB_INIT_TUNE.
+
 2010-02-16  Vladimir Serbinenko  <phcoder@gmail.com>
 
        Remove any reference to non-free fonts.

diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
index 1363f479a84bad89c1fbf56681c87ac847a0c4d1..fb1dd454494160096bbf16cb2b46383a0fd2e6ed 100644 (file)
--- a/util/grub-mkconfig.in
+++ b/util/grub-mkconfig.in
@@ -222,7 +222,8 @@ export GRUB_DEFAULT \
   GRUB_GFXMODE \
   GRUB_THEME \
   GRUB_GFXPAYLOAD_LINUX \
-  GRUB_DISABLE_OS_PROBER
+  GRUB_DISABLE_OS_PROBER \
+  GRUB_INIT_TUNE
 
 if test "x${grub_cfg}" != "x"; then
   rm -f ${grub_cfg}.new

diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in
index a7b051dafd87c28567bcc672f552b217d8803077..c86f7b867640f7e058c3be6fa0823313678cd596 100644 (file)
--- a/util/grub.d/00_header.in
+++ b/util/grub.d/00_header.in
@@ -158,3 +158,11 @@ else
 set timeout=${GRUB_TIMEOUT}
 EOF
 fi
+
+# Play an initial tune
+if [ "x${GRUB_INIT_TUNE}" != "x" ] ; then
+  cat << EOF
+insmod play
+play ${GRUB_INIT_TUNE}
+EOF
+fi