From 93d8479b705edb45237b31b0d9e77518d2591f1d Mon Sep 17 00:00:00 2001 From: Vladimir 'phcoder' Serbinenko Date: Sun, 16 Jun 2013 04:06:41 +0200 Subject: [PATCH] Don't try to detect cbfs on *-emu. --- ChangeLog | 4 ++++ grub-core/fs/cbfs.c | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 89020ed6e..8208b09d7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2013-06-16 Vladimir Serbinenko + + Don't try to detect cbfs on *-emu. + 2013-06-16 Vladimir Serbinenko * grub-core/term/gfxterm.c: USe right background color when scrolling. diff --git a/grub-core/fs/cbfs.c b/grub-core/fs/cbfs.c index d1631f152..e298db362 100644 --- a/grub-core/fs/cbfs.c +++ b/grub-core/fs/cbfs.c @@ -260,7 +260,7 @@ grub_cbfs_close (grub_file_t file) 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 grub_off_t cbfsdisk_size = 0; @@ -367,7 +367,7 @@ static struct grub_fs grub_cbfs_fs = { 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 (); #endif grub_fs_register (&grub_cbfs_fs); @@ -376,7 +376,7 @@ GRUB_MOD_INIT (cbfs) GRUB_MOD_FINI (cbfs) { 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 (); #endif }