2009-06-29 Robert Millan <rmh.grub@aybabtu.com>

        * include/grub/i386/linux.h (GRUB_LINUX_FLAG_QUIET): New macro.
        * loader/i386/linux.c (grub_cmd_linux): Recognize "quiet" option,
        and set GRUB_LINUX_FLAG_QUIET appropiately.

diff --git a/ChangeLog b/ChangeLog
index e95431249078bd386ba68289154b7a5d4e234a08..cd45a3b9b1b93428892a6603ec250d5a918bdcc5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-06-29  Robert Millan  <rmh.grub@aybabtu.com>
+
+       * include/grub/i386/linux.h (GRUB_LINUX_FLAG_QUIET): New macro.
+       * loader/i386/linux.c (grub_cmd_linux): Recognize "quiet" option,
+       and set GRUB_LINUX_FLAG_QUIET appropiately.
+
 2009-06-29  Robert Millan  <rmh.grub@aybabtu.com>
 
        Fix build on Debian / sparc.

diff --git a/include/grub/i386/linux.h b/include/grub/i386/linux.h
index 1e601955cfef5c24f74c3a2347439c1588dd28e0..dc6c02e1b21a3e18d81ee8c60108fd2950760cd6 100644 (file)
--- a/include/grub/i386/linux.h
+++ b/include/grub/i386/linux.h
@@ -1,6 +1,6 @@
 /*
  *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 1999,2000,2001,2002,2003,2004,2007,2008  Free Software Foundation, Inc.
+ *  Copyright (C) 1999,2000,2001,2002,2003,2004,2007,2008,2009  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
@@ -21,7 +21,6 @@
 
 #define GRUB_LINUX_MAGIC_SIGNATURE     0x53726448      /* "HdrS" */
 #define GRUB_LINUX_DEFAULT_SETUP_SECTS 4
-#define GRUB_LINUX_FLAG_CAN_USE_HEAP   0x80
 #define GRUB_LINUX_INITRD_MAX_ADDRESS  0x37FFFFFF
 #define GRUB_LINUX_MAX_SETUP_SECTS     64
 #define GRUB_LINUX_BOOT_LOADER_TYPE    0x72
@@ -33,6 +32,8 @@
 #define GRUB_LINUX_SETUP_STACK         0x9000
 
 #define GRUB_LINUX_FLAG_BIG_KERNEL     0x1
+#define GRUB_LINUX_FLAG_QUIET          0x20
+#define GRUB_LINUX_FLAG_CAN_USE_HEAP   0x80
 
 /* Linux's video mode selection support. Actually I hate it!  */
 #define GRUB_LINUX_VID_MODE_NORMAL     0xFFFF

diff --git a/loader/i386/linux.c b/loader/i386/linux.c
index 8737d4a7dc5973cdee4d0a99844c37907a34b1db..e89baaadcbaa91d6276cefaa71b00ac22a0ad960 100644 (file)
--- a/loader/i386/linux.c
+++ b/loader/i386/linux.c
@@ -820,6 +820,11 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
              linux_mem_size <<= shift;
          }
       }
+    else if (grub_memcmp (argv[i], "quiet", sizeof ("quiet") - 1) == 0)
+      {
+       params->loadflags |= GRUB_LINUX_FLAG_QUIET;
+      }
+
 
   /* Specify the boot file.  */
   dest = grub_stpcpy ((char *) real_mode_mem + GRUB_LINUX_CL_OFFSET,