pkg/host: don't include empty machine info sections

1 files changed, 7 insertions, 2 deletions

diff --git a/pkg/host/machine_info.go b/pkg/host/machine_info.go
index 9b465e025..a804ca32a 100644
--- a/pkg/host/machine_info.go
+++ b/pkg/host/machine_info.go
@@ -13,15 +13,20 @@ import (
 func CollectMachineInfo() ([]byte, error) {
 	buf := new(bytes.Buffer)
 	for _, pair := range machineInfoFuncs {
+		pos0 := buf.Len()
 		fmt.Fprintf(buf, "[%s]\n", pair.name)
+		pos1 := buf.Len()
 		err := pair.fn(buf)
 		if err != nil {
 			if !os.IsNotExist(err) {
 				return nil, err
 			}
-			fmt.Fprintf(buf, "%v\n", err)
 		}
-		fmt.Fprintf(buf, "%v\n\n", strings.Repeat("-", 80))
+		if buf.Len() == pos1 {
+			buf.Truncate(pos0)
+			continue
+		}
+		fmt.Fprintf(buf, "\n%v\n\n", strings.Repeat("-", 80))
 	}
 	return buf.Bytes(), nil
 }