61 lines
3.0 KiB
Diff
61 lines
3.0 KiB
Diff
|
From 701ab9f5d50fb0e1308ad8ea163d49525d3d90af Mon Sep 17 00:00:00 2001
|
||
|
|
From: Tomas Glozar <tglozar@redhat.com>
|
||
|
|
Date: Mon, 29 Apr 2024 10:47:20 +0200
|
||
|
|
Subject: [PATCH 10/13] rteval: Make output work with new dmiinfo format
|
||
|
|
|
||
|
|
Commit 43c45ba7 ("rteval: Implement initial dmidecode support")
|
||
|
|
re-introduced DMI information into rteval XML summary, but in a
|
||
|
|
different format, which is not correctly picked up in rteval_text.xsl
|
||
|
|
for formatting BIOS and vendor information into rteval text output.
|
||
|
|
|
||
|
|
This lead to the information not being displayed correctly:
|
||
|
|
Model: -
|
||
|
|
BIOS version: (ver: , rev :, release date: )
|
||
|
|
|
||
|
|
Modify the relevant section of rteval_text.xsl to make it understand the
|
||
|
|
new format. Also, adjust the incorrect spacing around "rev".
|
||
|
|
|
||
|
|
New output (in QEMU VM):
|
||
|
|
Model: QEMU - Standard PC (Q35 + ICH9, 2009)
|
||
|
|
BIOS version: SeaBIOS (ver: 1.16.3-1.fc39, rev: 0.0, release date: 04/01/2014)
|
||
|
|
|
||
|
|
Signed-off-by: Tomas Glozar <tglozar@redhat.com>
|
||
|
|
Signed-off-by: John Kacur <jkacur@redhat.com>
|
||
|
|
---
|
||
|
|
rteval/rteval_text.xsl | 14 +++++++-------
|
||
|
|
1 file changed, 7 insertions(+), 7 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/rteval/rteval_text.xsl b/rteval/rteval_text.xsl
|
||
|
|
index 1e9c0f0d26c5..2f03bda0bb55 100644
|
||
|
|
--- a/rteval/rteval_text.xsl
|
||
|
|
+++ b/rteval/rteval_text.xsl
|
||
|
|
@@ -39,18 +39,18 @@
|
||
|
|
<xsl:text> </xsl:text>
|
||
|
|
|
||
|
|
<xsl:text> Model: </xsl:text>
|
||
|
|
- <xsl:value-of select="SystemInfo/DMIinfo/HardwareInfo/GeneralInfo/Manufacturer|HardwareInfo/GeneralInfo/ProductName"/>
|
||
|
|
- <xsl:text> - </xsl:text><xsl:value-of select="SystemInfo/DMIinfo/HardwareInfo/GeneralInfo/ProductName|HardwareInfo/GeneralInfo/ProductName"/>
|
||
|
|
+ <xsl:value-of select="SystemInfo/DMIinfo/Handle[@name='System Information']/Field[@Name='Manufacturer']"/>
|
||
|
|
+ <xsl:text> - </xsl:text><xsl:value-of select="SystemInfo/DMIinfo/Handle[@name='System Information']/Field[@Name='Product Name']"/>
|
||
|
|
<xsl:text> </xsl:text>
|
||
|
|
|
||
|
|
<xsl:text> BIOS version: </xsl:text>
|
||
|
|
- <xsl:value-of select="SystemInfo/DMIinfo/HardwareInfo/BIOS|HardwareInfo/BIOS"/>
|
||
|
|
+ <xsl:value-of select="SystemInfo/DMIinfo/Handle[@name='BIOS Information']/Field[@Name='Vendor']"/>
|
||
|
|
<xsl:text> (ver: </xsl:text>
|
||
|
|
- <xsl:value-of select="SystemInfo/DMIinfo/HardwareInfo/BIOS/@Version|HardwareInfo/BIOS/@Version"/>
|
||
|
|
- <xsl:text>, rev :</xsl:text>
|
||
|
|
- <xsl:value-of select="SystemInfo/DMIinfo/HardwareInfo/BIOS/@BIOSrevision|HardwareInfo/BIOS/@BIOSrevision"/>
|
||
|
|
+ <xsl:value-of select="SystemInfo/DMIinfo/Handle[@name='BIOS Information']/Field[@Name='Version']"/>
|
||
|
|
+ <xsl:text>, rev: </xsl:text>
|
||
|
|
+ <xsl:value-of select="SystemInfo/DMIinfo/Handle[@name='BIOS Information']/Field[@Name='BIOS Revision']"/>
|
||
|
|
<xsl:text>, release date: </xsl:text>
|
||
|
|
- <xsl:value-of select="SystemInfo/DMIinfo/HardwareInfo/BIOS/@ReleaseDate|HardwareInfo/BIOS/@ReleaseDate"/>
|
||
|
|
+ <xsl:value-of select="SystemInfo/DMIinfo/Handle[@name='BIOS Information']/Field[@Name='Release Date']"/>
|
||
|
|
<xsl:text>)</xsl:text>
|
||
|
|
<xsl:text> </xsl:text>
|
||
|
|
|
||
|
|
--
|
||
|
|
2.44.0
|
||
|
|
|