From fb9b659142478a3512c22d26ea977c4cef519c10 Mon Sep 17 00:00:00 2001
From: Kroese <kroese@users.noreply.github.com>
Date: Sat, 29 Apr 2023 03:05:05 +0200
Subject: [PATCH 1/2] Sync

---
 run/power.sh | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/run/power.sh b/run/power.sh
index 91354ad..ff1bc4e 100644
--- a/run/power.sh
+++ b/run/power.sh
@@ -21,13 +21,12 @@ _trap(){
 
 _graceful_shutdown() {
 
+  set +e
+
   [ ! -f "${_QEMU_PID}" ] && return
   [ -f "${_QEMU_SHUTDOWN_COUNTER}" ] && return
 
-  set +e
-
-  echo
-  echo "Received $1 signal, shutting down..."
+  echo && echo "Received $1 signal, shutting down..."
   echo 0 > "${_QEMU_SHUTDOWN_COUNTER}"
 
   # Send the shutdown (system_powerdown) command to the QMP monitor
@@ -48,8 +47,7 @@ _graceful_shutdown() {
 
   done
 
-  echo
-  echo "Quitting..."
+  echo && echo "Quitting..."
   echo 'quit' | nc -q 1 -w 1 localhost "${QEMU_MONPORT}" > /dev/null || true
 
   return

From 209612ebfbb7555e5eeb5dd44da6e831ac442524 Mon Sep 17 00:00:00 2001
From: Kroese <kroese@users.noreply.github.com>
Date: Sat, 29 Apr 2023 03:09:19 +0200
Subject: [PATCH 2/2] Sync

---
 run/disk.sh | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/run/disk.sh b/run/disk.sh
index d69354d..e2852b3 100644
--- a/run/disk.sh
+++ b/run/disk.sh
@@ -3,9 +3,10 @@ set -eu
 
 # Docker environment variables
 
-: ${DISK_IO:='native'}      # I/O Mode, can be set to 'native', 'threads' or 'io_turing' 
-: ${DISK_ROTATION:='1'}     # Rotation rate, set to 1 for SSD storage and increase for HDD
-: ${DISK_CACHE:='none'}     # Caching mode, can be set to 'writeback' for better performance
+: ${DISK_IO:='native'}    # I/O Mode, can be set to 'native', 'threads' or 'io_turing' 
+: ${DISK_CACHE:='none'}   # Caching mode, can be set to 'writeback' for better performance
+: ${DISK_DISCARD:='on'}   # Controls whether unmap (TRIM) commands are passed to the host.
+: ${DISK_ROTATION:='1'}   # Rotation rate, set to 1 for SSD storage and increase for HDD
 
 BOOT="$STORAGE/boot.img"
 [ ! -f "$BOOT" ] && echo "ERROR: Boot image does not exist ($BOOT)" && exit 81
@@ -115,5 +116,5 @@ DISK_OPTS="\
     -device virtio-scsi-pci,id=scsi0 \
     -device scsi-cd,bus=scsi0.0,drive=cdrom0 \
     -device virtio-scsi-pci,id=hw-userdata,bus=pcie.0,addr=0xa \
-    -drive file=${DATA},if=none,id=drive-userdata,format=raw,cache=${DISK_CACHE},aio=${DISK_IO},discard=on,detect-zeroes=on \
+    -drive file=${DATA},if=none,id=drive-userdata,format=raw,cache=${DISK_CACHE},aio=${DISK_IO},discard=${DISK_DISCARD},detect-zeroes=on \
     -device scsi-hd,bus=hw-userdata.0,channel=0,scsi-id=0,lun=0,drive=drive-userdata,id=userdata0,rotation_rate=${DISK_ROTATION},bootindex=1"