mirror of
				https://git.proxmox.com/git/grub2
				synced 2025-11-04 08:48:29 +00:00 
			
		
		
		
	* commands/blocklist.c: Add include file <grub/command.h>, remove <grub/normal.h> and <grub/arg.h>. (grub_cmd_blocklist): Use the new command interface. (GRUB_MOD_INIT): Likewise. (GRUB_MOD_FINI): Likewise. * commands/boot.c: Likewise. * commands/cat.c: Likewise. * commands/cmp.c: Likewise. * commands/configfile.c: Likewise. * commands/crc.c: Likewise. * commands/echo.c: Likewise. * commands/halt.c: Likewise. * commands/handler.c: Likewise. * commands/hdparm.c: Likewise. * commands/help.c: Likewise. * commands/hexdump.c: Likewise. * commands/loadenv.c: Likewise. * commands/ls.c: Likewise. * commands/lsmmap.c: Likewise. * commands/lspci.c: Likewise. * commands/loadenv.c: Likewise. * commands/read.c: Likewise. * commands/reboot.c: Likewise. * commands/search.c: Likewise. * commands/sleep.c: Likewise. * commands/test.c: Likewise. * commands/usbtest.c: Likewise. * commands/videotest.c: Likewise. * commands/i386/cpuid.c: Likewise. * commands/i386/pc/halt.c: Likewise. * commands/i386/pc/play.c: Likewise. * commands/i386/pc/pxecmd.c: Likewise. * commands/i386/pc/vbeinfo.c: Likewise. * commands/i386/pc/vbetest.c: Likewise. * commands/ieee1275/suspend.c: Likewise. * disk/loopback.c: Likewise. * font/font_cmd.c: Likewise. * hello/hello.c: Likewise. * loader/efi/appleloader.c: Likewise. * loader/efi/chainloader.c: Likewise. * loader/i386/bsd.c: Likewise. * loader/i386/efi/linux.c: Likewise. * loader/i386/ieee1275/linux.c: Likewise. * loader/i386/linux.c: Likewise. * loader/i386/pc/chainloader.c: Likewise. * loader/i386/pc/linux.c: Likewise. * loader/powerpc/ieee1275/linux.c: Likewise. * loader/multiboot_loader.c: Likewise. * term/gfxterm.c: Likewise. * term/i386/pc/serial.c: Likewise. * term/terminfo.c: Likewise. * term/i386/pc/vesafb.c: Removed <grub/arg.h>. * term/i386/pc/vga.c: Likewise. * video/readers/jpeg.c: Likewise. * video/readers/png.c: Likewise. * video/readers/tga.c: Likewise. * util/grub-fstest (cmd_loopback): Removed. (cmd_blocklist): Likewise. (cmd_ls): Likewise. (grub_register_command): Likewise. (grub_unregister_command): Likewise. (execute_command): Use grub_command_find to locate command and execute it. * include/grub/efi/chainloader.h: Removed. * loader/efi/chainloader_normal.c: Likewise. * loader/i386/bsd_normal.c: Likewise. * loader/i386/pc/chainloader_normal.c: Likewise. * loader/i386/pc/multiboot_normal.c: Likewise. * loader/linux_normal.c: Likewise. * loader/multiboot_loader_normal.c: Likewise. * loader/powerpc/ieee1275/linux_normal.c: Likewise. * gencmdlist.sh: Scan new registration command grub_register_extcmd and grub_register_command_p1. * conf/common.rmk (grub_fstest_SOURCES): Add kern/list.c, kern/command.c, lib/arg.c and commands/extcmd.c. (pkglib_MODULES): Remove boot.mod, and minicmd.mod and extcmd.mod. (minicmd_mod_SOURCES): New variable. (minicmd_mod_CFLAGS): Likewise. (minicmd_mod_LDFLAGS): Likewise. (extcmd_mod_SOURCES): Likewise. (extcmd_mod_CFLAGS): Likewise. (extcmd_mod_LDFLAGS): Likewise. (boot_mod_SOURCES): Removed. (boot_mod_CFLAGS): Likewise. (boot_mod_LDFLAGS): Likewise. * conf/i386-pc.rmk (kernel_img_SOURCES): Add kern/command.c and kern/corecmd.c. (kernel_img_HEADERS): Add command.h. (grub_emu_SOURCES): Remove commands/boot.c and normal/arg.c, add commands/minicmd.c, kern/command.c, kern/corecmd.c, commands/extcmd.c and lib/arg.c. (pkglib_MODULES): Change _linux.mod, _chain.mod, _bsd.mod and _multiboot.mod as linux.mod, chain.mod, bsd.mod and multiboot.mod, remove the corresponding normal mode command. (normal_mod_SOURCES): Remove normal/arg.c. * conf/i386-coreboot.rmk: Likewise. * conf/i386-efi.rmk: Likewise. * conf/i386-ieee1275.rmk: Likewise. * conf/powerpc-ieee1275.rmk: Likewise. * conf/x86_64-efi.rmk: Likewise. * include/grub/arg.h: Move from here ... * include/grub/lib/arg.h: ... to here. * normal/arg.c: Move from here ... * lib/arg.c: ... to here. * commands/extcmd.c: New file. * commands/minicmd.c: Likewise. * include/grub/command.h: Likewise. * include/grub/extcmd.h: Likewise. * kern/command.c: Likewise. * kern/corecmd.c: Likewise. * kern/list.c (grub_list_iterate): Return int instead of void. (grub_list_insert): New function. (grub_prio_list_insert): Likewise. * kern/rescue.c (grub_rescue_command): Removed. (grub_rescue_command_list): Likewise. (grub_rescue_register_command): Likewise. (grub_rescue_unregister_command): Likewise. (grub_rescue_cmd_boot): Move to minicmd.c (grub_rescue_cmd_help): Likewise. (grub_rescue_cmd_info): Likewise. (grub_rescue_cmd_boot): Likewise. (grub_rescue_cmd_testload): Likewise. (grub_rescue_cmd_dump): Likewise. (grub_rescue_cmd_rmmod): Likewise. (grub_rescue_cmd_lsmod): Likewise. (grub_rescue_cmd_exit): Likewise. (grub_rescue_print_devices): Moved to corecmd.c. (grub_rescue_print_files): Likewise. (grub_rescue_cmd_ls): Likewise. (grub_rescue_cmd_insmod): Likewise. (grub_rescue_cmd_set): Likewise. (grub_rescue_cmd_unset): Likewise. (attemp_normal_mode): Use grub_command_find to get normal module. (grub_enter_rescue_mode): Use grub_register_core_commands to register commands, remove grub_rescue_regiter_command calls. * normal/command.c (grub_regiser_command): Removed. (grub_unregister_command): Likewise. (grub_command_find): Likewise. (grub_iterate_commands): Likewise. (rescue_command): Likewise. (export_command): Moved to corecmd.c. (set_command): Removed. (unset_command): Likewise. (insmod_command): Likewise. (rmmod_command): Likewise. (lsmod_command): Likewise. (grub_command_init): Likewise. * normal/completion.c (iterate_command): Use cmd->prio to check for active command. (complete_arguments): Use grub_extcmd_t structure to find options. (grub_normal_do_completion): Change function grub_iterate_commands to grub_command_iterate. * normal/execute.c (grub_script_execute_cmd): No need to parse argument here. * normal/main.c (grub_dyncmd_dispatcher): New function. (read_command_list): Register unload commands as dyncmd. (grub_cmd_normal): Use new command interface, register rescue, unregister normal at entry, register normal, unregister rescue at exit. * include/grub/list.h (grub_list_test_t): New type. (grub_list_iterate): Return int instead of void. (grub_list_insert): New function. (GRUB_AS_NAMED_LIST_P): New macro. (GRUB_AS_PRIO_LIST): Likewise. (GRUB_AS_PRIO_LIST_P): Likewise. (GRUB_PRIO_LIST_PRIO_MASK): New constant. (GRUB_PRIO_LIST_FLAG_ACTIVE): Likewise. (grub_prio_list): New structure. (grub_prio_list_insert): New function. (grub_prio_list_remove): New inline function. * include/grub/normal.h: Remove <grub/arg.h>, add <grub/command.h>. (GRUB_COMMAND_FLAG_CMDLINE): Moved to command.h. (GRUB_COMMAND_FLAG_MENU): Likewise. (GRUB_COMMAND_FLAG_BOTH): Likewise. (GRUB_COMMAND_FLAG_TITLE): Likewise. (GRUB_COMMAND_FLAG_NO_ECHO): Likewise. (GRUB_COMMAND_FLAG_NO_ARG_PARSE): Removed. (GRUB_COMMAND_FLAG_NOT_LOADED): Likewise. (grub_command): Likewise. (grub_register_command): Likewise. (grub_command_find): Likewise. (grub_iterate_commands): Likewise. (grub_command_init): Likewise. (grub_arg_parse): Likewise. (grub_arg_show_help): Likewise. * include/grub/rescue.h (grub_rescue_register_command): Removed. (grub_rescue_unregister_command): Likewise. * include/grub/i386/bsd.h: Remove grub_rescue_cmd_freebsd, grub_rescue_cmd_openbsd, grub_rescue_cmd_netbsd, grub_rescue_cmd_freebsd_loadenv and grub_rescue_cmd_freebsd_module. * include/grub/i386/efi/loader.h: Remove grub_rescue_cmd_linux and grub_rescue_cmd_initrd. * include/grub/i386/loader.h: Likewise. * include/grub/x86_64/loader.h: Likewise. * include/grub/i386/pc/chainloader.h: Remove grub_chainloader_cmd.
		
			
				
	
	
		
			219 lines
		
	
	
		
			5.6 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			219 lines
		
	
	
		
			5.6 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
