shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-12-22 17:35:35 +03:00
Code

analyze-chid: show friendly smbios field names

Browse Source 
Some of the field names between kernel and smbios spec differ. Kinda
confusing. Let's use the smbios field names, to match the CHID spec,
which also uses them, and thus be least confusing, treating kernel
attribute fields as an internal Linux thing only.
This commit is contained in:
Lennart Poettering 2024-12-20 12:10:55 +01:00
parent 37e02b455b
commit 0f55038c84
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/analyze/analyze-chid.c
View File

@ -30,6 +30,15 @@ static int parse_chid_type(const char *s, size_t *ret) {
return 0; return 0;
} }
static const char *const chid_smbios_friendly[_CHID_SMBIOS_FIELDS_MAX] = {
[CHID_SMBIOS_MANUFACTURER] = "manufacturer",
[CHID_SMBIOS_FAMILY] = "family",
[CHID_SMBIOS_PRODUCT_NAME] = "product-name",
[CHID_SMBIOS_PRODUCT_SKU] = "product-sku",
[CHID_SMBIOS_BASEBOARD_MANUFACTURER] = "baseboard-manufacturer",
[CHID_SMBIOS_BASEBOARD_PRODUCT] = "baseboard-product",
};
static const char chid_smbios_fields_char[_CHID_SMBIOS_FIELDS_MAX] = { static const char chid_smbios_fields_char[_CHID_SMBIOS_FIELDS_MAX] = {
[CHID_SMBIOS_MANUFACTURER] = 'M', [CHID_SMBIOS_MANUFACTURER] = 'M',
[CHID_SMBIOS_FAMILY] = 'F', [CHID_SMBIOS_FAMILY] = 'F',
@ -207,7 +216,7 @@ int verb_chid(int argc, char *argv[], void *userdata) {
special_glyph(SPECIAL_GLYPH_ARROW_RIGHT), special_glyph(SPECIAL_GLYPH_ARROW_RIGHT),
" ", " ",
ansi_normal(), ansi_normal(),
smbios_files[f], chid_smbios_friendly[f],
ansi_grey(), ansi_grey(),
" (", " (",
c ? ansi_highlight() : ansi_grey(), c ? ansi_highlight() : ansi_grey(),
@ -219,7 +228,7 @@ int verb_chid(int argc, char *argv[], void *userdata) {
w += separator * 3 + w += separator * 3 +
4 + 4 +
utf8_console_width(smbios_files[f]) + utf8_console_width(chid_smbios_friendly[f]) +
2 + 2 +
utf8_console_width(strna(c)) + utf8_console_width(strna(c)) +
1; 1;