fix: Use /tmp for server (#560)

* feat: Add FUSE warning

.github/workflows/check.yml

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

Dockerfile

@@ -2,7 +2,7 @@ FROM qemux/qemu-host as builder
 
 #  FROM golang as builder
 #  WORKDIR /
-#  RUN git clone https://github.com/qemu-tools/qemu-host.git
+#  RUN git clone https://github.com/qemus/qemu-host.git
 #  WORKDIR /qemu-host/src
 #  RUN go mod download
 #  RUN CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o /qemu-host.bin .
@@ -10,11 +10,12 @@ FROM qemux/qemu-host as builder
 FROM debian:trixie-slim
 
 ARG TARGETPLATFORM
-ARG DEBCONF_NOWARNINGS="yes"
-ARG DEBIAN_FRONTEND noninteractive
+ARG DEBCONF_NOWARNINGS "yes"
+ARG DEBIAN_FRONTEND "noninteractive"
+ARG DEBCONF_NONINTERACTIVE_SEEN "true"
 
-RUN apt-get update && apt-get -y upgrade \
-    && if [ "$TARGETPLATFORM" != "linux/amd64" ]; then extra="qemu-user"; fi \
+RUN if [ "$TARGETPLATFORM" != "linux/amd64" ]; then extra="qemu-user"; fi \
+    && apt-get update \
     && apt-get --no-install-recommends -y install \
         jq \
         tini \
@@ -28,6 +29,7 @@ RUN apt-get update && apt-get -y upgrade \
         xz-utils \
         iptables \
         iproute2 \
+        apt-utils \
         dnsmasq \
         fakeroot \
         net-tools \
@@ -44,13 +46,13 @@ COPY --from=builder /qemu-host.bin /run/host.bin
 RUN chmod +x /run/*.sh && chmod +x /run/*.bin
 
 VOLUME /storage
-EXPOSE 22 80 139 445 5000
+EXPOSE 22 139 445 5000
 
 ENV RAM_SIZE "1G"
 ENV DISK_SIZE "16G"
 ENV CPU_CORES "1"
 
-ARG VERSION_ARG="0.0"
+ARG VERSION_ARG "0.0"
 RUN echo "$VERSION_ARG" > /run/version
 
 HEALTHCHECK --interval=60s --start-period=45s --retries=2 CMD /run/check.sh

agent/agent.sh

@@ -1,140 +0,0 @@
-#!/usr/bin/env bash
-set -u
-
-VERSION="9"
-HEADER="VirtualDSM Agent"
-
-# Functions
-
-error () { echo -e "\E[1;31m❯ ERROR: $1\E[0m" ; }
-info () { echo -e "\E[1;34m❯\E[1;36m $1\E[0m" ; }
-
-finish() {
-
-  echo "❯ $HEADER: Shutting down.."
-  exit
-
-}
-
-function checkNMI {
-
-  local nmi
-  nmi=$(cat /proc/interrupts | grep NMI | sed 's/[^1-9]*//g')
-
-  if [ "$nmi" != "" ]; then
-
-    info "Received shutdown request through NMI.."
-
-    /usr/syno/sbin/synoshutdown -s > /dev/null
-    finish
-
-  fi
-}
-
-function downloadUpdate {
-
-  TMP="/tmp/agent.sh"
-  rm -f "${TMP}"
-
-  # Auto update the agent
-
-  URL="https://raw.githubusercontent.com/vdsm/virtual-dsm/master/agent/agent.sh"
-  
-  remote_size=$(curl -sIk -m 4 "${URL}" | grep -i "content-length:" | tr -d " \t" | cut -d ':' -f 2)
-  remote_size=${remote_size//$'\r'}
-
-  [[ "$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
-
-  if ! curl -sfk -m 10 -o "${TMP}" "${URL}"; then
-    error "$HEADER: curl error ($?)" && return
-  fi
-
-  if [ ! -f "${TMP}" ]; then
-    error "$HEADER: update error, file not found.." && return
-  fi
-
-  line=$(head -1 "${TMP}")
-
-  if [[ "$line" != "#!/usr/bin/env bash" ]]; then
-    error "$HEADER: update error, invalid header: $line" && return
-  fi
-
-  if cmp --silent -- "${TMP}" "${SCRIPT}"; then
-    error "$HEADER: update file is already equal? (${local_size} / ${remote_size})" && return
-  fi
-
-  mv -f "${TMP}" "${SCRIPT}"
-  chmod 755 "${SCRIPT}"
-
-  info "$HEADER: succesfully installed update..."
-
-}
-
-function installPackages {
-
-  for filename in /usr/local/packages/*.spk; do
-    if [ -f "$filename" ]; then
-
-      BASE=$(basename "$filename" .spk)
-      BASE="${BASE%%-*}"
-
-      [[ $BASE == "ActiveInsight" ]] && continue
-
-      info "Installing package ${BASE}.."
-
-      /usr/syno/bin/synopkg install "$filename" > /dev/null
-      /usr/syno/bin/synopkg start "$BASE" > /dev/null &
-
-      rm "$filename"
-
-    fi
-  done
-
-}
-
-trap finish SIGINT SIGTERM
-
-ts=$(date +%s%N)
-
-echo ""
-echo "❯ Started $HEADER v$VERSION..."
-
-checkNMI
-
-# Install packages 
-
-first_run=false
-
-for filename in /usr/local/packages/*.spk; do
-  if [ -f "$filename" ]; then
-    first_run=true
-  fi
-done
-
-if [ "$first_run" = true ]; then
-
-  installPackages
-
-else
-
-  downloadUpdate
-
-fi
-
-# Wait for NMI interrupt as a shutdown signal
-
-while true; do
-
-  checkNMI
-  sleep 2 & wait $!
-
-done

agent/service.sh

@@ -1,87 +0,0 @@
-#!/bin/bash
-
-PIDFILE="/var/run/agent.pid"
-SCRIPT="/usr/local/bin/agent.sh"
-
-error () { echo -e "\E[1;31m❯ ERROR: $1\E[0m" ; }
-info () { echo -e "\E[1;34m❯\E[1;36m $1\E[0m" ; }
-
-status() {
-
-  if [ -f "$PIDFILE" ] && kill -0 "$(cat "$PIDFILE")"; then
-    echo 'Service running'
-    return 1
-  fi
-
-  return 0
-}
-
-start() {
-
-  if [ -f "$PIDFILE" ] && kill -0 "$(cat "$PIDFILE")"; then
-    echo 'Service already running'
-    return 1
-  fi
-
-  echo 'Starting agent service...'
-  chmod 666 /dev/ttyS0
-
-  if [ ! -f "$SCRIPT" ]; then
-
-    URL="https://raw.githubusercontent.com/vdsm/virtual-dsm/master/agent/agent.sh"
-
-    if ! curl -sfk -m 10 -o "${SCRIPT}" "${URL}"; then
-      error 'Failed to download agent script.' > /dev/ttyS0
-      rm -f "${SCRIPT}"
-      return 1
-    else
-      info 'Agent script was missing?' > /dev/ttyS0
-    fi
-
-    chmod 755 "${SCRIPT}"
-
-  fi
-
-  echo "-" > /var/lock/subsys/agent.sh
-  "$SCRIPT" &> /dev/ttyS0 & echo $! > "$PIDFILE"
-
-  return 0
-}
-
-stop() {
-
-  if [ ! -f "$PIDFILE" ] || ! kill -0 "$(cat "$PIDFILE")"; then
-    echo 'Service not running'
-    return 1
-  fi
-
-  echo 'Stopping agent service...'
-
-  chmod 666 /dev/ttyS0
-  info 'Stopping agent service...' > /dev/ttyS0
-
-  kill -15 "$(cat "$PIDFILE")" && rm -f "$PIDFILE"
-  rm -f /var/lock/subsys/agent.sh
-
-  echo 'Service stopped'
-  return 0
-}
-
-case "$1" in
-  start)
-    start
-    ;;
-  stop)
-    stop
-    ;;
-  status)
-    status
-    ;;
-  restart)
-    stop
-    start
-    ;;
-  *)
-    echo "Usage: $0 {start|stop|restart}"
-    exit 1
-esac

docker-compose.yml

@@ -9,8 +9,6 @@ services:
             CPU_CORES: "1"
         devices:
             - /dev/kvm
-            - /dev/net/tun
-            - /dev/vhost-net
         device_cgroup_rules:
             - 'c *:* rwm'
         cap_add:

readme.md

@@ -95,7 +95,6 @@ docker run -it --rm -p 5000:5000 --device=/dev/kvm --cap-add NET_ADMIN --stop-ti
 
     ```yaml
     environment:
-      ALLOCATE: "N"
       DISK_FMT: "qcow2"
     ```
 
@@ -122,7 +121,7 @@ docker run -it --rm -p 5000:5000 --device=/dev/kvm --cap-add NET_ADMIN --stop-ti
     sudo kvm-ok
     ```
 
-    If you receive an error from `kvm-ok` indicating that KVM acceleration can't be used, check your BIOS settings.
+    If you receive an error from `kvm-ok` indicating that KVM acceleration can't be used, check the virtualization settings in the BIOS.
 
   * ### How do I assign an individual IP address to the container?
 
@@ -188,9 +187,26 @@ docker run -it --rm -p 5000:5000 --device=/dev/kvm --cap-add NET_ADMIN --stop-ti
 
     This can be used to enable the facial recognition function in Synology Photos for example.
 
+  * ### How do I passthrough a disk?
+
+    When running the container inside a virtualized environment, it is possible to passthrough disk devices directly, instead of binding a folder containing an image. As these devices are already backed by an image on the host, this removes an extra layer.
+
+    This allows for easier management and higher performance. To do so, you can add those devices to your compose file:
+
+    ```yaml
+    environment:
+      DEVICE: "/dev/sda"
+      DEVICE2: "/dev/sdb"
+    devices:
+      - /dev/sda
+      - /dev/sdb
+    ```
+
+    Please beware that any existing data on the device will be wiped, as DSM will format its partition table during first use. So do NOT passthrough devices containing valueable data.
+
   * ### How do I install a specific version of vDSM?
 
-    By default, version 7.2.1 will be installed, but if you prefer an older version, you can add its download URL to your compose file as follows:
+    By default, version 7.2 will be installed, but if you prefer an older version, you can add its download URL to your compose file as follows:
 
     ```yaml
     environment:

src/check.sh

@@ -1,11 +1,11 @@
 #!/usr/bin/env bash
 set -Eeuo pipefail
 
-[ -f "/run/qemu.end" ] && echo "QEMU is shutting down.." && exit 1
-[ ! -f "/run/qemu.pid" ] && echo "QEMU is not running yet.." && exit 0
+[ -f "/run/shm/qemu.end" ] && echo "QEMU is shutting down.." && exit 1
+[ ! -f "/run/shm/qemu.pid" ] && echo "QEMU is not running yet.." && exit 0
 
-file="/run/dsm.url"
-address="/run/qemu.ip"
+file="/run/shm/dsm.url"
+address="/run/shm/qemu.ip"
 
 [ ! -f  "$file" ] && echo "DSM has not enabled networking yet.." && exit 1
 

src/disk.sh

@@ -83,7 +83,7 @@ isCow() {
   if [[ "${FS,,}" == "xfs" || "${FS,,}" == "zfs" || "${FS,,}" == "btrfs" || "${FS,,}" == "bcachefs" ]]; then
     return 0
   fi
-       
+
   return 1
 }
 
@@ -126,7 +126,7 @@ createDisk() {
       fi
 
       if [[ "$ALLOCATE" == [Nn]* ]]; then
-    
+
         # Create an empty file
         if ! truncate -s "$DATA_SIZE" "$DISK_FILE"; then
           rm -f "$DISK_FILE"
@@ -319,6 +319,10 @@ checkFS () {
     info "Warning: the filesystem of $DIR is OverlayFS, this usually means it was binded to an invalid path!"
   fi
 
+  if [[ "${FS,,}" == "fuse"* ]]; then
+    info "Warning: the filesystem of $DIR is FUSE, this extra layer will negatively affect performance!"
+  fi
+
   if isCow "$FS"; then
     if [ -f "$DISK_FILE" ]; then
       FA=$(lsattr "$DISK_FILE")
@@ -397,8 +401,35 @@ addDisk () {
   return 0
 }
 
+addDevice () {
+
+  local DISK_ID=$1
+  local DISK_DEV=$2
+  local DISK_DESC=$3
+  local DISK_INDEX=$4
+  local DISK_ADDRESS=$5
+
+  [ -z "$DISK_DEV" ] && return 0
+  [ ! -b "$DISK_DEV" ] && error "Device $DISK_DEV cannot be found! Please add it to the 'devices' section of your compose file." && exit 55
+
+  DISK_OPTS="$DISK_OPTS \
+    -device virtio-scsi-pci,id=hw-$DISK_ID,iothread=io2,bus=pcie.0,addr=$DISK_ADDRESS \
+    -drive file=$DISK_DEV,if=none,id=drive-$DISK_ID,format=raw,cache=$DISK_CACHE,aio=$DISK_IO,discard=$DISK_DISCARD,detect-zeroes=on \
+    -device scsi-hd,bus=hw-$DISK_ID.0,channel=0,scsi-id=0,lun=0,drive=drive-$DISK_ID,id=$DISK_ID,rotation_rate=$DISK_ROTATION,bootindex=$DISK_INDEX"
+
+  return 0
+}
+
 DISK_EXT="$(fmt2ext "$DISK_FMT")" || exit $?
 
+if [ -z "$ALLOCATE" ]; then
+  if [[ "${DISK_FMT,,}" == "raw" ]]; then
+    ALLOCATE="Y"
+  else
+    ALLOCATE="N"
+  fi
+fi
+
 if [[ "$ALLOCATE" == [Nn]* ]]; then
   DISK_TYPE="growable"
   DISK_ALLOC="preallocation=off"
@@ -440,52 +471,38 @@ if [ ! -f "$DISK3_FILE.img" ]; then
 fi
 
 DISK4_FILE="/storage4/data4"
-DISK5_FILE="/storage5/data5"
-DISK6_FILE="/storage6/data6"
 
 : ${DISK2_SIZE:=''}
 : ${DISK3_SIZE:=''}
 : ${DISK4_SIZE:=''}
-: ${DISK5_SIZE:=''}
-: ${DISK6_SIZE:=''}
 
-addDisk "userdata" "$DISK1_FILE" "$DISK_EXT" "disk" "$DISK_SIZE" "3" "0xc" "$DISK_FMT" || exit $?
-addDisk "userdata2" "$DISK2_FILE" "$DISK_EXT" "disk2" "$DISK2_SIZE" "4" "0xd" "$DISK_FMT" || exit $?
-addDisk "userdata3" "$DISK3_FILE" "$DISK_EXT" "disk3" "$DISK3_SIZE" "5" "0xe" "$DISK_FMT" || exit $?
-addDisk "userdata4" "$DISK4_FILE" "$DISK_EXT" "disk4" "$DISK4_SIZE" "9" "0x7" "$DISK_FMT" || exit $?
-addDisk "userdata5" "$DISK5_FILE" "$DISK_EXT" "disk5" "$DISK5_SIZE" "10" "0x8" "$DISK_FMT" || exit $?
-addDisk "userdata6" "$DISK6_FILE" "$DISK_EXT" "disk6" "$DISK6_SIZE" "11" "0x9" "$DISK_FMT" || exit $?
-
-addDevice () {
-
-  local DISK_ID=$1
-  local DISK_DEV=$2
-  local DISK_INDEX=$3
-  local DISK_ADDRESS=$4
-
-  [ -z "$DISK_DEV" ] && return 0
-  [ ! -b "$DISK_DEV" ] && error "Device $DISK_DEV cannot be found! Please add it to the 'devices' section of your compose file." && exit 55
-
-  DISK_OPTS="$DISK_OPTS \
-    -device virtio-scsi-pci,id=hw-$DISK_ID,iothread=io2,bus=pcie.0,addr=$DISK_ADDRESS \
-    -drive file=$DISK_DEV,if=none,id=drive-$DISK_ID,format=raw,cache=$DISK_CACHE,aio=$DISK_IO,discard=$DISK_DISCARD,detect-zeroes=on \
-    -device scsi-hd,bus=hw-$DISK_ID.0,channel=0,scsi-id=0,lun=0,drive=drive-$DISK_ID,id=$DISK_ID,rotation_rate=$DISK_ROTATION,bootindex=$DISK_INDEX"
-
-  return 0
-}
-
-: ${DEVICE:=''}        # Docker variable to passthrough a block device, like /dev/vdc1.
+: ${DEVICE:=''}        # Docker variables to passthrough a block device, like /dev/vdc1.
 : ${DEVICE2:=''}
 : ${DEVICE3:=''}
 : ${DEVICE4:=''}
-: ${DEVICE5:=''}
-: ${DEVICE6:=''}
 
-addDevice "userdata7" "$DEVICE" "6" "0xf" || exit $?
-addDevice "userdata8" "$DEVICE2" "7" "0x5" || exit $?
-addDevice "userdata9" "$DEVICE3" "8" "0x6" || exit $?
-addDevice "userdata4" "$DEVICE4" "9" "0x7" || exit $?
-addDevice "userdata5" "$DEVICE5" "10" "0x8" || exit $?
-addDevice "userdata6" "$DEVICE6" "11" "0x9" || exit $?
+if [ -n "$DEVICE" ]; then
+  addDevice "userdata" "$DEVICE" "device" "3" "0xc" || exit $?
+else
+  addDisk "userdata" "$DISK1_FILE" "$DISK_EXT" "disk" "$DISK_SIZE" "3" "0xc" "$DISK_FMT" || exit $?
+fi
+
+if [ -n "$DEVICE2" ]; then
+  addDevice "userdata2" "$DEVICE2" "device2" "4" "0xd" || exit $?
+else
+  addDisk "userdata2" "$DISK2_FILE" "$DISK_EXT" "disk2" "$DISK2_SIZE" "4" "0xd" "$DISK_FMT" || exit $?
+fi
+
+if [ -n "$DEVICE3" ]; then
+  addDevice "userdata3" "$DEVICE3" "device3" "5" "0xe" || exit $?
+else
+  addDisk "userdata3" "$DISK3_FILE" "$DISK_EXT" "disk3" "$DISK3_SIZE" "5" "0xe" "$DISK_FMT" || exit $?
+fi
+
+if [ -n "$DEVICE4" ]; then
+  addDevice "userdata4" "$DEVICE4" "device4" "6" "0xf" || exit $?
+else
+  addDisk "userdata4" "$DISK4_FILE" "$DISK_EXT" "disk4" "$DISK4_SIZE" "6" "0xf" "$DISK_FMT" || exit $?
+fi
 
 return 0

src/display.sh

@@ -6,21 +6,14 @@ set -Eeuo pipefail
 : ${GPU:='N'}           # GPU passthrough
 : ${DISPLAY:='none'}  # Display type
 
-case "${DISPLAY,,}" in
-  vnc)
-    DISPLAY_OPTS="-display vnc=:0 -vga virtio"
-    ;;
-  *)
-    DISPLAY_OPTS="-display $DISPLAY -vga none"
-    ;;
-esac
-
 if [[ "$GPU" != [Yy1]* ]] || [[ "$ARCH" != "amd64" ]]; then
+
+  DISPLAY_OPTS="-display $DISPLAY -vga none"
   return 0
+
 fi
 
 DISPLAY_OPTS="-display egl-headless,rendernode=/dev/dri/renderD128 -vga virtio"
-[[ "${DISPLAY,,}" == "vnc" ]] && DISPLAY_OPTS="$DISPLAY_OPTS -vnc :0"
 
 [ ! -d /dev/dri ] && mkdir -m 755 /dev/dri
 

src/entry.sh

@@ -2,7 +2,7 @@
 set -Eeuo pipefail
 
 echo "❯ Starting Virtual DSM for Docker v$(</run/version)..."
-echo "❯ For support visit https://github.com/vdsm/virtual-dsm/"
+echo "❯ For support visit https://github.com/vdsm/virtual-dsm"
 
 cd /run
 
@@ -22,11 +22,12 @@ if [[ "$CONSOLE" == [Yy]* ]]; then
   exec qemu-system-x86_64 ${ARGS:+ $ARGS}
 fi
 
-[[ "$DEBUG" == [Yy1]* ]] && info "$VERS" && set -x
-msg=$(qemu-system-x86_64 ${ARGS:+ $ARGS})
+[[ "$DEBUG" == [Yy1]* ]] && info "$VERS" && echo "Arguments: $ARGS" && echo
+{ qemu-system-x86_64 ${ARGS:+ $ARGS} >"$QEMU_OUT" 2>"$QEMU_LOG"; rc=$?; } || :
+(( rc != 0 )) && error "$(cat "$QEMU_LOG")" && exit 15
 
-{ set +x; } 2>/dev/null && terminal "$msg"
+terminal
 tail -fn +0 "$QEMU_LOG" 2>/dev/null &
-cat "$QEMU_TERM" 2>/dev/null & wait $! || true
+cat "$QEMU_TERM" 2>/dev/null & wait $! || :
 
 sleep 1 && finish 0

src/install.sh

@@ -3,7 +3,7 @@ set -Eeuo pipefail
 
 : ${URL:=''}    # URL of the PAT file to be downloaded.
 
-if [ -f "$STORAGE"/dsm.ver ]; then
+if [ -f "$STORAGE/dsm.ver" ]; then
   BASE=$(cat "$STORAGE/dsm.ver")
 else
   # Fallback for old installs
@@ -37,44 +37,50 @@ fi
 BASE=$(basename "$URL" .pat)
 
 if [[ "$URL" != "file://$STORAGE/$BASE.pat" ]]; then
-  rm -f "$STORAGE"/"$BASE".pat
+  rm -f "$STORAGE/$BASE.pat"
 fi
 
-rm -f "$STORAGE"/"$BASE".agent
-rm -f "$STORAGE"/"$BASE".boot.img
-rm -f "$STORAGE"/"$BASE".system.img
+rm -f "$STORAGE/$BASE.agent"
+rm -f "$STORAGE/$BASE.boot.img"
+rm -f "$STORAGE/$BASE.system.img"
 
 [[ "$DEBUG" == [Yy1]* ]] && set -x
 
 # Check filesystem
-MIN_ROOT=471859200
-MIN_SPACE=6442450944
 FS=$(stat -f -c %T "$STORAGE")
 
 if [[ "${FS,,}" == "overlay"* ]]; then
   info "Warning: the filesystem of $STORAGE is OverlayFS, this usually means it was binded to an invalid path!"
 fi
 
-if [[ "${FS,,}" != "fat"* && "${FS,,}" != "vfat"* && "${FS,,}" != "exfat"* && \
-        "${FS,,}" != "ntfs"* && "${FS,,}" != "fuse"* && "${FS,,}" != "msdos"* ]]; then
+if [[ "${FS,,}" == "fuse"* ]]; then
+  info "Warning: the filesystem of $STORAGE is FUSE, this extra layer will negatively affect performance!"
+fi
+
+if [[ "${FS,,}" != "fat"* && "${FS,,}" != "vfat"* && "${FS,,}" != "exfat"* && "${FS,,}" != "ntfs"* && "${FS,,}" != "msdos"* ]]; then
   TMP="$STORAGE/tmp"
 else
   TMP="/tmp/dsm"
+  TMP_SPACE=2147483648
   SPACE=$(df --output=avail -B 1 /tmp | tail -n 1)
-  if (( MIN_SPACE > SPACE )); then
-    error "The ${FS^^} filesystem of $STORAGE does not support UNIX permissions, and no space left in container!" && exit 93
+  SPACE_MB=$(( (SPACE + 1048575)/1048576 ))
+  if (( TMP_SPACE > SPACE )); then
+    error "Not enough free space inside the container, have $SPACE_MB MB available but need at least 2 GB." && exit 93
   fi
 fi
 
 rm -rf "$TMP" && mkdir -p "$TMP"
 
 # Check free diskspace
+ROOT_SPACE=536870912
 SPACE=$(df --output=avail -B 1 / | tail -n 1)
-(( MIN_ROOT > SPACE )) && error "Not enough free space in container root, need at least 450 MB available." && exit 96
+SPACE_MB=$(( (SPACE + 1048575)/1048576 ))
+(( ROOT_SPACE > SPACE )) && error "Not enough free space inside the container, have $SPACE_MB MB available but need at least 500 MB." && exit 96
 
+MIN_SPACE=8589934592
 SPACE=$(df --output=avail -B 1 "$STORAGE" | tail -n 1)
 SPACE_GB=$(( (SPACE + 1073741823)/1073741824 ))
-(( MIN_SPACE > SPACE )) && error "Not enough free space for installation in $STORAGE, have $SPACE_GB GB available but need at least 6 GB." && exit 94
+(( MIN_SPACE > SPACE )) && error "Not enough free space for installation in $STORAGE, have $SPACE_GB GB available but need at least 8 GB." && exit 94
 
 # Check if output is to interactive TTY
 if [ -t 1 ]; then
@@ -133,7 +139,7 @@ if [ -f "$RDC" ]; then
     (( rc != 0 )) && error "Failed to extract $RDC, reason $rc" && exit 92
   fi
 
-  mkdir -p /run/extract
+  rm -rf /run/extract && mkdir -p /run/extract
   for file in $TMP/usr/lib/libcurl.so.4 \
               $TMP/usr/lib/libmbedcrypto.so.5 \
               $TMP/usr/lib/libmbedtls.so.13 \
@@ -205,6 +211,7 @@ else
 
 fi
 
+rm -rf /run/extract
 info "Install: Preparing system partition..."
 
 BOOT=$(find "$TMP" -name "*.bin.zip")
@@ -213,19 +220,22 @@ BOOT=$(find "$TMP" -name "*.bin.zip")
 BOOT=$(echo "$BOOT" | head -c -5)
 unzip -q -o "$BOOT".zip -d "$TMP"
 
-SYSTEM="$TMP/sys.img"
-SYSTEM_SIZE=4954537983
+SYSTEM="$STORAGE/$BASE.system.img"
 rm -f "$SYSTEM"
 
 # Check free diskspace
-SPACE=$(df --output=avail -B 1 "$TMP" | tail -n 1)
-SPACE_GB=$(( (SPACE + 1073741823)/1073741824 ))
-(( SYSTEM_SIZE > SPACE )) && error "Not enough free space to create a 4 GB system disk, have only $SPACE_GB GB available." && exit 97
+SYSTEM_SIZE=4954537983
+SPACE=$(df --output=avail -B 1 "$STORAGE" | tail -n 1)
+SPACE_MB=$(( (SPACE + 1048575)/1048576 ))
+
+if (( SYSTEM_SIZE > SPACE )); then
+  error "Not enough free space in $STORAGE to create a 5 GB system disk, have only $SPACE_MB MB available." && exit 97
+fi
 
 if ! touch "$SYSTEM"; then
   error "Could not create file $SYSTEM for the system disk." && exit 98
 fi
-  
+
 if [[ "${FS,,}" == "xfs" || "${FS,,}" == "zfs" || "${FS,,}" == "btrfs" || "${FS,,}" == "bcachefs" ]]; then
   { chattr +C "$SYSTEM"; } || :
   FA=$(lsattr "$SYSTEM")
@@ -241,17 +251,6 @@ if ! fallocate -l "$SYSTEM_SIZE" "$SYSTEM"; then
   fi
 fi
 
-# Check if file exists
-[ ! -f "$SYSTEM" ] && error "System disk does not exist ($SYSTEM)" && exit 99
-
-# Check the filesize
-SIZE=$(stat -c%s "$SYSTEM")
-
-if [[ SIZE -ne SYSTEM_SIZE ]]; then
-  rm -f "$SYSTEM"
-  error "System disk has the wrong size: $SIZE vs $SYSTEM_SIZE" && exit 90
-fi
-
 PART="$TMP/partition.fdisk"
 
 {       echo "label: dos"
@@ -277,15 +276,8 @@ PKG="$TMP/packages"
 HDP="$TMP/synohdpack_img"
 
 [ ! -f "$HDA.tgz" ] && error "The PAT file contains no OS image." && exit 64
-
 mv "$HDA.tgz" "$HDA.txz"
 
-if [[ "$ROOT" != [Nn]* ]]; then
-
-  tar xpfJ "$HDA.txz" --absolute-names -C "$MOUNT/"
-
-fi
-
 [ -d "$PKG" ] && mv "$PKG/" "$MOUNT/.SynoUpgradePackages/"
 rm -f "$MOUNT/.SynoUpgradePackages/ActiveInsight-"*
 
@@ -303,6 +295,8 @@ NUMBLOCKS="622560" # (4980480 * 512) / 4096
 
 if [[ "$ROOT" != [Nn]* ]]; then
 
+  tar xpfJ "$HDA.txz" --absolute-names --skip-old-files -C "$MOUNT/"
+
   info "Install: Installing system partition..."
 
   mke2fs -q -t ext4 -b 4096 -d "$MOUNT/" -L "$LABEL" -F -E "offset=$OFFSET" "$SYSTEM" "$NUMBLOCKS"
@@ -318,16 +312,15 @@ fi
 
 rm -rf "$MOUNT"
 
-echo "$BASE" > "$STORAGE"/dsm.ver
+echo "$BASE" > "$STORAGE/dsm.ver"
 
 if [[ "$URL" == "file://$STORAGE/$BASE.pat" ]]; then
   rm -f "$PAT"
 else
-  mv -f "$PAT" "$STORAGE"/"$BASE".pat
+  mv -f "$PAT" "$STORAGE/$BASE.pat"
 fi
 
-mv -f "$BOOT" "$STORAGE"/"$BASE".boot.img
-mv -f "$SYSTEM" "$STORAGE"/"$BASE".system.img
+mv -f "$BOOT" "$STORAGE/$BASE.boot.img"
 
 rm -rf "$TMP"
 

src/network.sh

@@ -4,7 +4,6 @@ set -Eeuo pipefail
 # Docker environment variables
 
 : ${DHCP:='N'}
-: ${HOST_PORTS:=''}
 : ${MAC:='02:11:32:AA:BB:CC'}
 
 : ${VM_NET_DEV:=''}
@@ -91,40 +90,6 @@ configureDNS() {
   return 0
 }
 
-getPorts() {
-
-  local list=$1
-  local args=""
-  local vnc="5900"
-
-  list="${list//,/ }"
-  list="${list## }"
-  list="${list%% }"
-
-  if [[ "${DISPLAY,,}" == "vnc" ]] && [[ "$list" != *"$vnc"* ]]; then
-    if [ -z "$list" ]; then
-      list="$vnc"
-    else
-      list="$list $vnc"
-    fi
-  fi
-
-  if [ -n "$list" ]; then
-    if [[ "$list" != *" "* ]]; then
-      args=" ! --dport $list"
-    else
-      args=" -m multiport ! --dports "
-      for port in $list; do
-        args="${args}${port},"
-      done
-      args="${args%?}"
-    fi
-  fi
-
-  echo "$args"
-  return 0
-}
-
 configureNAT() {
 
   # Create the necessary file structure for /dev/net/tun
@@ -179,11 +144,8 @@ configureNAT() {
   update-alternatives --set iptables /usr/sbin/iptables-legacy > /dev/null
   update-alternatives --set ip6tables /usr/sbin/ip6tables-legacy > /dev/null
 
-  exclude="$(getPorts "$HOST_PORTS")"
-
   iptables -t nat -A POSTROUTING -o "$VM_NET_DEV" -j MASQUERADE
-  # shellcheck disable=SC2086
-  iptables -t nat -A PREROUTING -i "$VM_NET_DEV" -d "$IP" -p tcp${exclude} -j DNAT --to "$VM_NET_IP"
+  iptables -t nat -A PREROUTING -i "$VM_NET_DEV" -d "$IP" -p tcp -j DNAT --to "$VM_NET_IP"
   iptables -t nat -A PREROUTING -i "$VM_NET_DEV" -d "$IP" -p udp  -j DNAT --to "$VM_NET_IP"
 
   if (( KERNEL > 4 )); then
@@ -256,7 +218,7 @@ getInfo() {
 
   GATEWAY=$(ip r | grep default | awk '{print $3}')
   IP=$(ip address show dev "$VM_NET_DEV" | grep inet | awk '/inet / { print $2 }' | cut -f1 -d/)
-  echo "$IP" > /run/qemu.ip
+  echo "$IP" > /run/shm/qemu.ip
 
   return 0
 }

src/power.sh

@@ -10,18 +10,16 @@ API_HOST="127.0.0.1:2210"
 QEMU_TERM=""
 QEMU_PORT=7100
 QEMU_TIMEOUT=50
-QEMU_PID="/run/qemu.pid"
-QEMU_LOG="/run/qemu.log"
-QEMU_END="/run/qemu.end"
+QEMU_PID="/run/shm/qemu.pid"
+QEMU_LOG="/run/shm/qemu.log"
+QEMU_OUT="/run/shm/qemu.out"
+QEMU_END="/run/shm/qemu.end"
 
 if [[ "$KVM" == [Nn]* ]]; then
   API_TIMEOUT=$(( API_TIMEOUT*2 ))
   QEMU_TIMEOUT=$(( QEMU_TIMEOUT*2 ))
 fi
 
-rm -f "$QEMU_PID"
-rm -f "$QEMU_LOG"
-rm -f "$QEMU_END"
 touch "$QEMU_LOG"
 
 _trap() {
@@ -62,15 +60,25 @@ finish() {
 
 terminal() {
 
-  local msg=$1
+  local dev=""
 
-  if [[ "${msg,,}" != "char"* ||  "$msg" != *"serial0)" ]]; then
-    echo "$msg"
+  if [ -f "$QEMU_OUT" ]; then
+
+    local msg
+    msg="$(cat "$QEMU_OUT")"
+
+    if [ -n "$msg" ]; then
+
+      if [[ "${msg,,}" != "char"* ||  "$msg" != *"serial0)" ]]; then
+        echo "$msg"
+      fi
+
+      dev="${msg#*/dev/p}"
+      dev="/dev/p${dev%% *}"
+
+    fi
   fi
 
-  local dev="${msg#*/dev/p}"
-  dev="/dev/p${dev%% *}"
-
   if [ ! -c "$dev" ]; then
     dev=$(echo 'info chardev' | nc -q 1 -w 1 localhost "$QEMU_PORT" | tr -d '\000')
     dev="${dev#*serial0}"

src/print.sh

@@ -6,9 +6,9 @@ set -Eeuo pipefail
 info () { printf "%b%s%b" "\E[1;34m❯ \E[1;36m" "$1" "\E[0m\n" >&2; }
 error () { printf "%b%s%b" "\E[1;31m❯ " "ERROR: $1" "\E[0m\n" >&2; }
 
-file="/run/dsm.url"
-address="/run/qemu.ip"
-shutdown="/run/qemu.end"
+file="/run/shm/dsm.url"
+address="/run/shm/qemu.ip"
+shutdown="/run/shm/qemu.end"
 url="http://127.0.0.1:2210/read?command=10"
 
 resp_err="Guest returned an invalid response:"

src/proc.sh

@@ -14,12 +14,16 @@ if [[ "$KVM" != [Nn]* ]]; then
 
   KVM_ERR=""
 
-  if [ -e /dev/kvm ] && sh -c 'echo -n > /dev/kvm' &> /dev/null; then
-    if ! grep -q -e vmx -e svm /proc/cpuinfo; then
-      KVM_ERR="(vmx/svm disabled)"
-    fi
+  if [ ! -e /dev/kvm ]; then
+    KVM_ERR="(device file missing)"
   else
-    [ -e /dev/kvm ] && KVM_ERR="(no write access)" || KVM_ERR="(device file missing)"
+    if ! sh -c 'echo -n > /dev/kvm' &> /dev/null; then
+      KVM_ERR="(no write access)"
+    else
+      if ! grep -q -e vmx -e svm /proc/cpuinfo; then
+        KVM_ERR="(vmx/svm disabled)"
+      fi
+    fi
   fi
 
   if [ -n "$KVM_ERR" ]; then

src/reset.sh

@@ -15,7 +15,7 @@ trap 'error "Status $? while: $BASH_COMMAND (line $LINENO/$BASH_LINENO)"' ERR
 : ${DEBUG:='N'}         # Disable debugging mode
 : ${COUNTRY:=''}        # Country code for mirror
 : ${CONSOLE:='N'}       # Disable console mode
-: ${ALLOCATE:='Y'}      # Preallocate diskspace
+: ${ALLOCATE:=''}       # Preallocate diskspace
 : ${ARGUMENTS:=''}      # Extra QEMU parameters
 : ${CPU_CORES:='1'}     # Amount of CPU cores
 : ${RAM_SIZE:='1G'}     # Maximum RAM amount
@@ -31,20 +31,25 @@ VERS=$(qemu-system-x86_64 --version | head -n 1 | cut -d '(' -f 1)
 # Check folder
 
 STORAGE="/storage"
-[ ! -d "$STORAGE" ] && error "Storage folder ($STORAGE) not found!" && exit 13
+if [ ! -d "$STORAGE" ]; then
+  error "Storage folder ($STORAGE) not found!" && exit 13
+fi
+
+if [ ! -d "/run/shm" ]; then
+  if [ -d "/dev/shm" ]; then
+    ln -s /dev/shm /run/shm
+  else
+    error "Folder /dev/shm not found!" && exit 14
+  fi
+fi
 
 # Cleanup files
-
-rm -f /run/dsm.url
-rm -f /run/qemu.ip
-rm -f /run/qemu.log
-rm -f /run/qemu.pid
-rm -f /run/qemu.end
+rm -f /tmp/server.*
+rm -f /run/shm/qemu.*
+rm -f /run/shm/dsm.url
 
 # Cleanup dirs
-
 rm -rf /tmp/dsm
-rm -f /tmp/server.*
 rm -rf "$STORAGE/tmp"
 
 # Helper functions
@@ -113,6 +118,7 @@ setCountry() {
 
   [ -z "$COUNTRY" ] && getCountry "https://api.ipapi.is" ".location.country_code"
   [ -z "$COUNTRY" ] && getCountry "https://ifconfig.co/json" ".country_iso"
+  [ -z "$COUNTRY" ] && getCountry "https://api.ip2location.io" ".country_code"
   [ -z "$COUNTRY" ] && getCountry "https://ipinfo.io/json" ".country"
   [ -z "$COUNTRY" ] && getCountry "https://api.myip.com" ".cc"
 
@@ -129,17 +135,14 @@ addPackage() {
 
   info "Installing $desc..."
 
-  export DEBCONF_NOWARNINGS="yes"
-  export DEBIAN_FRONTEND="noninteractive"
-
   [ -z "$COUNTRY" ] && setCountry
 
   if [[ "${COUNTRY^^}" == "CN" ]]; then
     sed -i 's/deb.debian.org/mirrors.ustc.edu.cn/g' /etc/apt/sources.list.d/debian.sources
   fi
 
-  apt-get -qq update
-  apt-get -qq --no-install-recommends -y install "$pkg" > /dev/null
+  DEBIAN_FRONTEND=noninteractive apt-get -qq update
+  DEBIAN_FRONTEND=noninteractive apt-get -qq --no-install-recommends -y install "$pkg" > /dev/null
 
   return 0
 }

src/serial.sh

@@ -46,8 +46,13 @@ done
 
 # Configure serial ports
 
-SERIAL_OPTS="\
-        -serial pty \
+if [[ "$CONSOLE" != [Yy]* ]]; then
+  SERIAL_OPTS="-serial pty"
+else
+  SERIAL_OPTS="-serial mon:stdio"
+fi
+
+SERIAL_OPTS="$SERIAL_OPTS \
         -device virtio-serial-pci,id=virtio-serial0,bus=pcie.0,addr=0x3 \
         -chardev socket,id=charchannel0,host=127.0.0.1,port=12345,reconnect=10 \
         -device virtserialport,bus=virtio-serial0.0,nr=1,chardev=charchannel0,id=channel0,name=vchannel"

src/server.sh

@@ -35,9 +35,9 @@ if [[ "$2" != "/"* ]]; then
 
   socat TCP4-LISTEN:80,reuseaddr,fork,crlf SYSTEM:"cat $TMP_FILE" 2> /dev/null &
   socat TCP4-LISTEN:"${1:-5000}",reuseaddr,fork,crlf SYSTEM:"cat $TMP_FILE" 2> /dev/null & wait $!
-  
+
   exit
-  
+
 fi
 
 if [[ "$2" != "/run/ip.sh" ]]; then
@@ -53,7 +53,7 @@ else
   HTML=$(html "xxx")
 
   { echo "#!/bin/bash"
-    echo "[ -f \"/run/dsm.url\" ] && LOCATION=\$(cat \"/run/dsm.url\")"
+    echo "[ -f \"/run/shm/dsm.url\" ] && LOCATION=\$(cat \"/run/shm/dsm.url\")"
     echo "HTML=\"$HTML\"; [ -z \"\$LOCATION\" ] && BODY=\"$WAIT\" || BODY=\"$BODY\"; HTML=\${HTML/xxx/\$BODY}"
     echo "printf '%b' \"HTTP/1.1 200 OK\\nContent-Length: \${#HTML}\\nConnection: close\\n\\n\$HTML\""
   } > "$TMP_FILE"
@@ -61,6 +61,6 @@ else
 fi
 
 chmod +x "$TMP_FILE"
-  
+
 socat TCP4-LISTEN:80,reuseaddr,fork,crlf SYSTEM:"$TMP_FILE" 2> /dev/null &
 socat TCP4-LISTEN:"${1:-5000}",reuseaddr,fork,crlf SYSTEM:"$TMP_FILE" 2> /dev/null & wait $!