2010-01-09 Robert Millan <rmh.grub@aybabtu.com>

	Make loader output a bit more user-friendly.

	* util/grub.d/10_hurd.in: Print message indicating that GNU Mach
	is being loaded.  Likewise for the Hurd.

	* util/grub.d/10_kfreebsd.in (kfreebsd_entry): Print message indicating
	that kernel of FreeBSD ${version} is being loaded.

	* loader/i386/linux.c (grub_cmd_linux): Move debug info to
	grub_dprintf().
	(grub_cmd_initrd): Likewise.
	* util/grub.d/10_linux.in (linux_entry): Print message indicating
	that Linux ${version} is being loaded.  Likewise for initrd.

diff --git a/ChangeLog b/ChangeLog
index 4ebdb2a482a8bd6b1f6da1f0f8d9fb0efd8bbe2d..6f3598e6fd0251a54f05924730dec72ec0781bf5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2010-01-09  Robert Millan  <rmh.grub@aybabtu.com>
+
+       Make loader output a bit more user-friendly.
+
+       * util/grub.d/10_hurd.in: Print message indicating that GNU Mach
+       is being loaded.  Likewise for the Hurd.
+
+       * util/grub.d/10_kfreebsd.in (kfreebsd_entry): Print message indicating
+       that kernel of FreeBSD ${version} is being loaded.
+
+       * loader/i386/linux.c (grub_cmd_linux): Move debug info to
+       grub_dprintf().
+       (grub_cmd_initrd): Likewise.
+       * util/grub.d/10_linux.in (linux_entry): Print message indicating
+       that Linux ${version} is being loaded.  Likewise for initrd.
+
 2010-01-09  Carles Pina i Estany  <carles@pina.cat>
 
        * gettext/gettext.c (GRUB_MOD_INIT): Gettextizze.

diff --git a/loader/i386/linux.c b/loader/i386/linux.c
index 4375a1162933d529b7277abbc7cc29018e67ec5d..7c4b061b8ef80265a503ddd5785ecd981dea8875 100644 (file)
--- a/loader/i386/linux.c
+++ b/loader/i386/linux.c
@@ -1,6 +1,6 @@
 /*
  *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2006,2007,2008,2009  Free Software Foundation, Inc.
+ *  Copyright (C) 2006,2007,2008,2009,2010  Free Software Foundation, Inc.
  *
  *  GRUB is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -713,8 +713,8 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
 
   grub_file_seek (file, real_size + GRUB_DISK_SECTOR_SIZE);
 
-  grub_printf ("   [Linux-bzImage, setup=0x%x, size=0x%x]\n",
-              (unsigned) real_size, (unsigned) prot_size);
+  grub_dprintf ("linux", "bzImage, setup=0x%x, size=0x%x\n",
+               (unsigned) real_size, (unsigned) prot_size);
 
   /* Look for memory size and video mode specified on the command line.  */
   linux_mem_size = 0;
@@ -964,8 +964,8 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
       goto fail;
     }
 
-  grub_printf ("   [Initrd, addr=0x%x, size=0x%x]\n",
-              (unsigned) addr, (unsigned) size);
+  grub_dprintf ("linux", "Initrd, addr=0x%x, size=0x%x\n",
+               (unsigned) addr, (unsigned) size);
 
   lh->ramdisk_image = addr;
   lh->ramdisk_size = size;

diff --git a/util/grub.d/10_hurd.in b/util/grub.d/10_hurd.in
index 19fd8ec2738994a5a1102efb0f1d56905b11b7b5..ff883f46173b6345382e604872e4adc9c50fc46f 100644 (file)
--- a/util/grub.d/10_hurd.in
+++ b/util/grub.d/10_hurd.in
@@ -1,7 +1,7 @@
 #! /bin/sh -e
 
 # grub-mkconfig helper script.
