dmi: separate the SYS* and MB* defines as their own strings

Collect both the SYS* and MB* strings; it is too common the SYS* ones
contain bogus but non-empty information, and the total amount of data
isn't all that huge.

Signed-off-by: H. Peter Anvin <hpa@zytor.com>

2 files changed, 22 insertions, 18 deletions

diff --git a/com32/include/syslinux/sysappend.h b/com32/include/syslinux/sysappend.h
index 8eb0916a..c2a4c530 100644
--- a/com32/include/syslinux/sysappend.h
+++ b/com32/include/syslinux/sysappend.h
@@ -38,13 +38,17 @@ enum syslinux_sysappend {
     SYSAPPEND_IP,		/* PXELINUX: ip= address */
     SYSAPPEND_BOOTIF,		/* PXELINUX: BOOTIF= address */
     SYSAPPEND_SYSUUID,		/* System UUID from PXE or DMI */
-    SYSAPPEND_VENDOR,		/* System or MB vendor from DMI */
-    SYSAPPEND_PRODUCT,		/* System or MB product from DMI */
-    SYSAPPEND_VERSION,		/* System or MB version from DMI */
-    SYSAPPEND_SERIAL,		/* System or MB serial from DMI */
-    SYSAPPEND_SKU,		/* System SKU from DMI */
-    SYSAPPEND_FAMILY,		/* System family from DMI */
-    SYSAPPEND_ASSET,		/* MB asset tag from DMI */
+    SYSAPPEND_SYSVENDOR,	/* System or MB vendor from DMI */
+    SYSAPPEND_SYSPRODUCT,	/* System or MB product from DMI */
+    SYSAPPEND_SYSVERSION,	/* System or MB version from DMI */
+    SYSAPPEND_SYSSERIAL,	/* System or MB serial from DMI */
+    SYSAPPEND_SYSSKU,		/* System SKU from DMI */
+    SYSAPPEND_SYSFAMILY,	/* System family from DMI */
+    SYSAPPEND_MBVENDOR,		/* System or MB vendor from DMI */
+    SYSAPPEND_MBPRODUCT,	/* System or MB product from DMI */
+    SYSAPPEND_MBVERSION,	/* System or MB version from DMI */
+    SYSAPPEND_MBSERIAL,		/* System or MB serial from DMI */
+    SYSAPPEND_MBASSET,		/* MB asset tag from DMI */
     SYSAPPEND_MAX		/* Total number of strings */
 };
 
diff --git a/core/dmi.c b/core/dmi.c
index 045b133b..10e35650 100644
--- a/core/dmi.c
+++ b/core/dmi.c
@@ -237,17 +237,17 @@ struct sysappend_dmi_strings {
 };
 
 static const struct sysappend_dmi_strings dmi_strings[] = {
-    { "SYSVENDOR=",  SYSAPPEND_VENDOR,  1, 0x04 },
-    { "SYSPRODUCT=", SYSAPPEND_PRODUCT, 1, 0x05 },
-    { "SYSVERSION=", SYSAPPEND_VERSION, 1, 0x06 },
-    { "SYSSERIAL=",  SYSAPPEND_SERIAL,  1, 0x07 },
-    { "SYSSKU=",     SYSAPPEND_SKU,     1, 0x19 },
-    { "SYSFAMILY=",  SYSAPPEND_FAMILY,  1, 0x1a },
-    { "MBVENDOR=",   SYSAPPEND_VENDOR,  2, 0x04 },
-    { "MBPRODUCT=",  SYSAPPEND_PRODUCT, 2, 0x05 },
-    { "MBVERSION=",  SYSAPPEND_VERSION, 2, 0x06 },
-    { "MBSERIAL=",   SYSAPPEND_SERIAL,  2, 0x07 },
-    { "MBASSET=",    SYSAPPEND_ASSET,   2, 0x08 },
+    { "SYSVENDOR=",  SYSAPPEND_SYSVENDOR,  1, 0x04 },
+    { "SYSPRODUCT=", SYSAPPEND_SYSPRODUCT, 1, 0x05 },
+    { "SYSVERSION=", SYSAPPEND_SYSVERSION, 1, 0x06 },
+    { "SYSSERIAL=",  SYSAPPEND_SYSSERIAL,  1, 0x07 },
+    { "SYSSKU=",     SYSAPPEND_SYSSKU,     1, 0x19 },
+    { "SYSFAMILY=",  SYSAPPEND_SYSFAMILY,  1, 0x1a },
+    { "MBVENDOR=",   SYSAPPEND_MBVENDOR,   2, 0x04 },
+    { "MBPRODUCT=",  SYSAPPEND_MBPRODUCT,  2, 0x05 },
+    { "MBVERSION=",  SYSAPPEND_MBVERSION,  2, 0x06 },
+    { "MBSERIAL=",   SYSAPPEND_MBSERIAL,   2, 0x07 },
+    { "MBASSET=",    SYSAPPEND_MBASSET,    2, 0x08 },
     { NULL, 0, 0, 0 }
 };