Skip to content

Commit

Permalink
Better comments for fallback on /etc/machine-id
Browse files Browse the repository at this point in the history
  • Loading branch information
pierresouchay committed Nov 6, 2018
1 parent be2b25a commit 890eb80
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion host/host_linux.go
Original file line number Diff line number Diff line change
Expand Up @@ -75,14 +75,16 @@ func InfoWithContext(ctx context.Context) (*InfoStat, error) {
sysProductUUID := common.HostSys("class/dmi/id/product_uuid")
machineID := common.HostEtc("machine-id")
switch {
// When not running as root, lib cannot read the value
// In order to read this file, needs to be supported by kernel/arch and run as root
// so having fallback is important
case common.PathExists(sysProductUUID):
lines, err := common.ReadLines(sysProductUUID)
if err == nil && len(lines) > 0 && lines[0] != "" {
ret.HostID = strings.ToLower(lines[0])
break
}
fallthrough
// Fallback on GNU Linux systems with systemd, readable by everyone
case common.PathExists(machineID):
lines, err := common.ReadLines(machineID)
if err == nil && len(lines) > 0 && len(lines[0]) == 32 {
Expand All @@ -91,6 +93,7 @@ func InfoWithContext(ctx context.Context) (*InfoStat, error) {
break
}
fallthrough
// Not stable between reboot, but better than nothing
default:
values, err := common.DoSysctrl("kernel.random.boot_id")
if err == nil && len(values) == 1 && values[0] != "" {
Expand Down

0 comments on commit 890eb80

Please sign in to comment.