From 8e3835708e0b3a0372502b3e2ba1831d7b8faf5c Mon Sep 17 00:00:00 2001 From: Simon Smith Date: Sun, 8 Oct 2023 14:28:57 +0000 Subject: [PATCH] add extra identifiers Signed-off-by: Simon Smith --- modules/identifiers.js | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/modules/identifiers.js b/modules/identifiers.js index 809c7c2..8c21c12 100644 --- a/modules/identifiers.js +++ b/modules/identifiers.js @@ -91,12 +91,17 @@ function linux_identifiers() identifiers['bios_date'] = ret['bios_date']; identifiers['bios_vendor'] = ret['bios_vendor']; identifiers['bios_version'] = ret['bios_version']; + identifiers['bios_serial'] = ret['product_serial']; identifiers['board_name'] = ret['board_name']; identifiers['board_serial'] = ret['board_serial']; identifiers['board_vendor'] = ret['board_vendor']; identifiers['board_version'] = ret['board_version']; identifiers['product_uuid'] = ret['product_uuid']; + try { + identifiers['bios_mode'] = (require('fs').statSync('/sys/firmware/efi').isDirectory() ? 'UEFI': 'Legacy'); + } catch (ex) { identifiers['bios_mode'] = 'Legacy'; } + var child = require('child_process').execFile('/bin/sh', ['sh']); child.stdout.str = ''; child.stdout.on('data', dataHandler); child.stdin.write('cat /proc/cpuinfo | grep "model name" | ' + "tr '\\n' ':' | awk -F: '{ print $2 }'\nexit\n"); @@ -426,12 +431,14 @@ function windows_identifiers() ret['identifiers'] = {}; - var values = require('win-wmi').query('ROOT\\CIMV2', "SELECT * FROM Win32_Bios", ['ReleaseDate', 'Manufacturer', 'SMBIOSBIOSVersion']); + var values = require('win-wmi').query('ROOT\\CIMV2', "SELECT * FROM Win32_Bios", ['ReleaseDate', 'Manufacturer', 'SMBIOSBIOSVersion', 'SerialNumber']); if(values[0]){ ret['identifiers']['bios_date'] = values[0]['ReleaseDate']; ret['identifiers']['bios_vendor'] = values[0]['Manufacturer']; ret['identifiers']['bios_version'] = values[0]['SMBIOSBIOSVersion']; + ret['identifiers']['bios_serial'] = values[0]['SerialNumber']; } + ret['identifiers']['bios_mode'] = 'Legacy'; values = require('win-wmi').query('ROOT\\CIMV2', "SELECT * FROM Win32_BaseBoard", ['Product', 'SerialNumber', 'Manufacturer', 'Version']); if(values[0]){ @@ -463,6 +470,11 @@ function windows_identifiers() if(values[0]){ trimResults(values); ret.windows.partitions = values; + for (var i in values) { + if (values[i].Description=='GPT: System') { + ret['identifiers']['bios_mode'] = 'UEFI'; + } + } } values = require('win-wmi').query('ROOT\\CIMV2', "SELECT * FROM Win32_Processor", ['Caption', 'DeviceID', 'Manufacturer', 'MaxClockSpeed', 'Name', 'SocketDesignation']);