/* appleloader.c - apple legacy boot loader.  */
 | 
						|
/*
 | 
						|
 *  GRUB  --  GRand Unified Bootloader
 | 
						|
 *  Copyright (C) 2008  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
 | 
						|
 *  the Free Software Foundation, either version 3 of the License, or
 | 
						|
 *  (at your option) any later version.
 | 
						|
 *
 | 
						|
 *  GRUB is distributed in the hope that it will be useful,
 | 
						|
 *  but WITHOUT ANY WARRANTY; without even the implied warranty of
 | 
						|
 *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 | 
						|
 *  GNU General Public License for more details.
 | 
						|
 *
 | 
						|
 *  You should have received a copy of the GNU General Public License
 | 
						|
 *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
 | 
						|
 */
 | 
						|
 | 
						|
#include <grub/loader.h>
 | 
						|
#include <grub/err.h>
 | 
						|
#include <grub/mm.h>
 | 
						|
#include <grub/dl.h>
 | 
						|
#include <grub/misc.h>
 | 
						|
#include <grub/efi/api.h>
 | 
						|
#include <grub/efi/efi.h>
 | 
						|
#include <grub/command.h>
 | 
						|
 | 
						|
static grub_dl_t my_mod;
 | 
						|
 | 
						|
static grub_efi_handle_t image_handle;
 | 
						|
