From: Vladimir Serbinenko Date: Mon, 16 Dec 2013 19:33:19 +0000 (+0100) Subject: Merge branch 'master' of git.sv.gnu.org:/srv/git/grub X-Git-Tag: grub-2.02-beta1~58 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dd05b91f6b9c57a2d2b60fae8d71c9b22213a8e9;p=thirdparty%2Fgrub.git Merge branch 'master' of git.sv.gnu.org:/srv/git/grub --- dd05b91f6b9c57a2d2b60fae8d71c9b22213a8e9 diff --cc ChangeLog index faf8d81d5,92262ceb1..88406393e --- a/ChangeLog +++ b/ChangeLog @@@ -1,7 -1,19 +1,23 @@@ + 2013-12-16 Andrey Borzenkov + + * 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 + + * grub-core/osdep/unix/exec.c (grub_util_exec_redirect_all): New + function to optionally redirect all three standard descriptors. + Redefine grub_util_exec, grub_util_exec_redirect and + grub_util_exec_redirect_null to use it. + * include/grub/emu/exec.h: Define it. + * include/grub/osdep/exec_unix.h: Delete, it is unused. + * grub-core/osdep/linux/platform.c (grub_install_get_default_x86_platform): + Use grub_util_exec_redirect_all to redirect error to NULL. + +2013-12-16 Vladimir Serbinenko + + * grub-core/tests/sleep_test.c: Silence spurious warning. + 2013-12-16 Vladimir Serbinenko Make grub_xen_hypercall on i386 cdecl rather than stdcall to avoid