Fix for issue #373

Fix for issue #373

.github/workflows/check.yml

@@ -11,4 +11,4 @@ jobs:
       - name: Run ShellCheck
         uses: ludeeus/action-shellcheck@master
 env:
-        SHELLCHECK_OPTS: -x -e SC2001 -e SC2002 -e SC2223 -e SC2034 -e SC2064 -e SC2317 -e SC2028 -e SC2153
+        SHELLCHECK_OPTS: -x -e SC2001 -e SC2002 -e SC2223 -e SC2034 -e SC2064 -e SC2317 -e SC2028 -e SC2153 -e SC2004 

Dockerfile

@@ -34,8 +34,6 @@ RUN apt-get update && apt-get -y upgrade && \
     && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
 COPY run/*.sh /run/
-COPY agent/*.sh /agent/
-
 COPY --from=builder /qemu-host.bin /run/host.bin
 
 RUN chmod +x /run/*.sh && chmod +x /run/*.bin

agent/agent.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 set -u
 
-VERSION="8"
+VERSION="9"
 HEADER="VirtualDSM Agent"
 
 # Functions
@@ -45,8 +45,12 @@ function downloadUpdate {
 
   [[ "$remote_size" == "" || "$remote_size" == "0" ]] && return
 
+  remote_size=$(($remote_size+0))
+  ((remote_size<100)) && return
+
   SCRIPT=$(readlink -f "${BASH_SOURCE[0]}")
   local_size=$(stat -c%s "$SCRIPT")
+  local_size=$(($local_size+0))
 
   [[ remote_size -eq local_size ]] && return
 
@@ -126,31 +130,6 @@ else
 
 fi
 
-delay=500
-elapsed=$((($(date +%s%N) - ts)/1000000))
-
-if [[ delay -gt elapsed ]]; then
-  difference=$((delay-elapsed))
-  float=$(echo | awk -v diff="${difference}" '{print diff * 0.001}')
-  sleep "$float"
-fi
-
-# Display message in docker log output
-
-IP=$(ip address show dev eth0 | grep inet | awk '/inet / { print $2 }' | cut -f1 -d/)
-
-if [[ "$IP" == "20.20"* ]]; then
-  MSG="port 5000"
-else
-  MSG="http://${IP}:5000"
-fi
-
-echo ""
-info "--------------------------------------------------------"
-info " You can now login to DSM at ${MSG}"
-info "--------------------------------------------------------"
-echo ""
-
 # Wait for NMI interrupt as a shutdown signal
 
 while true; do

run/check.sh

@@ -2,6 +2,7 @@
 set -u
 
 [ ! -f "/run/qemu.pid" ] && echo "QEMU not running yet.." && exit 0
+[ -f "/run/qemu.counter" ] && echo "QEMU is shutting down.." && exit 1
 
 # Retrieve IP from guest VM for Docker healthcheck
 RESPONSE=$(curl -s -m 16 -S http://127.0.0.1:2210/read?command=10 2>&1)

run/disk.sh

@@ -21,10 +21,11 @@ if [[ ! -f "${DATA}" ]] && [[ -f "$STORAGE/data$DISK_SIZE.img" ]]; then
   DATA="$STORAGE/data$DISK_SIZE.img"
 fi
 
+MIN_SIZE=6442450944
 DISK_SIZE=$(echo "${DISK_SIZE}" | sed 's/MB/M/g;s/GB/G/g;s/TB/T/g')
 DATA_SIZE=$(numfmt --from=iec "${DISK_SIZE}")
 
-if (( DATA_SIZE < 6442450944 )); then
+if (( DATA_SIZE < MIN_SIZE )); then
   error "Please increase DISK_SIZE to at least 6 GB." && exit 83
 fi
 
@@ -124,9 +125,6 @@ if [ ! -f "${DATA}" ]; then
     error "Virtual disk does not exist ($DATA)" && exit 88
   fi
 
-  # Format as BTRFS filesystem
-  # mkfs.btrfs -q -L data -d single -m dup "${DATA}" > /dev/null
-
 fi
 
 # Check the filesize
@@ -147,34 +145,60 @@ DISK_OPTS="\
     -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=3"
 
+: ${DISK2_SIZE:=''}
+EXTRA_SIZE=DISK2_SIZE
 EXTRA_DISK="/storage2/data.img"
 
-if [ -f "${EXTRA_DISK}" ]; then
+if [ -d "$(dirname "${EXTRA_DISK}")" ]; then
+
+  if [ ! -f "${EXTRA_DISK}" ]; then
+    [ -z "$EXTRA_SIZE" ] && EXTRA_SIZE="16G"
+    if ! truncate -s "${EXTRA_SIZE}" "${EXTRA_DISK}"; then
+      error "Could not create the file for the second disk." && exit 53
+    fi
+  fi
+
+  if [ -n "$EXTRA_SIZE" ]; then
+    CUR_SIZE=$(stat -c%s "${EXTRA_DISK}")
+    DATA_SIZE=$(numfmt --from=iec "${EXTRA_SIZE}")
+    if [ "$DATA_SIZE" -gt "$CUR_SIZE" ]; then
+      truncate -s "${EXTRA_SIZE}" "${EXTRA_DISK}"
+    fi
+  fi
   
   DISK_OPTS="${DISK_OPTS} \
     -device virtio-scsi-pci,id=hw-userdata2,bus=pcie.0,addr=0xd \
     -drive file=${EXTRA_DISK},if=none,id=drive-userdata2,format=raw,cache=${DISK_CACHE},aio=${DISK_IO},discard=${DISK_DISCARD},detect-zeroes=on \
     -device scsi-hd,bus=hw-userdata2.0,channel=0,scsi-id=0,lun=0,drive=drive-userdata2,id=userdata2,rotation_rate=${DISK_ROTATION},bootindex=4"
 
-else
-
-  [ -d "$(dirname "${EXTRA_DISK}")" ] && error "Disk image ${EXTRA_DISK} does not exist! Please supply an empty file of at least 6 GB." && exit 53
-
 fi
 
+: ${DISK3_SIZE:=''}
+EXTRA_SIZE=DISK3_SIZE
 EXTRA_DISK="/storage3/data.img"
 
-if [ -f "${EXTRA_DISK}" ]; then
+if [ -d "$(dirname "${EXTRA_DISK}")" ]; then
+
+  if [ ! -f "${EXTRA_DISK}" ]; then
+    [ -z "$EXTRA_SIZE" ] && EXTRA_SIZE="16G"
+    if ! truncate -s "${EXTRA_SIZE}" "${EXTRA_DISK}"; then
+      error "Could not create the file for the third disk." && exit 54
+    fi
+  fi
+
+  if [ -n "$EXTRA_SIZE" ]; then
+    CUR_SIZE=$(stat -c%s "${EXTRA_DISK}")
+    DATA_SIZE=$(numfmt --from=iec "${EXTRA_SIZE}")
+    if [ "$DATA_SIZE" -gt "$CUR_SIZE" ]; then
+      truncate -s "${EXTRA_SIZE}" "${EXTRA_DISK}"
+    fi
+  fi
 
   DISK_OPTS="${DISK_OPTS} \
     -device virtio-scsi-pci,id=hw-userdata3,bus=pcie.0,addr=0xe \
     -drive file=${EXTRA_DISK},if=none,id=drive-userdata3,format=raw,cache=${DISK_CACHE},aio=${DISK_IO},discard=${DISK_DISCARD},detect-zeroes=on \
     -device scsi-hd,bus=hw-userdata3.0,channel=0,scsi-id=0,lun=0,drive=drive-userdata3,id=userdata3,rotation_rate=${DISK_ROTATION},bootindex=5"
 
-else
-
-  [ -d "$(dirname "${EXTRA_DISK}")" ] && error "Disk image ${EXTRA_DISK} does not exist! Please supply an empty file of at least 6 GB." && exit 54
-
 fi
 
 : ${DEVICE:=''}        # Docker variable to passthrough a block device, like /dev/vdc1.

run/install.sh

@@ -32,14 +32,22 @@ rm -f "$STORAGE"/"$BASE".boot.img
 rm -f "$STORAGE"/"$BASE".system.img
 
 TMP="/tmp/dsm"
+MIN_SPACE=6442450944
 FS=$(stat -f -c %T "$STORAGE")
-[[ "$FS" == "ext"* ]] && TMP="$STORAGE/tmp"
+
+if [[ "$FS" != "fat"* && "$FS" != "vfat"* && "$FS" != "exfat"* && \
+        "$FS" != "ntfs"* && "$FS" != "fuse"* && "$FS" != "msdos"* ]]; then
+  TMP="$STORAGE/tmp"
+else
+  SPACE=$(df --output=avail -B 1 /tmp | tail -n 1)
+  (( MIN_SPACE > SPACE )) && TMP="$STORAGE/tmp"
+fi
+
 rm -rf "$TMP" && mkdir -p "$TMP"
 
 # Check free diskspace
-MIN_SPACE=5842450944
 SPACE=$(df --output=avail -B 1 "$TMP" | tail -n 1)
-(( MIN_SPACE > SPACE )) && error "Not enough free space for installation." && exit 95
+(( MIN_SPACE > SPACE )) && error "Not enough free space for installation, need at least 6 GB." && exit 95
 
 [[ "${DEBUG}" == [Yy1]* ]] && set -x
 
@@ -230,18 +238,6 @@ rm -f "$MOUNT/.SynoUpgradePackages/ActiveInsight-"*
 [ -f "$HDP.txz" ] && tar xpfJ "$HDP.txz" --absolute-names -C "$MOUNT/"
 [ -f "$IDB.txz" ] && tar xpfJ "$IDB.txz" --absolute-names -C "$MOUNT/usr/syno/synoman/indexdb/"
 
-# Install Agent
-
-LOC="$MOUNT/usr/local/bin"
-mkdir -p "$LOC"
-cp /agent/agent.sh "$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 755 "$LOC/agent.sh"
-
 info "Install: Installing system partition..."
 
 LABEL="1.44.1-42218"
@@ -254,9 +250,11 @@ rm -rf "$MOUNT"
 
 echo "$BASE" > "$STORAGE"/dsm.ver
 
+if [[ "$TMP" != "$STORAGE/tmp" ]]; then
   # Check free diskspace
   SPACE=$(df --output=avail -B 1 "$STORAGE" | tail -n 1)
-(( MIN_SPACE > SPACE )) && error "Not enough free space in storage folder." && exit 94
+  (( MIN_SPACE > SPACE )) && error "Not enough free space in storage folder, need at least 6 GB." && exit 94
+fi
 
 mv -f "$PAT" "$STORAGE"/"$BASE".pat
 mv -f "$BOOT" "$STORAGE"/"$BASE".boot.img

run/power.sh

@@ -39,16 +39,11 @@ _graceful_shutdown() {
 
     echo && error "Could not send shutdown command to the guest ($RESPONSE)"
 
-    # Send a NMI interrupt which will be detected by the agent script
-    if ! echo 'nmi' | nc -q 1 -w 1 localhost "${QEMU_MONPORT}" > /dev/null ; then
-
     kill -15 "$(cat "${_QEMU_PID}")"
     pkill -f qemu-system-x86_64 || true
 
   fi
 
-  fi
-
   while [ "$(cat ${_QEMU_SHUTDOWN_COUNTER})" -lt "${QEMU_POWERDOWN_TIMEOUT}" ]; do
 
     # Increase the counter
@@ -58,6 +53,7 @@ _graceful_shutdown() {
     if echo 'info version'| nc -q 1 -w 1 localhost "${QEMU_MONPORT}" >/dev/null 2>&1 ; then
 
       sleep 1
+
       CNT="$(cat ${_QEMU_SHUTDOWN_COUNTER})/${QEMU_POWERDOWN_TIMEOUT}"
       [[ "${DEBUG}" == [Yy1]* ]] && info "Shutting down, waiting... (${CNT})"
 

run/print.sh

@@ -0,0 +1,63 @@
+#!/usr/bin/env bash
+set -Eeuo pipefail
+
+info () { echo -e >&2 "\E[1;34m❯\E[1;36m $1\E[0m" ; }
+error () { echo -e >&2 "\E[1;31m❯ ERROR: $1\E[0m" ; }
+
+retry=true
+
+while [ "$retry" = true ]
+do
+
+  sleep 3
+
+  # Retrieve IP from guest VM
+
+  set +e
+  RESPONSE=$(curl -s -m 16 -S http://127.0.0.1:2210/read?command=10 2>&1)
+  set -e
+
+  if [[ ! "${RESPONSE}" =~ "\"success\"" ]] ; then
+    error "Failed to connect to guest: $RESPONSE" && continue
+  fi
+
+  # Retrieve the HTTP port number
+  if [[ ! "${RESPONSE}" =~ "\"http_port\"" ]] ; then
+    error "Failed to parse response from guest: $RESPONSE" && continue
+  fi
+
+  rest=${RESPONSE#*http_port}
+  rest=${rest#*:}
+  rest=${rest%%,*}
+  PORT=${rest%%\"*}
+
+  [ -z "${PORT}" ] && continue
+
+  # Retrieve the IP address
+  if [[ ! "${RESPONSE}" =~ "eth0" ]] ; then
+    error "Failed to parse response from guest: $RESPONSE" && continue
+  fi
+
+  rest=${RESPONSE#*eth0}
+  rest=${rest#*ip}
+  rest=${rest#*:}
+  rest=${rest#*\"}
+  IP=${rest%%\"*}
+
+  [ -z "${IP}" ] && continue
+
+  retry=false
+
+done
+
+if [[ "$IP" == "20.20"* ]]; then
+  MSG="port ${PORT}"
+else
+  MSG="http://${IP}:${PORT}"
+fi
+
+echo "" >&2
+info "--------------------------------------------------------"
+info " You can now login to DSM at ${MSG}"
+info "--------------------------------------------------------"
+echo "" >&2

run/serial.sh

@@ -5,13 +5,10 @@ set -Eeuo pipefail
 
 : ${HOST_CPU:=''}
 : ${HOST_MAC:=''}
-: ${HOST_BUILD:=''}
 : ${HOST_DEBUG:=''}
 : ${HOST_SERIAL:=''}
-: ${GUEST_SERIAL:=''}
 : ${HOST_MODEL:=''}
-: ${HOST_VERSION:=''}
+: ${GUEST_SERIAL:=''}
-: ${HOST_TIMESTAMP:=''}
 
 if [ -z "$HOST_CPU" ]; then
   HOST_CPU=$(lscpu | grep 'Model name' | cut -f 2 -d ":" | awk '{$1=$1}1' | sed 's# @.*##g' | sed s/"(R)"//g | sed 's/[^[:alnum:] ]\+/ /g' | sed 's/  */ /g')
