ExternalVendorCode/balena-supervisor
1
0
Fork 0
mirror of https://github.com/balena-os/balena-supervisor.git synced 2025-02-01 08:47:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1655 from balena-os/vipul/fix-getcpuid

Browse Source 
patch: Fix substring end parameter to get accurate CPU ID
This commit is contained in:
bulldozer-balena[bot] 2021-04-12 22:01:44 +00:00 committed by GitHub
commit 192589d19e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/lib/system-info.ts
View File

@ -69,7 +69,7 @@ export async function getCpuId(): Promise<string | undefined> {
try { try {
const buffer = await fs.readFile('/proc/device-tree/serial-number'); const buffer = await fs.readFile('/proc/device-tree/serial-number');
// Remove the null byte at the end // Remove the null byte at the end
return buffer.toString('utf-8').substr(0, buffer.length - 2); return buffer.toString('utf-8').replace(/\0/g, '');
} catch { } catch {
return undefined; return undefined;
} }

2
test/38-sys-info.spec.ts
View File

@ -119,7 +119,7 @@ describe('System information', async () => {
]), ]),
); );
const cpuId = await sysInfo.getCpuId(); const cpuId = await sysInfo.getCpuId();
expect(cpuId).to.equal('1000000001b93f3'); expect(cpuId).to.equal('1000000001b93f3f');
fsStub.restore(); fsStub.restore();
}); });
}); });