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

add verbose information to linux platform check

Browse source 
As suggested by Vladimir Serbienko, add additional verbose output to inform
why we selected this specific platform.
This commit is contained in:
Andrey Borzenkov 2013-12-16 23:17:40 +04:00
parent 35248820ea
commit 840a2c0592
2 changed files with 19 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2013-12-16 Andrey Borzenkov <arvidjaar@gmail.com>
* grub-core/osdep/linux/platform.c (grub_install_get_default_x86_platform):
Add verbose information which firmware directories were tried.
2013-12-16 Andrey Borzenkov <arvidjaar@gmail.com> 2013-12-16 Andrey Borzenkov <arvidjaar@gmail.com>
* grub-core/osdep/unix/exec.c (grub_util_exec_redirect_all): New * grub-core/osdep/unix/exec.c (grub_util_exec_redirect_all): New

14
grub-core/osdep/linux/platform.c
View file

@ -20,6 +20,7 @@
#include <grub/util/install.h> #include <grub/util/install.h>
#include <grub/emu/exec.h> #include <grub/emu/exec.h>
#include <grub/emu/misc.h>
#include <sys/types.h> #include <sys/types.h>
#include <dirent.h> #include <dirent.h>
#include <string.h> #include <string.h>
@ -71,15 +72,24 @@ grub_install_get_default_x86_platform (void)
*/ */
grub_util_exec_redirect_all ((const char * []){ "modprobe", "efivars", NULL }, grub_util_exec_redirect_all ((const char * []){ "modprobe", "efivars", NULL },
NULL, NULL, "/dev/null"); NULL, NULL, "/dev/null");
grub_util_info ("Looking for /sys/firmware/efi ..");
if (is_not_empty_directory ("/sys/firmware/efi")) if (is_not_empty_directory ("/sys/firmware/efi"))
{ {
grub_util_info ("...found");
if (is_64_kernel ()) if (is_64_kernel ())
return "x86_64-efi"; return "x86_64-efi";
else else
return "i386-efi"; return "i386-efi";
} }
else if (is_not_empty_directory ("/proc/device-tree"))
grub_util_info ("... not found. Looking for /proc/device-tree ..");
if (is_not_empty_directory ("/proc/device-tree"))
{
grub_util_info ("...found");
return "i386-ieee1275"; return "i386-ieee1275";
else }
grub_util_info ("... not found");
return "i386-pc"; return "i386-pc";
} }