@@ -32,12 +29,9 @@ HOST_ARGS+=("-cpu=${CPU_CORES}")
 HOST_ARGS+=("-cpu_arch=${HOST_CPU}")
 
 [ -n "$HOST_MAC" ] && HOST_ARGS+=("-mac=${HOST_MAC}")
-[ -n "$HOST_BUILD" ] && HOST_ARGS+=("-build=${HOST_BUILD}")
 [ -n "$HOST_MODEL" ] && HOST_ARGS+=("-model=${HOST_MODEL}")
 [ -n "$HOST_SERIAL" ] && HOST_ARGS+=("-hostsn=${HOST_SERIAL}")
 [ -n "$GUEST_SERIAL" ] && HOST_ARGS+=("-guestsn=${GUEST_SERIAL}")
-[ -n "$HOST_VERSION" ] && HOST_ARGS+=("-version=${HOST_VERSION}")
-[ -n "$HOST_TIMESTAMP" ] && HOST_ARGS+=("-ts=${HOST_TIMESTAMP}")
 
 if [[ "${HOST_DEBUG}" == [Yy1]* ]]; then
   set -x
@@ -45,7 +39,7 @@ if [[ "${HOST_DEBUG}" == [Yy1]* ]]; then
   { set +x; } 2>/dev/null
   echo
 else
-  ./run/host.bin "${HOST_ARGS[@]}" 2> /dev/null &
+  ./run/host.bin "${HOST_ARGS[@]}" >/dev/null &
 fi
 
 # Configure serial ports