ExternalVendorCode/balena-supervisor
1
0
Fork 0
mirror of https://github.com/balena-os/balena-supervisor.git synced 2024-12-21 22:47:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1952 from balena-os/serial-trim

Browse Source 
Trim newlines from sysinfo files
This commit is contained in:
bulldozer-balena[bot] 2022-05-23 18:48:32 +00:00 committed by GitHub
commit c8bef47010
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -80,8 +80,8 @@ export async function getSystemId(): Promise<string | undefined> {
fs.readFile('/proc/device-tree/product-sn'), fs.readFile('/proc/device-tree/product-sn'),
fs.readFile('/sys/devices/soc0/serial_number'), fs.readFile('/sys/devices/soc0/serial_number'),
]); ]);
// Remove the null byte at the end // Remove the null/newline bytes at the end
return buffer.toString('utf-8').replace(/\0/g, ''); return buffer.toString('utf-8').replace(/\0/g, '').trim();
} catch { } catch {
// Otherwise use dmidecode // Otherwise use dmidecode
const [baseBoardInfo] = ( const [baseBoardInfo] = (
@ -98,7 +98,7 @@ export async function getSystemModel(): Promise<string | undefined> {
fs.readFile('/proc/device-tree/product-name'), fs.readFile('/proc/device-tree/product-name'),
]); ]);
// Remove the null byte at the end // Remove the null byte at the end
return buffer.toString('utf-8').replace(/\0/g, ''); return buffer.toString('utf-8').replace(/\0/g, '').trim();
} catch { } catch {
const [baseBoardInfo] = ( const [baseBoardInfo] = (
await dmidecode('baseboard').catch(() => [] as DmiDecodeInfo[]) await dmidecode('baseboard').catch(() => [] as DmiDecodeInfo[])