grub2-efi-ubuntu/ubuntu_quiet_grub_loading.patch

   1 Description: Suppress "GRUB loading" message unless Shift is held down
   2  Upstream doesn't want this, as it makes debugging harder.  Ubuntu wants it
   3  to provide a cleaner boot experience.
   4 Author: Colin Watson <cjwatson@ubuntu.com>
   5 Forwarded: not-needed
   6 Last-Update: 2011-01-05
   7
   8 Index: b/grub-core/boot/i386/pc/boot.S
   9 ===================================================================
  10 --- a/grub-core/boot/i386/pc/boot.S
  11 +++ b/grub-core/boot/i386/pc/boot.S
  12 @@ -19,6 +19,7 @@
  13
  14  #include <grub/symbol.h>
  15  #include <grub/boot.h>
  16 +#include <grub/machine/memory.h>
  17  #include <grub/machine/boot.h>
  18
  19  /*
  20 @@ -151,9 +152,15 @@
  21         /* save drive reference first thing! */
  22         pushw   %dx
  23
  24 +       /* is either shift key held down? */
  25 +       movw    $(GRUB_MEMORY_MACHINE_BIOS_DATA_AREA_ADDR + 0x17), %bx
  26 +       andb    $3, (%bx)
  27 +       jz      2f
  28 +
  29         /* print a notification message on the screen */
  30         MSG(notification_string)
  31
  32 +2:
  33         /* set %si to the disk address packet */
  34         movw    $disk_address_packet, %si
  35
  36 Index: b/grub-core/boot/i386/pc/diskboot.S
  37 ===================================================================
  38 --- a/grub-core/boot/i386/pc/diskboot.S
  39 +++ b/grub-core/boot/i386/pc/diskboot.S
  40 @@ -17,6 +17,7 @@
  41   */
  42
  43  #include <grub/symbol.h>
  44 +#include <grub/machine/memory.h>
  45  #include <grub/machine/boot.h>
  46
  47  /*
  48 @@ -24,6 +25,7 @@
  49   */
  50
  51  #define MSG(x) movw $x, %si; call LOCAL(message)
  52 +#define SILENT(x)      call LOCAL(check_silent); jz LOCAL(x)
  53
  54         .file   "diskboot.S"
  55
  56 @@ -50,11 +52,14 @@
  57         /* save drive reference first thing! */
  58         pushw   %dx
  59
  60 +       SILENT(after_notification_string)
  61 +
  62         /* print a notification message on the screen */
  63         pushw   %si
  64         MSG(notification_string)
  65         popw    %si
  66
  67 +LOCAL(after_notification_string):
  68         /* this sets up for the first run through "bootloop" */
  69         movw    $(firstlist - GRUB_BOOT_MACHINE_LIST_SIZE), %di
  70
  71 @@ -279,7 +284,10 @@
  72         /* restore addressing regs and print a dot with correct DS
  73            (MSG modifies SI, which is saved, and unused AX and BX) */
  74         popw    %ds
  75 +       SILENT(after_notification_step)
  76         MSG(notification_step)
  77 +
  78 +LOCAL(after_notification_step):
  79         popa
  80
  81         /* check if finished with this dataset */
  82 @@ -295,8 +303,11 @@
  83  /* END OF MAIN LOOP */
  84
  85  LOCAL(bootit):
  86 +       SILENT(after_notification_done)
  87         /* print a newline */
  88         MSG(notification_done)
  89 +
  90 +LOCAL(after_notification_done):
  91         popw    %dx     /* this makes sure %dl is our "boot" drive */
  92         ljmp    $0, $(GRUB_BOOT_MACHINE_KERNEL_ADDR + 0x200)
  93
  94 @@ -320,6 +331,12 @@
  95  /* go here when you need to stop the machine hard after an error condition */
  96  LOCAL(stop):   jmp     LOCAL(stop)
  97
  98 +LOCAL(check_silent):
  99 +       /* is either shift key held down? */
 100 +       movw    $(GRUB_MEMORY_MACHINE_BIOS_DATA_AREA_ADDR + 0x17), %bx
 101 +       andb    $3, (%bx)
 102 +       ret
 103 +
 104  notification_string:   .asciz "loading"
 105
 106  notification_step:     .asciz "."