proxmox-mirrors/grub2
1
0
Fork 0
mirror of https://git.proxmox.com/git/grub2 synced 2025-11-01 02:19:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fall back to i386-pc if booted using EFI but -efi is missing

Browse Source 
It may be possible, particularly in recovery situations, to be booted
using EFI on x86 when only the i386-pc target is installed.  There's
nothing actually stopping us installing i386-pc from an EFI environment,
and it's better than returning a confusing error.

Forwarded: no
Last-Update: 2013-12-20

Patch-Name: install_efi_fallback.patch
This commit is contained in:
Colin Watson 2014-01-13 12:13:05 +00:00 committed by Colin Watson
parent 9862a15899
commit fd99a933c3
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
grub-core/osdep/linux/platform.c
View File

@ -19,10 +19,12 @@
#include <config.h>
#include <grub/util/install.h>
#include <grub/emu/config.h>
#include <grub/emu/exec.h>
#include <grub/emu/misc.h>
#include <sys/types.h>
#include <dirent.h>
#include <stdlib.h>
#include <string.h>
#include <sys/utsname.h>
@ -113,11 +115,24 @@ grub_install_get_default_x86_platform (void)
grub_util_info ("Looking for /sys/firmware/efi ..");
if (is_not_empty_directory ("/sys/firmware/efi"))
{
const char *pkglibdir = grub_util_get_pkglibdir ();
const char *platform;
char *pd;
int found;
grub_util_info ("...found");
if (read_platform_size() == 64)
return "x86_64-efi";
platform = "x86_64-efi";
else
return "i386-efi";
platform = "i386-efi";
pd = grub_util_path_concat (2, pkglibdir, platform);
found = grub_util_is_directory (pd);
free (pd);
if (found)
return platform;
else
grub_util_info ("... but %s platform not available", platform);
}
grub_util_info ("... not found. Looking for /proc/device-tree ..");