aboutsummaryrefslogtreecommitdiffstats
path: root/com32/mboot/map.c
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2010-05-11 12:28:28 -0700
committerH. Peter Anvin <hpa@zytor.com>2010-05-11 12:28:28 -0700
commitff13f1a61f86059c2d165c9fb59622dec5ca5f58 (patch)
tree20d7849902b13a569c5faaccf6ee95f6d6feebd4 /com32/mboot/map.c
parent8d43bf742fc263177d39a8d408638eed408bc076 (diff)
parent9c2b6b0e10289a6d22792b07257d86d1af2fe005 (diff)
downloadsyslinux-ff13f1a61f86059c2d165c9fb59622dec5ca5f58.tar.gz
syslinux-ff13f1a61f86059c2d165c9fb59622dec5ca5f58.tar.xz
syslinux-ff13f1a61f86059c2d165c9fb59622dec5ca5f58.zip
Merge branch 'master' into pathbased
Diffstat (limited to 'com32/mboot/map.c')
-rw-r--r--com32/mboot/map.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/com32/mboot/map.c b/com32/mboot/map.c
index a32f9b3b..267e50c8 100644
--- a/com32/mboot/map.c
+++ b/com32/mboot/map.c
@@ -151,6 +151,10 @@ struct multiboot_header *map_image(void *ptr, size_t len)
!eh->e_phnum || eh->e_phoff + eh->e_phentsize * eh->e_phnum > len)
eh = NULL; /* No valid ELF header found */
+ /* Is this a Solaris kernel? */
+ if (!set.solaris && eh && kernel_is_solaris(eh))
+ opt.solaris = true;
+
/*
* Note: the Multiboot Specification implies that AOUT_KLUDGE should
* have precedence over the ELF header. However, Grub disagrees, and