package/boot/grub/grub-0.93-graphics-bootterm.patch

   1 # --- T2-COPYRIGHT-NOTE-BEGIN ---
   2 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
   3 #
   4 # T2 SDE: package/.../grub/grub-0.93-graphics-bootterm.patch
   5 # Copyright (C) 2004 - 2005 The T2 SDE Project
   6 #
   7 # More information can be found in the files COPYING and README.
   8 #
   9 # This patch file is dual-licensed. It is available under the license the
  10 # patched project is licensed under, as long as it is an OpenSource license
  11 # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
  12 # of the GNU General Public License as published by the Free Software
  13 # Foundation; either version 2 of the License, or (at your option) any later
  14 # version.
  15 # --- T2-COPYRIGHT-NOTE-END ---
  16 --- grub-0.93/stage2/builtins.c.bootterm        2002-12-29 02:01:50.000000000 -0500
  17 +++ grub-0.93/stage2/builtins.c 2002-12-29 02:01:07.000000000 -0500
  18 @@ -233,12 +233,22 @@
  19  static int
  20  boot_func (char *arg, int flags)
  21  {
  22 +  struct term_entry *prev_term = current_term;
  23    /* Clear the int15 handler if we can boot the kernel successfully.
  24       This assumes that the boot code never fails only if KERNEL_TYPE is
  25       not KERNEL_TYPE_NONE. Is this assumption is bad?  */
  26    if (kernel_type != KERNEL_TYPE_NONE)
  27      unset_int15_handler ();
  28
  29 +  /* if our terminal needed initialization, we should shut it down
  30 +   * before booting the kernel, but we want to save what it was so
  31 +   * we can come back if needed */
  32 +  if (current_term->shutdown)
  33 +    {
  34 +      (*current_term->shutdown)();
  35 +      current_term = term_table; /* assumption: console is first */
  36 +    }
  37 +
  38  #ifdef SUPPORT_NETBOOT
  39    /* Shut down the networking.  */
  40    cleanup_net ();
  41 @@ -302,6 +312,13 @@
  42        return 1;
  43      }
  44
  45 +  /* if we get back here, we should go back to what our term was before */
  46 +  current_term = prev_term;
  47 +  if (current_term->startup)
  48 +      /* if our terminal fails to initialize, fall back to console since
  49 +       * it should always work */
  50 +      if ((*current_term->startup)() == 0)
  51 +          current_term = term_table; /* we know that console is first */
  52    return 0;
  53  }
  54