static grub_efi_char16_t *cmdline;
 | 
						|
 | 
						|
static grub_err_t
 | 
						|
grub_appleloader_unload (void)
 | 
						|
{
 | 
						|
  grub_efi_boot_services_t *b;
 | 
						|
 | 
						|
  b = grub_efi_system_table->boot_services;
 | 
						|
  efi_call_1 (b->unload_image, image_handle);
 | 
						|
 | 
						|
  grub_free (cmdline);
 | 
						|
  cmdline = 0;
 | 
						|
 | 
						|
  grub_dl_unref (my_mod);
 | 
						|
  return GRUB_ERR_NONE;
 | 
						|
}
 | 
						|
 | 
						|
static grub_err_t
 | 
						|
grub_appleloader_boot (void)
 | 
						|
{
 | 
						|
  grub_efi_boot_services_t *b;
 | 
						|
 | 
						|
  b = grub_efi_system_table->boot_services;
 | 
						|
  efi_call_3 (b->start_image, image_handle, 0, 0);
 | 
						|
 | 
						|
  grub_appleloader_unload ();
 | 
						|
 | 
						|
  return grub_errno;
 | 
						|
}
 | 
						|
 | 
						|
/* early 2006 Core Duo / Core Solo models  */
 | 
						|
static grub_uint8_t devpath_1[] =
 | 
						|
{
 | 
						|
  0x01, 0x03, 0x18, 0x00, 0x0B, 0x00, 0x00, 0x00,
 | 
						|
  0x00, 0x00, 0xE0, 0xFF, 0x00, 0x00, 0x00, 0x00,
 | 
						|
  0xFF, 0xFF, 0xF9, 0xFF, 0x00, 0x00, 0x00, 0x00,
 | 
						|
  0x04, 0x06, 0x14, 0x00, 0xEB, 0x85, 0x05, 0x2B,
 | 
						|
  0xB8, 0xD8, 0xA9, 0x49, 0x8B, 0x8C, 0xE2, 0x1B,
 | 
						|
  0x01, 0xAE, 0xF2, 0xB7, 0x7F, 0xFF, 0x04, 0x00,
 | 
						|
};
 | 
						|
 | 
						|
