vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

* util/grub-install.in: New option --efi-directory.

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2012-04-18 22:43:55 +02:00
parent b41be5623a
commit c6ca973d4b
2 changed files with 40 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
2012-04-18 Vladimir Serbinenko <phcoder@gmail.com>
* util/grub-install.in: New option --efi-directory.
2012-04-17 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/loader/i386/linux.c (allocate_pages): Overwrite low memory

12
util/grub-install.in
View file

@ -111,6 +111,7 @@ usage () {
print_option_help "--no-nvram" "$(gettext "don't update the \`boot-device' NVRAM variable. This option is only available on IEEE1275 targets.")"
print_option_help "--removable" "$(gettext "the installation device is removable. This option is only available on EFI.")"
print_option_help "--bootloader-id=$(gettext "ID")" "$(gettext "the ID of bootloader. This option is only available on EFI.")"
print_option_help "--efi-directory=$(gettext "DIR")" "$(gettext "use DIR as the EFI System Partition root.")"
echo
gettext "INSTALL_DEVICE must be system device filename.";echo
echo
@ -134,6 +135,7 @@ argument () {
allow_floppy=""
force_file_id=
efidir=
# Check the arguments.
while test $# -gt 0
@ -174,6 +176,11 @@ do
--boot-directory=*)
bootdir="`echo "$option" | sed 's/--boot-directory=//'`" ;;
--efi-directory)
efidir="`argument $option "$@"`"; shift;;
--efi-directory=*)
efidir="`echo "$option" | sed 's/--efi-directory=//'`" ;;
--directory | -d)
source_dir="`argument $option "$@"`"; shift;;
--directory=*)
@ -397,7 +404,9 @@ fi
if [ x"$grub_modinfo_platform" = xefi ]; then
# Find the EFI System Partition.
efidir=
if test -n "$efidir"; then
install_device="`"$grub_probe" --target=device --device-map= "${efidir}"`"
else
if test -d "${bootdir}/efi"; then
install_device="`"$grub_probe" --target=device --device-map= "${bootdir}/efi"`"
# Is it a mount point?
@ -427,6 +436,7 @@ if [ x"$grub_modinfo_platform" = xefi ]; then
efidir=
fi
fi
fi
if test -n "$efidir"; then
# The EFI specification requires that an EFI System Partition must