]> git.ipfire.org Git - thirdparty/grub.git/commitdiff
Disable kfreebsd bootcheck on qemu and multiboot
authorVladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Sun, 29 Aug 2010 00:29:01 +0000 (02:29 +0200)
committerVladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Sun, 29 Aug 2010 00:29:01 +0000 (02:29 +0200)
Makefile.am

index fc3d273f22c5ed5a23e1ba52df8a6c44fb25a15f..1cf2297bd01a143db3f326b5540d1b0bbd42a540 100644 (file)
@@ -272,12 +272,16 @@ endif
 
 if !COND_i386_coreboot
 # Crashes because memory at 0-0x1000 is occupied
-BOOTCHECKS += bootcheck-kfreebsd-x86_64
-# Likewise.
 BOOTCHECKS += bootcheck-knetbsd-x86_64
 
+# Likewise and require ACPI.
+if !COND_i386_multiboot
+if !COND_i386_qemu
+BOOTCHECKS += bootcheck-kfreebsd-x86_64
 BOOTCHECKS += bootcheck-kfreebsd-i386
 endif
+endif
+endif
 
 BOOTCHECKS += bootcheck-kfreebsd-aout