From ccd0a3fab811f6659e2a5f5a3ca7f7e4b5fa67fd Mon Sep 17 00:00:00 2001
From: Kroese <kroese@users.noreply.github.com>
Date: Sun, 2 Apr 2023 22:38:36 +0200
Subject: [PATCH] Serial

---
 agent/agent.sh |  6 ++++--
 install.sh     |  1 +
 serial.sh      | 18 ++++++++++++++++--
 3 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/agent/agent.sh b/agent/agent.sh
index 6d4451d..3fb7b44 100644
--- a/agent/agent.sh
+++ b/agent/agent.sh
@@ -12,6 +12,8 @@ done
 
 if [ "$first_run" = true ]; then
 
+  echo "Installing packages..." > /dev/ttyS0
+
   for filename in /usr/local/packages/*.spk; do
 
     /usr/syno/bin/synopkg install "$filename" > /dev/null
@@ -19,7 +21,7 @@ if [ "$first_run" = true ]; then
     BASE=$(basename "$filename" .spk)
     BASE=$(echo "${BASE%%-*}")
 
-    /usr/syno/bin/synopkg start $BASE > /dev/null
+    /usr/syno/bin/synopkg start "$BASE" > /dev/null
 
     rm "$filename"
 
@@ -27,7 +29,7 @@ if [ "$first_run" = true ]; then
 
 else
 
-  sleep 2
+  sleep 3
 
 fi
 
diff --git a/install.sh b/install.sh
index e59cdb9..e970b13 100644
--- a/install.sh
+++ b/install.sh
@@ -4,6 +4,7 @@ set -eu
 IMG="/storage"
 BASE=$(basename "$URL" .pat)
 
+[ ! -d "$IMG" ] && echo "Storage folder (${IMG}) not found!" && exit 69
 [ ! -f "/run/server.sh" ] && echo "Script must run inside Docker container!" && exit 60
 
 [ ! -f "$IMG/$BASE.boot.img" ] && rm -f "$IMG"/"$BASE".system.img
diff --git a/serial.sh b/serial.sh
index 537a1cb..fc3a1c1 100644
--- a/serial.sh
+++ b/serial.sh
@@ -3,8 +3,22 @@
 permanent="DSM"
 serialstart="2000"
 
-HOST_SERIAL=="$(echo "$serialstart" | tr ' ' '\n' | sort -R | tail -1)$permanent"$(printf "%06d" $((RANDOM % 30000 + 1)))
-GUEST_SERIAL=="$(echo "$serialstart" | tr ' ' '\n' | sort -R | tail -1)$permanent"$(printf "%06d" $((RANDOM % 30000 + 1)))
+IMG="/storage"
+[ ! -d "$IMG" ] && echo "Storage folder (${IMG}) not found!" && exit 69
+
+FILE="${IMG}/host.serial"
+if [ ! -f "$FILE" ]; then
+  SERIAL="$(echo "$serialstart" | tr ' ' '\n' | sort -R | tail -1)$permanent"$(printf "%06d" $((RANDOM % 30000 + 1)))
+  echo $SERIAL > "$FILE"
+fi
+HOST_SERIAL=$(cat "${FILE}")
+
+FILE="${IMG}/guest.serial"
+if [ ! -f "$FILE" ]; then
+  SERIAL="$(echo "$serialstart" | tr ' ' '\n' | sort -R | tail -1)$permanent"$(printf "%06d" $((RANDOM % 30000 + 1)))
+  echo $SERIAL > "$FILE"
+fi
+GUEST_SERIAL=$(cat "${FILE}")
 
 ./run/serial.bin -cpu=1 \
                 -buildnumber=42962 \