From fe43536016927ddc6728674502b39bb809f40c0f Mon Sep 17 00:00:00 2001
From: usiegl00 <50933431+usiegl00@users.noreply.github.com>
Date: Sat, 6 Feb 2021 20:36:28 +0900
Subject: [PATCH] Updated Linux UUID Retrieval

---
 sliver/hostuuid/uuid_linux.go | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/sliver/hostuuid/uuid_linux.go b/sliver/hostuuid/uuid_linux.go
index 1a4a79da22..8c9c19292f 100644
--- a/sliver/hostuuid/uuid_linux.go
+++ b/sliver/hostuuid/uuid_linux.go
@@ -26,10 +26,16 @@ import (
 )
 
 func GetUUID() string {
-	uuid, err := ioutil.ReadFile("/var/lib/dbus/machine-id")
-	if err != nil {
-		panic(err)
+	uuid, err := ioutil.ReadFile("/etc/machine-id")
+	// UUID length is 32 plus newline
+	if (err != nil) || (len(uuid) != 33) {
+		uuid, err = ioutil.ReadFile("/var/lib/dbus/machine-id")
+		if (err != nil) || (len(uuid) != 33) {
+			// Randomized on the server
+			return ""
+		}
 	}
+
 	return fmt.Sprintf("%s-%s-%s-%s-%s",
 		uuid[0:8],
 		uuid[8:12], uuid[12:16], uuid[16:20],