Skip to content

Commit c268d92

Browse files
add all required machine id types
1 parent afeb257 commit c268d92

1 file changed

Lines changed: 20 additions & 6 deletions

File tree

scripts/start.sh

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,28 @@ source "/home/hytale/server/functions.sh"
44

55
SERVER_FILES="/home/hytale/server-files"
66

7-
# Create persistent machine-id (required for auth persistence across restarts)
8-
MACHINE_ID_FILE="$SERVER_FILES/.machine-id"
9-
if [ ! -f "$MACHINE_ID_FILE" ]; then
10-
echo "Generating persistent machine-id..."
11-
uuidgen | tr -d '-' | tr '[:upper:]' '[:lower:]' > "$MACHINE_ID_FILE"
7+
# Create persistent machine-id
8+
MACHINE_ID_DIR="$SERVER_FILES/.machine-id"
9+
mkdir -p "$MACHINE_ID_DIR"
10+
11+
if [ ! -f "$MACHINE_ID_DIR/uuid" ]; then
12+
LogInfo "Generating persistent machine-id for encrypted auth..."
13+
MACHINE_UUID=$(cat /proc/sys/kernel/random/uuid)
14+
MACHINE_UUID_NO_DASH=$(echo "$MACHINE_UUID" | tr -d '-' | tr '[:upper:]' '[:lower:]')
15+
16+
echo "$MACHINE_UUID_NO_DASH" > "$MACHINE_ID_DIR/machine-id"
17+
echo "$MACHINE_UUID_NO_DASH" > "$MACHINE_ID_DIR/dbus-machine-id"
18+
echo "$MACHINE_UUID" > "$MACHINE_ID_DIR/product_uuid"
19+
echo "$MACHINE_UUID" > "$MACHINE_ID_DIR/uuid"
1220
fi
1321

14-
cp "$MACHINE_ID_FILE" /etc/machine-id
22+
# Copy to system locations
23+
cp "$MACHINE_ID_DIR/machine-id" /etc/machine-id
24+
mkdir -p /var/lib/dbus
25+
cp "$MACHINE_ID_DIR/dbus-machine-id" /var/lib/dbus/machine-id
26+
mkdir -p /sys/class/dmi/id
27+
cp "$MACHINE_ID_DIR/product_uuid" /sys/class/dmi/id/product_uuid
28+
chmod 444 /sys/class/dmi/id/product_uuid
1529

1630
cd "$SERVER_FILES" || exit
1731

0 commit comments

Comments
 (0)