From 1368fdfaac225061415055cfec514cc888341445 Mon Sep 17 00:00:00 2001
From: Kroese <kroese@users.noreply.github.com>
Date: Tue, 18 Apr 2023 03:46:43 +0200
Subject: [PATCH 1/8] Remove secondary DNS

---
 run/network.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/run/network.sh b/run/network.sh
index cee0d29..708f513 100644
--- a/run/network.sh
+++ b/run/network.sh
@@ -75,7 +75,6 @@ for nameserver in "${nameservers[@]}"; do
 done
 
 [[ -z $DNS_SERVERS ]] && DNS_SERVERS="1.1.1.1"
-[[ ${DNS_SERVERS} != *","* ]] && DNS_SERVERS="$DNS_SERVERS,1.0.0.1"
 
 DNSMASQ_OPTS="$DNSMASQ_OPTS --dhcp-option=option:dns-server,$DNS_SERVERS --dhcp-option=option:router,${VM_NET_IP%.*}.1"
 

From ddadb5d97d30d8e917db0a57406d1281526c6c4c Mon Sep 17 00:00:00 2001
From: Kroese <kroese@users.noreply.github.com>
Date: Tue, 18 Apr 2023 04:33:02 +0200
Subject: [PATCH 2/8] Returnvalues

---
 agent/service.sh | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/agent/service.sh b/agent/service.sh
index 4527352..7a04e9d 100644
--- a/agent/service.sh
+++ b/agent/service.sh
@@ -8,6 +8,7 @@ status() {
     echo 'Service running'
     return 1
   fi
+  return 0
 }
 
 start() {
@@ -18,6 +19,7 @@ start() {
   echo 'Starting agent service...'
   chmod 666 /dev/ttyS0
   "$SCRIPT" &> /dev/ttyS0 & echo $! > "$PIDFILE"
+  return 0
 }
 
 stop() {
@@ -30,22 +32,28 @@ stop() {
   echo 'Stopping agent service...' > /dev/ttyS0
   kill -15 "$(cat "$PIDFILE")" && rm -f "$PIDFILE"
   echo 'Service stopped'
+  return 0
 }
 
+ret=0
+
 case "$1" in
   start)
-    start
+    ret=start
     ;;
   stop)
-    stop
+    ret=stop
     ;;
   status)
-    status
+    ret=status
     ;;
   restart)
     stop
-    start
+    ret=start
     ;;
   *)
     echo "Usage: $0 {start|stop|restart}"
+    ret=1
 esac
+
+exit ret

From f08a514f2f35b266be4b8cbf05226c8ab5c61d1b Mon Sep 17 00:00:00 2001
From: Kroese <kroese@users.noreply.github.com>
Date: Tue, 18 Apr 2023 04:42:09 +0200
Subject: [PATCH 3/8] /var/lock/subsys

---
 agent/service.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/agent/service.sh b/agent/service.sh
