From: Vladimir Serbinenko Date: Mon, 18 Nov 2013 13:54:01 +0000 (+0100) Subject: Merge branch 'master' of git.sv.gnu.org:/srv/git/grub X-Git-Tag: grub-2.02-beta1~275 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4d5b72cdb4c92675e0c43ee264340b4a5fd15a0d;p=thirdparty%2Fgrub.git Merge branch 'master' of git.sv.gnu.org:/srv/git/grub --- 4d5b72cdb4c92675e0c43ee264340b4a5fd15a0d diff --cc ChangeLog index 959db45df,409fc70ef..fec4dc731 --- a/ChangeLog +++ b/ChangeLog @@@ -1,40 -1,9 +1,46 @@@ + 2013-11-18 Colin Watson + + * grub-core/osdep/unix/hostdisk.c (grub_util_make_temporary_file): + Handle errors from mkstemp. + (grub_util_make_temporary_dir): Handle errors from mkdtemp. + +2013-11-18 Vladimir Serbinenko + + * tests/util/grub-shell.in: Use -cdrom and don't force cdrom + on primary master on pseries. + +2013-11-18 Vladimir Serbinenko + + * grub-core/tests/videotest_checksum.c: Don't reload unifont if it's + already loaded. This saves memory needed for tests, + +2013-11-18 Vladimir Serbinenko + + * util/grub-mkrescue.c (main): Fix a typo to make yeeloong part + work again. + +2013-11-18 Vladimir Serbinenko + + * grub-core/term/terminfo.c (grub_cmd_terminfo): Fix a typo to make -g + work again. + +2013-11-18 Vladimir Serbinenko + + * tests/util/grub-shell.in: For powerpc tests put the CD-ROM as primary + master since with some combinations of qemu and firmware only primary + IDE channel is available. + +2013-11-18 Vladimir Serbinenko + + * grub-core/tests/gfxterm_menu.c: Skip high-resolution tests on + low-memory platforms where we don't have enough memory for them. + * grub-core/tests/videotest_checksum.c: Likewise. + +2013-11-18 Vladimir Serbinenko + + * grub-core/tests/cmdline_cat_test.c: Don't reload unifont if it's + already loaded. This saves memory needed for tests, + 2013-11-18 Vladimir Serbinenko Fix handling of install lists.