aboutsummaryrefslogtreecommitdiffstats
path: root/com32/gpllib
diff options
context:
space:
mode:
authorPierre-Alexandre Meyer <pierre@ning.com>2009-11-15 23:37:12 -0800
committerPierre-Alexandre Meyer <pierre@ning.com>2009-11-15 23:37:12 -0800
commitaae7ab5399c855519b7c670cc9fb1f395ee14466 (patch)
tree6091d9d8434b58a9e16b66a7e2ec3b5d9dced44d /com32/gpllib
parent15b91c585d359e56ca67de3c132cc17865cab347 (diff)
downloadsyslinux-aae7ab5399c855519b7c670cc9fb1f395ee14466.tar.gz
syslinux-aae7ab5399c855519b7c670cc9fb1f395ee14466.tar.xz
syslinux-aae7ab5399c855519b7c670cc9fb1f395ee14466.zip
gpllib: mbr: add detection for Grub2 minor versions
Grub2 v1.96 and v1.97 have different opcodes in their MBR. Reported-by: gert This fixes #26. Signed-off-by: Pierre-Alexandre Meyer <pierre@ning.com>
Diffstat (limited to 'com32/gpllib')
-rw-r--r--com32/gpllib/disk/mbrs.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/com32/gpllib/disk/mbrs.c b/com32/gpllib/disk/mbrs.c
index c8e8b301..403458c2 100644
--- a/com32/gpllib/disk/mbrs.c
+++ b/com32/gpllib/disk/mbrs.c
@@ -40,8 +40,8 @@ void get_mbr_string(const uint32_t label, char* buffer, const int buffer_size)
case 0xea1e: strncpy(buffer, "Truecrypt Boot Loader", buffer_size - 1); break;
case 0xeb04: strncpy(buffer, "Solaris", buffer_size - 1); break;
case 0xeb48: strncpy(buffer, "Grub", buffer_size - 1); break;
- case 0xeb63:
- case 0xeb4c: strncpy(buffer, "Grub2", buffer_size - 1); break;
+ case 0xeb4c: strncpy(buffer, "Grub2 (v1.96)", buffer_size - 1);
+ case 0xeb63: strncpy(buffer, "Grub2 (v1.97)", buffer_size - 1);
case 0xeb5e:
/* We need more than 2 bytes */
if (((label >> 8) & 0xff) == 0x00)