index 7a04e9d..2afb7d8 100644
--- a/agent/service.sh
+++ b/agent/service.sh
@@ -16,6 +16,7 @@ start() {
     echo 'Service already running'
     return 1
   fi
+  touch /var/lock/subsys/agent.sh
   echo 'Starting agent service...'
   chmod 666 /dev/ttyS0
   "$SCRIPT" &> /dev/ttyS0 & echo $! > "$PIDFILE"
@@ -27,6 +28,7 @@ stop() {
     echo 'Service not running'
     return 1
   fi
+  rm -f /var/lock/subsys/agent.sh
   echo 'Stopping agent service...'
   chmod 666 /dev/ttyS0
   echo 'Stopping agent service...' > /dev/ttyS0

From 59cd40ccf991869c0bb4110f17ac76c3c456e8a3 Mon Sep 17 00:00:00 2001
From: Kroese <kroese@users.noreply.github.com>
Date: Tue, 18 Apr 2023 04:57:03 +0200
Subject: [PATCH 4/8] Return value

---
 agent/service.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/agent/service.sh b/agent/service.sh
index 2afb7d8..aaf0ac6 100644
--- a/agent/service.sh
+++ b/agent/service.sh
@@ -58,4 +58,4 @@ case "$1" in
     ret=1
 esac
 
-exit ret
+exit $ret

From c9e3b032de1aea8fec3d3d0cc2d2db308895af70 Mon Sep 17 00:00:00 2001
From: Kroese <kroese@users.noreply.github.com>
Date: Tue, 18 Apr 2023 05:14:38 +0200
Subject: [PATCH 5/8] Revert

---
 agent/service.sh | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/agent/service.sh b/agent/service.sh
index aaf0ac6..bdddcfe 100644
--- a/agent/service.sh
+++ b/agent/service.sh
@@ -16,7 +16,7 @@ start() {
     echo 'Service already running'
     return 1
   fi
-  touch /var/lock/subsys/agent.sh
+  echo "agent" > /var/lock/subsys/agent.sh
   echo 'Starting agent service...'
   chmod 666 /dev/ttyS0
   "$SCRIPT" &> /dev/ttyS0 & echo $! > "$PIDFILE"
@@ -37,25 +37,22 @@ stop() {
   return 0
 }
 
-ret=0
-
 case "$1" in
   start)
-    ret=start
+    start
     ;;
   stop)
-    ret=stop
+    stop
     ;;
   status)
-    ret=status
+    status
     ;;
   restart)
     stop
-    ret=start
+    start
     ;;
   *)
     echo "Usage: $0 {start|stop|restart}"
-    ret=1
+    exit 1
 esac
 
-exit $ret

From 1be15caa92244617b7a64f0d76498cc82dd6f3c2 Mon Sep 17 00:00:00 2001
From: Kroese <kroese@users.noreply.github.com>
Date: Tue, 18 Apr 2023 06:01:51 +0200
Subject: [PATCH 6/8] chmod 755

---
 run/install.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/run/install.sh b/run/install.sh
index ad8f6d5..1356b3d 100644
--- a/run/install.sh
+++ b/run/install.sh
@@ -155,12 +155,12 @@ mv $PKG/ $LOC/
 LOC="$MOUNT/usr/local/bin"
 mkdir -p $LOC
 cp /agent/agent.sh $LOC/agent.sh
-chmod +x $LOC/agent.sh
+chmod 755 $LOC/agent.sh
 
 LOC="$MOUNT/usr/local/etc/rc.d"
 mkdir -p $LOC
 cp /agent/service.sh $LOC/agent.sh
-chmod +x $LOC/agent.sh
+chmod 755 $LOC/agent.sh
 
 # Store agent version
 echo "5" > "$STORAGE"/"$BASE".agent

From 704a6059585b0522a2825cfa6d1bf7f5c0ea7346 Mon Sep 17 00:00:00 2001
From: Kroese <kroese@users.noreply.github.com>
Date: Tue, 18 Apr 2023 17:09:19 +0200
Subject: [PATCH 7/8] pidwait

---
 run/run.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/run/run.sh b/run/run.sh
index 3946cb5..4921d5b 100755
--- a/run/run.sh
+++ b/run/run.sh
@@ -52,5 +52,4 @@ set -m
 )
 set +m
 
-pidwait -F "${_QEMU_PID}" &
-wait $!
+pidwait -F "${_QEMU_PID}" & wait $!

From 401201217b043571703548d178630aa1483b36d6 Mon Sep 17 00:00:00 2001
From: Kroese <kroese@users.noreply.github.com>
Date: Tue, 18 Apr 2023 17:31:47 +0200
Subject: [PATCH 8/8] subsys

---
 agent/service.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/agent/service.sh b/agent/service.sh
index bdddcfe..34c8385 100644
--- a/agent/service.sh
+++ b/agent/service.sh
@@ -16,7 +16,7 @@ start() {
     echo 'Service already running'
     return 1
   fi
-  echo "agent" > /var/lock/subsys/agent.sh
+  echo "-" > /var/lock/subsys/agent.sh
   echo 'Starting agent service...'
   chmod 666 /dev/ttyS0
   "$SCRIPT" &> /dev/ttyS0 & echo $! > "$PIDFILE"