-# Copyright (C) 2006,2007,2008,2009  Free Software Foundation, Inc.
+# Copyright (C) 2006,2007,2008,2009,2010  Free Software Foundation, Inc.
 #
 # GRUB is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -73,16 +73,18 @@ menuentry "${OS}" {
 EOF
 prepare_grub_to_access_device ${GRUB_DEVICE_BOOT} | sed -e "s/^/\t/"
 cat << EOF
-       multiboot ${kernel} root=device:${GRUB_DEVICE#/dev/}
+       echo            $(gettext "Loading GNU Mach ...")
+       multiboot       ${kernel} root=device:${GRUB_DEVICE#/dev/}
 EOF
 prepare_grub_to_access_device ${GRUB_DEVICE} | sed -e "s/^/\t/"
 cat << EOF
-       module /hurd/${hurd_fs}.static ${hurd_fs} --readonly \\
+       echo            $(gettext "Loading the Hurd ...")
+       module          /hurd/${hurd_fs}.static ${hurd_fs} --readonly \\
                        --multiboot-command-line='\${kernel-command-line}' \\
                        --host-priv-port='\${host-port}' \\
                        --device-master-port='\${device-port}' \\
                        --exec-server-task='\${exec-task}' -T typed '\${root}' \\
                        '\$(task-create)' '\$(task-resume)'
-       module /lib/ld.so.1 exec /hurd/exec '\$(exec-task=task-create)'
+       module          /lib/ld.so.1 exec /hurd/exec '\$(exec-task=task-create)'
 }
 EOF

diff --git a/util/grub.d/10_kfreebsd.in b/util/grub.d/10_kfreebsd.in
index 1329bba1ff0d0e84b52230965a92986d37ba241a..0da7cabbcbe0fb04a99ac9b291314772d0872a71 100644 (file)
--- a/util/grub.d/10_kfreebsd.in
+++ b/util/grub.d/10_kfreebsd.in
@@ -1,7 +1,7 @@
 #! /bin/sh -e
 
 # grub-mkconfig helper script.
-# Copyright (C) 2006,2007,2008,2009  Free Software Foundation, Inc.
+# Copyright (C) 2006,2007,2008,2009,2010  Free Software Foundation, Inc.
 #
 # GRUB is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -44,12 +44,13 @@ kfreebsd_entry ()
   fi
   printf '%s\n' "${prepare_boot_cache}"
   cat << EOF
-       kfreebsd                        ${rel_dirname}/${basename}
+       echo                    $(printf "$(gettext "Loading kernel of FreeBSD %s ...")" ${version})
+       kfreebsd                ${rel_dirname}/${basename}
 EOF
 
   if test -n "${devices}" ; then
     cat << EOF
-       kfreebsd_loadenv                ${devices_rel_dirname}/${devices_basename}
+       kfreebsd_loadenv        ${devices_rel_dirname}/${devices_basename}
 EOF
   fi
 

diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
index 5fea5338e8deb6d8d79df4fbe962a41383b965ef..0accf8f238511aef57467b0afe84fdb2a81e3964 100644 (file)
--- a/util/grub.d/10_linux.in
+++ b/util/grub.d/10_linux.in
@@ -1,7 +1,7 @@
 #! /bin/sh -e
 
 # grub-mkconfig helper script.
-# Copyright (C) 2006,2007,2008,2009  Free Software Foundation, Inc.
+# Copyright (C) 2006,2007,2008,2009,2010  Free Software Foundation, Inc.
 #
 # GRUB is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -64,10 +64,12 @@ linux_entry ()
   fi
   printf '%s\n' "${prepare_boot_cache}"
   cat << EOF
+       echo    $(printf "$(gettext "Loading Linux %s ...")" ${version})
        linux   ${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args}
 EOF
   if test -n "${initrd}" ; then
     cat << EOF
+       echo    $(gettext "Loading initial ramdisk ...")
        initrd  ${rel_dirname}/${initrd}
 EOF
   fi