2007-06-21 Robert Millan <rmh@aybabtu.com>
* include/grub/i386/pc/kernel.h: Define GRUB_KERNEL_MACHINE_DATA_END to indicate end of data section in kernel image. * include/grub/i386/efi/kernel.h: Define GRUB_KERNEL_MACHINE_PREFIX and GRUB_KERNEL_MACHINE_DATA_END. * kern/i386/pc/startup.S: Do not initialize grub_prefix, only reserve space for it. * kern/i386/efi/startup.S: Likewise. * util/i386/pc/grub-mkimage.c: Initialize grub_prefix to /boot/grub during image generation. Implement --prefix option to override this patch. * util/i386/efi/grub-mkimage.c: Likewise. * util/update-grub_lib.in (convert_system_path_to_grub_path): Split code to make path relative to its root into a separate function. * util/i386/pc/grub-install.in: Use newly provided make_system_path_relative_to_its_root() to convert ${grubdir}, then pass the result to grub-install --prefix.
This commit is contained in:
parent
baa574b487
commit
bf697e2831
7 changed files with 73 additions and 14 deletions
|
@ -45,7 +45,7 @@ _start:
|
|||
. = EXT_C(start) + 0x8
|
||||
|
||||
VARIABLE(grub_prefix)
|
||||
.string "/boot/grub"
|
||||
/* to be filled by grub-mkimage */
|
||||
|
||||
/*
|
||||
* Leave some breathing room for the prefix.
|
||||
|
|
|
@ -96,7 +96,7 @@ VARIABLE(grub_install_dos_part)
|
|||
VARIABLE(grub_install_bsd_part)
|
||||
.long 0xFFFFFFFF
|
||||
VARIABLE(grub_prefix)
|
||||
.string "/boot/grub"
|
||||
/* to be filled by grub-mkimage */
|
||||
|
||||
/*
|
||||
* Leave some breathing room for the prefix.
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue