diff --git a/CHANGELOG.md b/CHANGELOG.md index 5750398..d315884 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -82,6 +82,7 @@ For major (breaking) changes - **version 4, 3 and 2** - see end of page. | Version | Date | Comment | | ------- | ---------- | --------------------------------------------------------------------------------------------------- | +| 5.18.1 | 2023-06-07 | `networkInterfaces()` cleaned up testVirtualNic | | 5.18.0 | 2023-06-06 | `fsSize()` added optional drive parameter | | 5.17.17 | 2023-06-03 | `osInfo()` improved fqdn (linux) | | 5.17.16 | 2023-05-30 | `usb()` fix parsing JSON (mac OS) | diff --git a/docs/history.html b/docs/history.html index 47b5dba..90221cb 100644 --- a/docs/history.html +++ b/docs/history.html @@ -57,6 +57,11 @@ + + 5.18.1 + 2023-06-07 + networkInterfaces() cleaned up testVirtualNic + 5.18.0 2023-06-06 diff --git a/docs/index.html b/docs/index.html index 0451f61..8223b56 100644 --- a/docs/index.html +++ b/docs/index.html @@ -170,7 +170,7 @@
systeminformation
 
-
New Version: 5.18.0
+
New Version: 5.18.1
@@ -204,7 +204,7 @@
-
15,389
+
15,423
Lines of code
diff --git a/lib/filesystem.js b/lib/filesystem.js index 279fa26..3717b90 100644 --- a/lib/filesystem.js +++ b/lib/filesystem.js @@ -137,7 +137,7 @@ function fsSize(drive, callback) { } } if (_linux) { - cmd = 'export LC_ALL=C; df -lkPTx squashfs; unset LC_ALL'; + cmd = 'df -lkPTx squashfs'; execSync('cat /proc/mounts 2>/dev/null').toString().split('\n').filter(line => { return line.startsWith('/'); }).forEach((line) => { diff --git a/lib/network.js b/lib/network.js index adada43..6f0253d 100644 --- a/lib/network.js +++ b/lib/network.js @@ -673,9 +673,9 @@ function getLinuxIfaceIEEE8021xState(authenticationProtocol) { } function testVirtualNic(iface, ifaceName, mac) { - const virtualMacs = ['00:00:00:00:00:00', '00:03:FF', '00:05:69', '00:0C:29', '00:0F:4B', '00:0F:4B', '00:13:07', '00:13:BE', '00:15:5d', '00:16:3E', '00:1C:42', '00:21:F6', '00:21:F6', '00:24:0B', '00:24:0B', '00:50:56', '00:A0:B1', '00:E0:C8', '08:00:27', '0A:00:27', '18:92:2C', '16:DF:49', '3C:F3:92', '54:52:00', 'FC:15:97']; + const virtualMacs = ['00:00:00:00:00:00', '00:03:FF', '00:05:69', '00:0C:29', '00:0F:4B', '00:13:07', '00:13:BE', '00:15:5d', '00:16:3E', '00:1C:42', '00:21:F6', '00:24:0B', '00:50:56', '00:A0:B1', '00:E0:C8', '08:00:27', '0A:00:27', '18:92:2C', '16:DF:49', '3C:F3:92', '54:52:00', 'FC:15:97']; if (mac) { - return virtualMacs.filter(item => { return mac.toUpperCase().toUpperCase().startsWith(item.substr(0, mac.length)); }).length > 0 || + return virtualMacs.filter(item => { return mac.toUpperCase().toUpperCase().startsWith(item.substring(0, mac.length)); }).length > 0 || iface.toLowerCase().indexOf(' virtual ') > -1 || ifaceName.toLowerCase().indexOf(' virtual ') > -1 || iface.toLowerCase().indexOf('vethernet ') > -1 ||