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

Don't try to detect cbfs on *-emu.

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2013-06-16 04:06:41 +02:00
parent 837222cc30
commit 93d8479b70
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
2013-06-16 Vladimir Serbinenko <phcoder@gmail.com>
Don't try to detect cbfs on *-emu.
2013-06-16 Vladimir Serbinenko <phcoder@gmail.com> 2013-06-16 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/term/gfxterm.c: USe right background color when scrolling. * grub-core/term/gfxterm.c: USe right background color when scrolling.

6
grub-core/fs/cbfs.c
View file

@ -260,7 +260,7 @@ grub_cbfs_close (grub_file_t file)
return grub_errno; return grub_errno;
} }
#if (defined (__i386__) || defined (__x86_64__)) && !defined (GRUB_UTIL) #if (defined (__i386__) || defined (__x86_64__)) && !defined (GRUB_UTIL) && !defined (GRUB_MACHINE_EMU)
static char *cbfsdisk_addr; static char *cbfsdisk_addr;
static grub_off_t cbfsdisk_size = 0; static grub_off_t cbfsdisk_size = 0;
@ -367,7 +367,7 @@ static struct grub_fs grub_cbfs_fs = {
GRUB_MOD_INIT (cbfs) GRUB_MOD_INIT (cbfs)
{ {
#if (defined (__i386__) || defined (__x86_64__)) && !defined (GRUB_UTIL) #if (defined (__i386__) || defined (__x86_64__)) && !defined (GRUB_UTIL) && !defined (GRUB_MACHINE_EMU)
init_cbfsdisk (); init_cbfsdisk ();
#endif #endif
grub_fs_register (&grub_cbfs_fs); grub_fs_register (&grub_cbfs_fs);
@ -376,7 +376,7 @@ GRUB_MOD_INIT (cbfs)
GRUB_MOD_FINI (cbfs) GRUB_MOD_FINI (cbfs)
{ {
grub_fs_unregister (&grub_cbfs_fs); grub_fs_unregister (&grub_cbfs_fs);
#if (defined (__i386__) || defined (__x86_64__)) && !defined (GRUB_UTIL) #if (defined (__i386__) || defined (__x86_64__)) && !defined (GRUB_UTIL) && !defined (GRUB_MACHINE_EMU)
fini_cbfsdisk (); fini_cbfsdisk ();
#endif #endif
} }