/* mid-2006 Mac Pro (and probably other Core 2 models)  */
 | 
						|
static grub_uint8_t devpath_2[] =
 | 
						|
{
 | 
						|
  0x01, 0x03, 0x18, 0x00, 0x0B, 0x00, 0x00, 0x00,
 | 
						|
  0x00, 0x00, 0xE0, 0xFF, 0x00, 0x00, 0x00, 0x00,
 | 
						|
  0xFF, 0xFF, 0xF7, 0xFF, 0x00, 0x00, 0x00, 0x00,
 | 
						|
  0x04, 0x06, 0x14, 0x00, 0xEB, 0x85, 0x05, 0x2B,
 | 
						|
  0xB8, 0xD8, 0xA9, 0x49, 0x8B, 0x8C, 0xE2, 0x1B,
 | 
						|
  0x01, 0xAE, 0xF2, 0xB7, 0x7F, 0xFF, 0x04, 0x00,
 | 
						|
};
 | 
						|
 | 
						|
/* mid-2007 MBP ("Santa Rosa" based models)  */
 | 
						|
static grub_uint8_t devpath_3[] =
 | 
						|
{
 | 
						|
  0x01, 0x03, 0x18, 0x00, 0x0B, 0x00, 0x00, 0x00,
 | 
						|
  0x00, 0x00, 0xE0, 0xFF, 0x00, 0x00, 0x00, 0x00,
 | 
						|
  0xFF, 0xFF, 0xF8, 0xFF, 0x00, 0x00, 0x00, 0x00,
 | 
						|
  0x04, 0x06, 0x14, 0x00, 0xEB, 0x85, 0x05, 0x2B,
 | 
						|
  0xB8, 0xD8, 0xA9, 0x49, 0x8B, 0x8C, 0xE2, 0x1B,
 | 
						|
  0x01, 0xAE, 0xF2, 0xB7, 0x7F, 0xFF, 0x04, 0x00,
 | 
						|
};
 | 
						|
 | 
						|
/* early-2008 MBA  */
 | 
						|
static grub_uint8_t devpath_4[] =
 | 
						|
{
 | 
						|
  0x01, 0x03, 0x18, 0x00, 0x0B, 0x00, 0x00, 0x00,
 | 
						|
  0x00, 0x00, 0xC0, 0xFF, 0x00, 0x00, 0x00, 0x00,
 | 
						|
  0xFF, 0xFF, 0xF8, 0xFF, 0x00, 0x00, 0x00, 0x00,
 | 
						|
  0x04, 0x06, 0x14, 0x00, 0xEB, 0x85, 0x05, 0x2B,
 | 
						|
  0xB8, 0xD8, 0xA9, 0x49, 0x8B, 0x8C, 0xE2, 0x1B,
 | 
						|
  0x01, 0xAE, 0xF2, 0xB7, 0x7F, 0xFF, 0x04, 0x00,
 | 
						|
};
 | 
						|
 | 
						|
/* late-2008 MB/MBP (NVidia chipset)  */
 | 
						|
static grub_uint8_t devpath_5[] = {
 | 
						|
    0x01, 0x03, 0x18, 0x00, 0x0B, 0x00, 0x00, 0x00,
 | 
						|
    0x00, 0x40, 0xCB, 0xFF, 0x00, 0x00, 0x00, 0x00,
 | 
						|
    0xFF, 0xBF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00,
 | 
						|
    0x04, 0x06, 0x14, 0x00, 0xEB, 0x85, 0x05, 0x2B,
 | 
						|
    0xB8, 0xD8, 0xA9, 0x49, 0x8B, 0x8C, 0xE2, 0x1B,
 | 
						|
    0x01, 0xAE, 0xF2, 0xB7, 0x7F, 0xFF, 0x04, 0x00,
 | 
						|
};
 | 
						|
 | 
						|
struct devdata
 | 
						|
{
 | 
						|
  char *model;
 | 
						|
  grub_efi_device_path_t *devpath;
 | 
						|
};
 | 
						|
 | 
						|
