From 159402de8f0264e6c8b1ac1137aee5819bd33bb1 Mon Sep 17 00:00:00 2001
From: Kroese <kroese@users.noreply.github.com>
Date: Fri, 7 Jun 2024 13:08:30 +0200
Subject: [PATCH] fix: CPU pinning for Orange Pi (#103)

---
 src/disk.sh    | 2 +-
 src/entry.sh   | 2 +-
 src/network.sh | 3 ---
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/disk.sh b/src/disk.sh
index 7fdf1c1..341e380 100644
--- a/src/disk.sh
+++ b/src/disk.sh
@@ -403,7 +403,7 @@ addMedia () {
   local index=""
   local DISK_ID="cdrom$DISK_BUS"
   [ -n "$DISK_INDEX" ] && index=",bootindex=$DISK_INDEX"
-  local result="-drive file=$DISK_FILE,id=$DISK_ID,format=raw,readonly=on,media=cdrom"
+  local result="-drive file=$DISK_FILE,id=$DISK_ID,format=raw,cache=unsafe,readonly=on,media=cdrom"
 
   case "${DISK_TYPE,,}" in
     "auto" )
diff --git a/src/entry.sh b/src/entry.sh
index a07d780..f5ee54a 100755
--- a/src/entry.sh
+++ b/src/entry.sh
@@ -23,5 +23,5 @@ info "Booting image${BOOT_DESC} using QEMU v$version..."
 if [ -z "$CPU_PIN" ]; then
   exec qemu-system-aarch64 ${ARGS:+ $ARGS}
 else
-  taskset -c "$CPU_PIN" exec qemu-system-aarch64 ${ARGS:+ $ARGS}
+  exec taskset -c "$CPU_PIN" qemu-system-aarch64 ${ARGS:+ $ARGS}
 fi
diff --git a/src/network.sh b/src/network.sh
index c90c04b..f96619b 100644
--- a/src/network.sh
+++ b/src/network.sh
@@ -94,13 +94,10 @@ configureDNS() {
   DNSMASQ_OPTS+=" --address=/host.lan/${VM_NET_IP%.*}.1"
 
   DNSMASQ_OPTS=$(echo "$DNSMASQ_OPTS" | sed 's/\t/ /g' | tr -s ' ' | sed 's/^ *//')
-  [[ "$DEBUG" == [Yy1]* ]] && set -x
 
   if ! $DNSMASQ ${DNSMASQ_OPTS:+ $DNSMASQ_OPTS}; then
     error "Failed to start dnsmasq, reason: $?" && exit 29
   fi
-  { set +x; } 2>/dev/null
-  [[ "$DEBUG" == [Yy1]* ]] && echo
 
   return 0
 }