diff --git a/CHANGELOG.md b/CHANGELOG.md index cbf4486..c67c120 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -42,6 +42,7 @@ We had to make **several interface changes** to keep systeminformation as consis - `baseboard()`: added memMax, memSlots - `bios()`: added language and features (linux) +- `blockDevices()` added raid group member (linux) - `cpu()`: extended AMD processor list - `cpu()`: extended socket list (win) - `cpu()`: added virtualization if cpu supports virtualization @@ -81,6 +82,7 @@ For major (breaking) changes - **version 4, 3 and 2** - see end of page. | Version | Date | Comment | | ------- | ---------- | --------------------------------------------------------------------------------------------------- | +| 5.14.2 | 2022-11-20 | `osInfo()` improved parsing (FreeBSD) | | 5.14.1 | 2022-11-20 | `memLayout()` bank descriptor cleanup (linux) | | 5.14.0 | 2022-11-19 | `blockDevices()` added raid group member (linux) | | 5.13.5 | 2022-11-18 | `users()` fix parsing issue (windows) | diff --git a/docs/history.html b/docs/history.html index d08f02c..c466758 100644 --- a/docs/history.html +++ b/docs/history.html @@ -57,6 +57,11 @@ + + 5.14.2 + 2022-11-20 + osInfo() improved parsing (FreeBSD) + 5.14.1 2022-11-20 diff --git a/docs/index.html b/docs/index.html index 1fd97c4..9878733 100644 --- a/docs/index.html +++ b/docs/index.html @@ -170,7 +170,7 @@
systeminformation
 
-
New Version: 5.14.1
+
New Version: 5.14.2
diff --git a/lib/osinfo.js b/lib/osinfo.js index 0febb04..d4456ca 100644 --- a/lib/osinfo.js +++ b/lib/osinfo.js @@ -263,16 +263,19 @@ function osInfo(callback) { if (_freebsd || _openbsd || _netbsd) { exec('sysctl kern.ostype kern.osrelease kern.osrevision kern.hostuuid machdep.bootmethod', function (error, stdout) { - if (!error) { - let lines = stdout.toString().split('\n'); - result.distro = util.getValue(lines, 'kern.ostype'); - result.logofile = getLogoFile(result.distro); - result.release = util.getValue(lines, 'kern.osrelease').split('-')[0]; - result.serial = util.getValue(lines, 'kern.uuid'); - result.codename = ''; - result.codepage = util.getCodepage(); - result.uefi = util.getValue(lines, 'machdep.bootmethod').toLowerCase().indexOf('uefi') >= 0; - } + let lines = stdout.toString().split('\n'); + const distro = util.getValue(lines, 'kern.ostype'); + const logofile = util.getValue(lines, 'kern.ostype'); + const release = util.getValue(lines, 'kern.osrelease').split('-')[0]; + const serial = util.getValue(lines, 'kern.uuid'); + const uefi = util.getValue(lines, 'machdep.bootmethod').toLowerCase().indexOf('uefi') >= 0; + result.distro = distro || result.distro; + result.logofile = logofile || result.logofile; + result.release = release || result.release; + result.serial = serial || result.serial; + result.codename = ''; + result.codepage = util.getCodepage(); + result.uefi = uefi || result.uefi; if (callback) { callback(result); }