struct devdata devs[] =
 | 
						|
{
 | 
						|
  {"Core Duo/Solo", (grub_efi_device_path_t *) devpath_1},
 | 
						|
  {"Mac Pro", (grub_efi_device_path_t *) devpath_2},
 | 
						|
  {"MBP", (grub_efi_device_path_t *) devpath_3},
 | 
						|
  {"MBA", (grub_efi_device_path_t *) devpath_4},
 | 
						|
  {"MB NV", (grub_efi_device_path_t *) devpath_5},
 | 
						|
  {NULL, NULL},
 | 
						|
};
 | 
						|
 | 
						|
static grub_err_t
 | 
						|
grub_cmd_appleloader (grub_command_t cmd __attribute__ ((unused)),
 | 
						|
                      int argc, char *argv[])
 | 
						|
{
 | 
						|
  grub_efi_boot_services_t *b;
 | 
						|
  grub_efi_loaded_image_t *loaded_image;
 | 
						|
  struct devdata *pdev;
 | 
						|
 | 
						|
  grub_dl_ref (my_mod);
 | 
						|
 | 
						|
  /* Initialize some global variables.  */
 | 
						|
  image_handle = 0;
 | 
						|
 | 
						|
  b = grub_efi_system_table->boot_services;
 | 
						|
 | 
						|
  for (pdev = devs ; pdev->devpath ; pdev++)
 | 
						|
    if (efi_call_6 (b->load_image, 0, grub_efi_image_handle, pdev->devpath,
 | 
						|
                    NULL, 0, &image_handle) == GRUB_EFI_SUCCESS)
 | 
						|
      break;
 | 
						|
 | 
						|
  if (! pdev->devpath)
 | 
						|
    {
 | 
						|
      grub_error (GRUB_ERR_BAD_OS, "can't find model");
 | 
						|
      goto fail;
 | 
						|
    }
 | 
						|
 | 
						|
  grub_printf ("Model : %s\n", pdev->model);
 | 
						|
 | 
						|
  loaded_image = grub_efi_get_loaded_image (image_handle);
 | 
						|
  if (! loaded_image)
 | 
						|
    {
 | 
						|
      grub_error (GRUB_ERR_BAD_OS, "no loaded image available");
 | 
						|
      goto fail;
 | 
						|
    }
 | 
						|
 | 
						|
  if (argc > 0)
 | 
						|
    {
 | 
						|
      int i, len;
 | 
						|
      grub_efi_char16_t *p16;
 | 
						|
 | 
						|
      for (i = 0, len = 0; i < argc; i++)
 | 
						|
        len += grub_strlen (argv[i]) + 1;
 | 
						|
 | 
						|
      len *= sizeof (grub_efi_char16_t);
 | 
						|
      cmdline = p16 = grub_malloc (len);
 | 
						|
      if (! cmdline)
 | 
						|
        goto fail;
 | 
						|
 | 
						|
      for (i = 0; i < argc; i++)
 | 
						|
        {
 | 
						|
          char *p8;
 | 
						|
 | 
						|
          p8 = argv[i];
 | 
						|
          while (*p8)
 | 
						|
            *(p16++) = *(p8++);
 | 
						|
 | 
						|
          *(p16++) = ' ';
 | 
						|
        }
 | 
						|
      *(--p16) = 0;
 | 
						|
 | 
						|
      loaded_image->load_options = cmdline;
 | 
						|
      loaded_image->load_options_size = len;
 | 
						|
    }
 | 
						|
 | 
						|
  grub_loader_set (grub_appleloader_boot, grub_appleloader_unload, 0);
 | 
						|
 | 
						|
  return 0;
 | 
						|
 | 
						|
 fail:
 | 
						|
 | 
						|
  grub_dl_unref (my_mod);
 | 
						|
  return grub_errno;
 | 
						|
}
 | 
						|
 | 
						|
static grub_command_t cmd;
 | 
						|
 | 
						|
GRUB_MOD_INIT(appleloader)
 | 
						|
{
 | 
						|
  cmd = grub_register_command ("appleloader", grub_cmd_appleloader,
 | 
						|
			       "appleloader [OPTS]", "Boot legacy system.");
 | 
						|
  my_mod = mod;
 | 
						|
}
 | 
						|
 | 
						|
GRUB_MOD_FINI(appleloader)
 | 
						|
{
 | 
						|
  grub_unregister_command (cmd);
 | 
						|
}
 |