Merge mainline into ofwfb

This commit is contained in:
Vladimir 'phcoder' Serbinenko 2010-02-06 16:01:18 +01:00
commit a1cb3e3811
3 changed files with 10 additions and 9 deletions

View file

@ -1,18 +1,24 @@
2010-02-06 Vladimir Serbinenko <phcoder@gmail.com>
* disk/ieee1275/ofdisk.c (grub_ofdisk_read): Correct error handling.
2010-02-06 Yves Blusseau <blusseau@zetam.org> 2010-02-06 Yves Blusseau <blusseau@zetam.org>
* conf/common.rmk (grub_script_check_SOURCES): add missing dependencies. * conf/common.rmk (grub_script_check_SOURCES): add missing dependencies.
(grub_mkpasswd_pbkdf2_SOURCES): Likewise. (grub_mkpasswd_pbkdf2_SOURCES): Likewise.
2010-02-06 Vladimir Serbinenko <phcoder@gmail.com>
* disk/ieee1275/ofdisk.c (grub_ofdisk_read): Correct error handling.
2010-02-06 Vladimir Serbinenko <phcoder@gmail.com> 2010-02-06 Vladimir Serbinenko <phcoder@gmail.com>
* fs/i386/pc/pxe.c (grub_pxefs_dir): Return with failure on * fs/i386/pc/pxe.c (grub_pxefs_dir): Return with failure on
non-pxe disk. non-pxe disk.
(grub_pxefs_open): Likewise. (grub_pxefs_open): Likewise.
2010-02-06 Robert Millan <rmh.grub@aybabtu.com>
* util/grub.d/10_hurd.in: Add --class information to menuentries.
* util/grub.d/10_kfreebsd.in: Likewise.
* util/grub.d/10_linux.in: Likewise.
2010-02-06 Colin D Bennett <colin@gibibit.com> 2010-02-06 Colin D Bennett <colin@gibibit.com>
* conf/common.rmk (pkglib_MODULES): Add gfxmenu.mod. * conf/common.rmk (pkglib_MODULES): Add gfxmenu.mod.

View file

View file

@ -1,5 +0,0 @@
2010-01-07 Robert Millan <rmh.grub@aybabtu.com>
* util/grub.d/10_hurd.in: Add --class information to menuentries.
* util/grub.d/10_kfreebsd.in: Likewise.
* util/grub.d/10_linux.in: Likewise.