build: Update Dockerfile (#518 )

fix: Port forwarding (#517 )
fix: iptables for NAT (#516 )
2025-11-07 02:23:42 +08:00 · 2023-12-29 00:24:36 +01:00 · 2023-12-28 21:30:28 +01:00 · 2023-12-28 21:20:38 +01:00 · 2023-12-28 20:54:33 +01:00 · 2023-12-28 20:25:04 +01:00
18 changed files with 1227 additions and 713 deletions
--- a/.github/renovate.json
+++ b/.github/renovate.json
@@ -1,6 +1,4 @@
 {
-  "extends": [
-    "config:base",
-    ":disableDependencyDashboard"
-  ]
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": ["config:recommended", ":disableDependencyDashboard"]
 }
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -7,12 +7,16 @@ on:
      - master
    paths-ignore:
      - '**/*.md'
-      - '**/*.yml'      
+      - '**/*.yml'
      - '.gitignore'
      - '.dockerignore'
      - '.github/**'
      - '.github/workflows/**'

+concurrency:
+  group: build
+  cancel-in-progress: false
+
 jobs:
  shellcheck:
    name: Check
@@ -22,37 +26,34 @@ jobs:
    needs: shellcheck
    runs-on: ubuntu-latest
    permissions:
+      actions: write
      packages: write
      contents: read
    steps:
-      - 
-        name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
      -
        name: Checkout
        uses: actions/checkout@v4
        with:
          fetch-depth: 0
      -
-        name: Prepare Docker build
-        id: prepare
-        run: |
-        
-          PLATFORMS="linux/amd64,linux/arm64"
-          VERSION="${{ vars.MAJOR }}.${{ vars.MINOR }}"
-          
-          TAGS=()
-          TAGS=("${{ github.repository }}:latest")
-          TAGS+=("${{ github.repository }}:${VERSION}")
-          #TAGS+=("${{ secrets.DOCKERHUB_MIRROR }}:latest")
-          #TAGS+=("${{ secrets.DOCKERHUB_MIRROR }}:${VERSION}")
-          TAGS+=("ghcr.io/${{ github.repository }}:latest")
-          TAGS+=("ghcr.io/${{ github.repository }}:${VERSION}")
-          
-          echo "tags=${TAGS[@]}" >> $GITHUB_OUTPUT
-          echo "version=${VERSION}" >> $GITHUB_OUTPUT
-          echo "docker_platforms=${PLATFORMS}" >> $GITHUB_OUTPUT
-          echo "build_date=$(date -u +'%Y-%m-%dT%H:%M:%SZ')" >> $GITHUB_OUTPUT
+        name: Docker metadata
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          context: git
+          images: |
+            ${{ secrets.DOCKERHUB_REPO }}
+            ghcr.io/${{ github.repository }}
+          tags: |
+            type=raw,value=latest,priority=100
+            type=raw,value=${{ vars.MAJOR }}.${{ vars.MINOR }}
+          labels: |
+            org.opencontainers.image.title=${{ vars.NAME }}
+        env:
+          DOCKER_METADATA_ANNOTATIONS_LEVELS: manifest,index            
+      - 
+        name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
      -
        name: Login into Docker Hub
        uses: docker/login-action@v3
@@ -66,36 +67,26 @@ jobs:
          registry: ghcr.io
          username: ${{ github.actor }}
          password: ${{ secrets.GITHUB_TOKEN }}
-      - 
-        name: Build Docker image
-        run: |
-        
-          TAGS=(${{ steps.prepare.outputs.tags }})
-
-          echo "Build date: ${{ steps.prepare.outputs.build_date }}"
-          echo "Docker platform: ${{ steps.prepare.outputs.docker_platforms }}"
-          echo "Tags: ${{ steps.prepare.outputs.tags }}"
-
-          docker buildx build --platform ${{ steps.prepare.outputs.docker_platforms }} \
-            --output "type=image,push=true" \
-            --progress=plain \
-            --build-arg "BUILD_ARG=${GITHUB_RUN_ID}" \
-            --build-arg "VERSION_ARG=${{ steps.prepare.outputs.version }}" \
-            --build-arg "DATE_ARG=${{ steps.prepare.outputs.build_date }}" \
-            --build-arg "VCS_REF=${GITHUB_SHA::8}" \
-            $(printf "%s" "${TAGS[@]/#/ --tag }" ) .
      -
-        name: Clear Docker credentials
-        run: |
-          rm -f ${HOME}/.docker/config.json
+        name: Build Docker image
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          push: true
+          provenance: false
+          platforms: linux/amd64,linux/arm64,linux/arm
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          annotations: ${{ steps.meta.outputs.annotations }}
+          build-args: |
+            VERSION_ARG=${{ steps.meta.outputs.version }}
      -
        name: Create a release
        uses: action-pack/github-release@v2
-        env:
-          GITHUB_TOKEN: ${{ secrets.REPO_ACCESS_TOKEN }}
        with:
-          tag: "v${{ steps.prepare.outputs.version }}"
-          title: "v${{ steps.prepare.outputs.version }}"
+          tag: "v${{ steps.meta.outputs.version }}"
+          title: "v${{ steps.meta.outputs.version }}"
+          token: ${{ secrets.REPO_ACCESS_TOKEN }}
      -
        name: Increment version variable
        uses: action-pack/bump@v2
--- a/40
+++ b/40
@@ -9,12 +9,15 @@ FROM qemux/qemu-host as builder

 FROM debian:trixie-slim

+ARG TARGETPLATFORM
 ARG DEBCONF_NOWARNINGS="yes"
 ARG DEBIAN_FRONTEND noninteractive

-RUN apt-get update && apt-get -y upgrade && \
-    apt-get --no-install-recommends -y install \
-        tini \    
+RUN apt-get update && apt-get -y upgrade \
+    && if [ "$TARGETPLATFORM" != "linux/amd64" ]; then extra="qemu-user"; fi \
+    && apt-get --no-install-recommends -y install \
+        jq \
+        tini \
        curl \
        cpio \
        wget \
@@ -26,43 +29,30 @@ RUN apt-get update && apt-get -y upgrade && \
        iptables \
        iproute2 \
        dnsmasq \
+        fakeroot \
        net-tools \
+        qemu-utils \
        ca-certificates \
        netcat-openbsd \
        qemu-system-x86 \
+        "$extra" \
    && apt-get clean \
    && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*

-COPY src/*.sh /run/
+COPY ./src /run/
 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
-EXPOSE 80
-EXPOSE 139
-EXPOSE 445
-EXPOSE 5000
-
-ENV CPU_CORES "1"
+ENV RAM_SIZE "1G"
 ENV DISK_SIZE "16G"
-ENV RAM_SIZE "512M"
+ENV CPU_CORES "1"

-ARG DATE_ARG=""
-ARG BUILD_ARG=0
 ARG VERSION_ARG="0.0"
-ENV VERSION=$VERSION_ARG
+RUN echo "$VERSION_ARG" > /run/version

-LABEL org.opencontainers.image.licenses="MIT"
-LABEL org.opencontainers.image.title="Virtual DSM"
-LABEL org.opencontainers.image.created=${DATE_ARG}
-LABEL org.opencontainers.image.revision=${BUILD_ARG}
-LABEL org.opencontainers.image.version=${VERSION_ARG}
-LABEL org.opencontainers.image.source="https://github.com/vdsm/virtual-dsm/"
-LABEL org.opencontainers.image.url="https://hub.docker.com/r/vdsm/virtual-dsm/"
-LABEL org.opencontainers.image.description="Virtual DSM in a docker container"
-
-HEALTHCHECK --interval=60s --retries=2 CMD /run/check.sh
+HEALTHCHECK --interval=60s --start-period=45s --retries=2 CMD /run/check.sh

 ENTRYPOINT ["/usr/bin/tini", "-s", "/run/entry.sh"]
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -4,19 +4,20 @@ services:
        container_name: dsm
        image: vdsm/virtual-dsm:latest
        environment:
-            CPU_CORES: "1"
            DISK_SIZE: "16G"
-            RAM_SIZE: "512M"
+            RAM_SIZE: "1G"
+            CPU_CORES: "1"
        devices:
            - /dev/kvm
+            - /dev/net/tun
            - /dev/vhost-net
        device_cgroup_rules:
            - 'c *:* rwm'
        cap_add:
-            - NET_ADMIN        
+            - NET_ADMIN
        ports:
            - 5000:5000
        volumes:
-            - /opt/dsm:/storage
+            - /var/dsm:/storage
        restart: on-failure
-        stop_grace_period: 1m
+        stop_grace_period: 2m
--- a/readme.md
+++ b/readme.md
@@ -10,11 +10,12 @@
 [![Pulls]][hub_url]

 </div></h1>
+
 Virtual DSM in a docker container.

 ## Features

- - Multi-platform
+ - Multiple disks
 - KVM acceleration
 - GPU passthrough
 - Upgrades supported
@@ -33,15 +34,14 @@ services:
      DISK_SIZE: "16G"
    devices:
      - /dev/kvm
-      - /dev/vhost-net
    cap_add:
      - NET_ADMIN
    ports:
      - 5000:5000
    volumes:
-      - /opt/dsm:/storage
+      - /var/dsm:/storage
    restart: on-failure
-    stop_grace_period: 1m
+    stop_grace_period: 2m
 ```

 Via `docker run`
@@ -58,67 +58,59 @@ docker run -it --rm -p 5000:5000 --device=/dev/kvm --cap-add NET_ADMIN --stop-ti

    ```yaml
    environment:
-      DISK_SIZE: "256G"
+      DISK_SIZE: "128G"
    ```
    
    This can also be used to resize the existing disk to a larger capacity without any data loss. 

  * ### How do I change the location of the virtual disk?

-    To change the virtual disk's location from the default Docker volume, include the following bind mount in your compose file:
+    To change the location of the virtual disk, include the following bind mount in your compose file:

    ```yaml
    volumes:
-      - /home/user/data:/storage
+      - /var/dsm:/storage
    ```

-    Replace the example path `/home/user/data` with the desired storage folder.
+    Replace the example path `/var/dsm` with the desired storage folder.

-  * ### How do I change the space reserved by the virtual disk? 
-
-    By default, the entire disk space is reserved in advance. To create a growable disk that only reserves the space that is actually used, add the following environment variable:
-
-    ```yaml
-    environment:
-      ALLOCATE: "N"
-    ```
-
-    Keep in mind that this will not affect any of your existing disks, it only applies to newly created disks.
-    
  * ### How do I add multiple disks?

-    To mount extra volumes, modify your compose file like this:
+    To create additional disks, modify your compose file like this:
    
    ```yaml
    environment:
      DISK2_SIZE: "32G"
      DISK3_SIZE: "64G"
    volumes:
-      - /home/example2:/storage2
-      - /home/example3:/storage3
+      - /home/example:/storage2
+      - /mnt/data/example:/storage3
    ```

-    Additionally, it's also possible to passthrough raw disk devices like this:
+  * ### How do I create a growable disk?
+
+    By default, the entire capacity of the disk is reserved in advance.
+
+    To create a growable disk that only allocates space that is actually used, add the following environment variables:

    ```yaml
    environment:
-      DEVICE2: "/dev/vdc1"
-      DEVICE3: "/dev/vdc2"
-    devices:
-      - /dev/vdc1
-      - /dev/vdc2
-    ```    
+      ALLOCATE: "N"
+      DISK_FMT: "qcow2"
+    ```

-    Please beware that any pre-existing partitions and data on those devices will be wiped.
+    Please note that this may reduce the write performance of the disk.

  * ### How do I increase the amount of CPU or RAM?

-    By default, a single core and 512 MB of RAM are allocated to the container. To increase this, add the following environment variables:
+    By default, a single core and 1 GB of RAM are allocated to the container.
+
+    To increase this, add the following environment variables:

    ```yaml
    environment:
+      RAM_SIZE: "4G"
      CPU_CORES: "4"
-      RAM_SIZE: "2048M"
    ```

  * ### How do I verify if my system supports KVM?
@@ -177,13 +169,24 @@ docker run -it --rm -p 5000:5000 --device=/dev/kvm --cap-add NET_ADMIN --stop-ti
    ```yaml
    environment:
      DHCP: "Y"
-    devices:
-      - /dev/vhost-net
    device_cgroup_rules:
      - 'c *:* rwm'
    ```

-    Please note that even if you don't need DHCP, it's still recommended to enable this feature as it prevents NAT issues and increases performance by using a `macvtap` interface.
+    Please note that even if you don't want DHCP, it's still recommended to enable this feature as it prevents NAT issues and increases performance by using a `macvtap` interface. In that case just set a static IP from the DSM control panel after you enabled this mode.
+
+  * ### How do I passthrough the GPU?
+
+    To passthrough your Intel GPU, add the following lines to your compose file:
+
+    ```yaml
+    environment:
+      GPU: "Y"
+    devices:
+      - /dev/dri
+    ```
+
+    This can be used to enable the facial recognition function in Synology Photos for example.

  * ### How do I install a specific version of vDSM?

@@ -196,19 +199,6 @@ docker run -it --rm -p 5000:5000 --device=/dev/kvm --cap-add NET_ADMIN --stop-ti

    With this method, it is even possible to switch between different versions while keeping all your file data intact.

-  * ### How do I passthrough my GPU?
-
-    To passthrough your Intel GPU, add the following lines to your compose file:
-
-    ```yaml
-    environment:
-      GPU: "Y"
-    devices:
-      - /dev/dri
-    ```
-
-    This can be used to enable the facial recognition function in Synology Photos for example.
-    
  * ### What are the differences compared to the standard DSM?

    There are only two minor differences: the Virtual Machine Manager package is not available, and Surveillance Station will not include any free licenses.
--- a/src/check.sh
+++ b/src/check.sh
@@ -1,61 +1,30 @@
 #!/usr/bin/env bash
-set -u
+set -Eeuo pipefail

-[ ! -f "/run/qemu.pid" ] && echo "QEMU not running yet.." && exit 0
-[ -f "/run/qemu.count" ] && echo "QEMU is shutting down.." && exit 1
+[ -f "/run/qemu.end" ] && echo "QEMU is shutting down.." && exit 1
+[ ! -f "/run/qemu.pid" ] && echo "QEMU is not running yet.." && exit 0

 file="/run/dsm.url"
+address="/run/qemu.ip"

-if [ ! -f  "$file" ]; then
+[ ! -f  "$file" ] && echo "DSM has not enabled networking yet.." && 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)
+location=$(cat "$file")

-  if [[ ! "${RESPONSE}" =~ "\"success\"" ]] ; then
-    echo "Failed to connect to guest: $RESPONSE" && exit 1
+if ! curl -m 20 -ILfSs "http://$location/" > /dev/null; then
+
+  if [[ "$location" == "20.20"* ]]; then
+    ip="20.20.20.1"
+    port="${location##*:}"
+    echo "Failed to reach DSM at port $port"
+  else
+    echo "Failed to reach DSM at http://$location"
+    ip="$(cat "$address")"
  fi

-  # Retrieve the HTTP port number
-  if [[ ! "${RESPONSE}" =~ "\"http_port\"" ]] ; then
-    echo "Failed to parse response from guest: $RESPONSE" && exit 1
-  fi
-
-  rest=${RESPONSE#*http_port}
-  rest=${rest#*:}
-  rest=${rest%%,*}
-  PORT=${rest%%\"*}
-
-  [ -z "${PORT}" ] && echo "Guest has not set a portnumber yet.." && exit 1
-
-  # Retrieve the IP address
-  if [[ ! "${RESPONSE}" =~ "eth0" ]] ; then
-    echo "Failed to parse response from guest: $RESPONSE" && exit 1
-  fi
-
-  rest=${RESPONSE#*eth0}
-  rest=${rest#*ip}
-  rest=${rest#*:}
-  rest=${rest#*\"}
-  IP=${rest%%\"*}
-
-  [ -z "${IP}" ] && echo "Guest has not received an IP yet.." && exit 1
-
-  echo "${IP}:${PORT}" > $file
+  echo "You might need to whitelist IP $ip in the DSM firewall." && exit 1

 fi

-LOCATION=$(cat "$file")
-
-if ! curl -m 20 -ILfSs "http://${LOCATION}/" > /dev/null; then
-  rm -f $file
-  echo "Failed to reach http://${LOCATION}"
-  exit 1
-fi
-
-if [[ "$LOCATION" == "20.20"* ]]; then
-  echo "Healthcheck OK"
-else
-  echo "Healthcheck OK ( ${LOCATION%:*} )"
-fi
-
+echo "Healthcheck OK"
 exit 0
--- a/src/config.sh
+++ b/src/config.sh
@@ -1,40 +1,22 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -Eeuo pipefail

-KVM_ERR=""
-KVM_OPTS=""
-
-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
-else
-  [ -e /dev/kvm ] && KVM_ERR="(no write access)" || KVM_ERR="(device file missing)"
-fi
-
-if [ -n "${KVM_ERR}" ]; then
-  if [ "$ARCH" == "amd64" ]; then
-    error "KVM acceleration not detected ${KVM_ERR}, see the FAQ about this."
-    [[ "${DEBUG}" != [Yy1]* ]] && exit 88
-  fi
-else
-  KVM_OPTS=",accel=kvm -enable-kvm -cpu host"
-fi
-
 DEF_OPTS="-nographic -nodefaults -boot strict=on -display none"
-RAM_OPTS=$(echo "-m ${RAM_SIZE}" | sed 's/MB/M/g;s/GB/G/g;s/TB/T/g')
-CPU_OPTS="-smp ${CPU_CORES},sockets=1,dies=1,cores=${CPU_CORES},threads=1"
+RAM_OPTS=$(echo "-m $RAM_SIZE" | sed 's/MB/M/g;s/GB/G/g;s/TB/T/g')
+CPU_OPTS="-cpu $CPU_MODEL -smp $CPU_CORES,sockets=1,dies=1,cores=$CPU_CORES,threads=1"
 MAC_OPTS="-machine type=q35,usb=off,dump-guest-core=off,hpet=off${KVM_OPTS}"
 EXTRA_OPTS="-device virtio-balloon-pci,id=balloon0,bus=pcie.0,addr=0x4"
 EXTRA_OPTS="$EXTRA_OPTS -object rng-random,id=objrng0,filename=/dev/urandom"
 EXTRA_OPTS="$EXTRA_OPTS -device virtio-rng-pci,rng=objrng0,id=rng0,bus=pcie.0,addr=0x1c"

-if [[ "${GPU}" == [Yy1]* ]] && [[ "$ARCH" == "amd64" ]]; then
+if [[ "$GPU" == [Yy1]* ]] && [[ "$ARCH" == "amd64" ]]; then
  DEF_OPTS="-nodefaults -boot strict=on -display egl-headless,rendernode=/dev/dri/renderD128"
-  DEF_OPTS="${DEF_OPTS} -device virtio-vga,id=video0,max_outputs=1,bus=pcie.0,addr=0x1"
+  DEF_OPTS="$DEF_OPTS -device virtio-vga,id=video0,max_outputs=1,bus=pcie.0,addr=0x1"
 fi

-ARGS="${DEF_OPTS} ${CPU_OPTS} ${RAM_OPTS} ${MAC_OPTS} ${MON_OPTS} ${SERIAL_OPTS} ${NET_OPTS} ${DISK_OPTS} ${EXTRA_OPTS} ${ARGUMENTS}"
+[[ "$CONSOLE" != [Yy]* ]] && DEF_OPTS="$DEF_OPTS -daemonize -D $QEMU_LOG"
+
+ARGS="$DEF_OPTS $CPU_OPTS $RAM_OPTS $MAC_OPTS $MON_OPTS $SERIAL_OPTS $NET_OPTS $DISK_OPTS $EXTRA_OPTS $ARGUMENTS"
 ARGS=$(echo "$ARGS" | sed 's/\t/ /g' | tr -s ' ')

 return 0
--- a/src/cpu.sh
+++ b/src/cpu.sh
@@ -0,0 +1,72 @@
+#!/usr/bin/env bash
+set -Eeuo pipefail
+
+# Docker environment variables
+
+: ${HOST_CPU:=''}
+: ${CPU_MODEL:='host'}
+: ${CPU_FEATURES:='+ssse3,+sse4.1,+sse4.2'}
+
+[ "$ARCH" != "amd64" ] && KVM="N"
+
+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
+  else
+    [ -e /dev/kvm ] && KVM_ERR="(no write access)" || KVM_ERR="(device file missing)"
+  fi
+
+  if [ -n "$KVM_ERR" ]; then
+    KVM="N"
+    error "KVM acceleration not detected $KVM_ERR, this will cause a major loss of performance."
+    error "See the FAQ on how to enable it, or continue without KVM by setting KVM=N (not recommended)."
+    [[ "$DEBUG" != [Yy1]* ]] && exit 88
+  fi
+
+fi
+
+if [[ "$KVM" != [Nn]* ]]; then
+
+  KVM_OPTS=",accel=kvm -enable-kvm"
+
+  if ! grep -qE '^flags.* (sse4_2)' /proc/cpuinfo; then
+    error "Your host CPU does not have the SSE4.2 instruction set that Virtual DSM requires to boot."
+    error "Disable KVM by setting KVM=N to emulate a compatible CPU, at the cost of performance."
+    [[ "$DEBUG" != [Yy1]* ]] && exit 89
+  fi
+
+else
+
+  KVM_OPTS=""
+
+  if [[ "$CPU_MODEL" == "host"* ]]; then
+    if [[ "$ARCH" == "amd64" ]]; then
+      CPU_MODEL="max,$CPU_FEATURES"
+    else
+      CPU_MODEL="qemu64,$CPU_FEATURES"
+    fi
+  fi
+
+fi
+
+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')
+fi
+
+if [ -n "$HOST_CPU" ]; then
+  HOST_CPU="${HOST_CPU%%,*},,"
+else
+  HOST_CPU="QEMU, Virtual CPU,"
+  if [ "$ARCH" == "amd64" ]; then
+    HOST_CPU="$HOST_CPU X86_64"
+  else
+    HOST_CPU="$HOST_CPU $ARCH"
+  fi
+fi
+
+return 0
--- a/src/disk.sh
+++ b/src/disk.sh
@@ -3,10 +3,12 @@ set -Eeuo pipefail

 # Docker environment variables

-: ${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
+: ${DISK_IO:='native'}          # I/O Mode, can be set to 'native', 'threads' or 'io_turing'
+: ${DISK_FMT:='raw'}            # Disk file format, 'raw' by default for best performance
+: ${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
+: ${DISK_FLAGS:=''}             # Specifies the options for use with the qcow2 disk format

 BOOT="$STORAGE/$BASE.boot.img"
 SYSTEM="$STORAGE/$BASE.system.img"
@@ -15,171 +17,431 @@ SYSTEM="$STORAGE/$BASE.system.img"
 [ ! -f "$SYSTEM" ] && error "Virtual DSM system-image does not exist ($SYSTEM)" && exit 82

 DISK_OPTS="\
-    -device virtio-scsi-pci,id=hw-synoboot,bus=pcie.0,addr=0xa \
-    -drive file=${BOOT},if=none,id=drive-synoboot,format=raw,cache=${DISK_CACHE},aio=${DISK_IO},discard=${DISK_DISCARD},detect-zeroes=on \
-    -device scsi-hd,bus=hw-synoboot.0,channel=0,scsi-id=0,lun=0,drive=drive-synoboot,id=synoboot0,rotation_rate=${DISK_ROTATION},bootindex=1 \
-    -device virtio-scsi-pci,id=hw-synosys,bus=pcie.0,addr=0xb \
-    -drive file=${SYSTEM},if=none,id=drive-synosys,format=raw,cache=${DISK_CACHE},aio=${DISK_IO},discard=${DISK_DISCARD},detect-zeroes=on \
-    -device scsi-hd,bus=hw-synosys.0,channel=0,scsi-id=0,lun=0,drive=drive-synosys,id=synosys0,rotation_rate=${DISK_ROTATION},bootindex=2"
+    -object iothread,id=io1 -object iothread,id=io2 \
+    -device virtio-scsi-pci,id=hw-synoboot,iothread=io1,bus=pcie.0,addr=0xa \
+    -drive file=$BOOT,if=none,id=drive-synoboot,format=raw,cache=$DISK_CACHE,aio=$DISK_IO,discard=$DISK_DISCARD,detect-zeroes=on \
+    -device scsi-hd,bus=hw-synoboot.0,channel=0,scsi-id=0,lun=0,drive=drive-synoboot,id=synoboot0,rotation_rate=$DISK_ROTATION,bootindex=1 \
+    -device virtio-scsi-pci,id=hw-synosys,iothread=io1,bus=pcie.0,addr=0xb \
+    -drive file=$SYSTEM,if=none,id=drive-synosys,format=raw,cache=$DISK_CACHE,aio=$DISK_IO,discard=$DISK_DISCARD,detect-zeroes=on \
+    -device scsi-hd,bus=hw-synosys.0,channel=0,scsi-id=0,lun=0,drive=drive-synosys,id=synosys0,rotation_rate=$DISK_ROTATION,bootindex=2"

-addDisk () {
+fmt2ext() {
+  local DISK_FMT=$1

-  local GB
-  local DIR
-  local REQ
-  local SIZE
-  local SPACE
-  local MIN_SIZE
-  local CUR_SIZE
-  local DATA_SIZE
-  local DISK_ID=$1
-  local DISK_FILE=$2
+  case "${DISK_FMT,,}" in
+    qcow2)
+      echo "qcow2"
+      ;;
+    raw)
+      echo "img"
+      ;;
+    *)
+      error "Unrecognized disk format: $DISK_FMT" && exit 78
+      ;;
+  esac
+}
+
+ext2fmt() {
+  local DISK_EXT=$1
+
+  case "${DISK_EXT,,}" in
+    qcow2)
+      echo "qcow2"
+      ;;
+    img)
+      echo "raw"
+      ;;
+    *)
+      error "Unrecognized file extension: .$DISK_EXT" && exit 78
+      ;;
+  esac
+}
+
+getSize() {
+  local DISK_FILE=$1
+  local DISK_EXT DISK_FMT
+
+  DISK_EXT="$(echo "${DISK_FILE//*./}" | sed 's/^.*\.//')"
+  DISK_FMT="$(ext2fmt "$DISK_EXT")"
+
+  case "${DISK_FMT,,}" in
+    raw)
+      stat -c%s "$DISK_FILE"
+      ;;
+    qcow2)
+      qemu-img info "$DISK_FILE" -f "$DISK_FMT" | grep '^virtual size: ' | sed 's/.*(\(.*\) bytes)/\1/'
+      ;;
+    *)
+      error "Unrecognized disk format: $DISK_FMT" && exit 78
+      ;;
+  esac
+}
+
+isCow() {
+  local FS=$1
+
+  if [[ "${FS,,}" == "xfs" || "${FS,,}" == "zfs" || "${FS,,}" == "btrfs" || "${FS,,}" == "bcachefs" ]]; then
+    return 0
+  fi
+       
+  return 1
+}
+
+createDisk() {
+  local DISK_FILE=$1
+  local DISK_SPACE=$2
  local DISK_DESC=$3
-  local DISK_SPACE=$4
-  local DISK_INDEX=$5
-  local DISK_ADDRESS=$6
+  local DISK_FMT=$4
+  local FS=$5
+  local DATA_SIZE DIR SPACE FA

-  DIR=$(dirname "${DISK_FILE}")
-  [ ! -d "${DIR}" ] && return 0
+  DATA_SIZE=$(numfmt --from=iec "$DISK_SPACE")

-  [ -z "$DISK_SPACE" ] && DISK_SPACE="16G"
-  DISK_SPACE=$(echo "${DISK_SPACE}" | sed 's/MB/M/g;s/GB/G/g;s/TB/T/g')
-  DATA_SIZE=$(numfmt --from=iec "${DISK_SPACE}")
+  rm -f "$DISK_FILE"

-  MIN_SIZE=6442450944
-  if (( DATA_SIZE < MIN_SIZE )); then
-    error "Please increase ${DISK_DESC^^}_SIZE to at least 6 GB." && exit 83
+  if [[ "$ALLOCATE" != [Nn]* ]]; then
+
+    # Check free diskspace
+    DIR=$(dirname "$DISK_FILE")
+    SPACE=$(df --output=avail -B 1 "$DIR" | tail -n 1)
+
+    if (( DATA_SIZE > SPACE )); then
+      local SPACE_GB=$(( (SPACE + 1073741823)/1073741824 ))
+      error "Not enough free space to create a $DISK_DESC of $DISK_SPACE in $DIR, it has only $SPACE_GB GB available..."
+      error "Please specify a smaller ${DISK_DESC^^}_SIZE or disable preallocation by setting ALLOCATE=N." && exit 76
+    fi
  fi

-  if [ -f "${DISK_FILE}" ]; then
+  info "Creating a $DISK_TYPE $DISK_DESC image in $DISK_FMT format with a size of $DISK_SPACE..."
+  local FAIL="Could not create a $DISK_TYPE $DISK_FMT $DISK_DESC image of $DISK_SPACE ($DISK_FILE)"

-    CUR_SIZE=$(stat -c%s "${DISK_FILE}")
+  case "${DISK_FMT,,}" in
+    raw)

-    if [ "$DATA_SIZE" -gt "$CUR_SIZE" ]; then
+      if isCow "$FS"; then
+        if ! touch "$DISK_FILE"; then
+          error "$FAIL" && exit 77
+        fi
+        { chattr +C "$DISK_FILE"; } || :
+      fi

-      GB=$(( (CUR_SIZE + 1073741823)/1073741824 ))
-      info "Resizing ${DISK_DESC} from ${GB}G to ${DISK_SPACE} .."
-
-      if [[ "${ALLOCATE}" == [Nn]* ]]; then
-
-        # Resize file by changing its length
-        if ! truncate -s "${DISK_SPACE}" "${DISK_FILE}"; then
-          error "Could not resize ${DISK_DESC} file (${DISK_FILE}) to ${DISK_SPACE} .." && exit 85
+      if [[ "$ALLOCATE" == [Nn]* ]]; then
+    
+        # Create an empty file
+        if ! truncate -s "$DATA_SIZE" "$DISK_FILE"; then
+          rm -f "$DISK_FILE"
+          error "$FAIL" && exit 77
        fi

      else

-        REQ=$((DATA_SIZE-CUR_SIZE))
-
-        # Check free diskspace
-        SPACE=$(df --output=avail -B 1 "${DIR}" | tail -n 1)
-
-        if (( REQ > SPACE )); then
-          error "Not enough free space to resize ${DISK_DESC} to ${DISK_SPACE} .."
-          error "Specify a smaller size or disable preallocation with ALLOCATE=N." && exit 84
-        fi
-
-        # Resize file by allocating more space
-        if ! fallocate -l "${DISK_SPACE}" "${DISK_FILE}"; then
-          if ! truncate -s "${DISK_SPACE}" "${DISK_FILE}"; then
-            error "Could not resize ${DISK_DESC} file (${DISK_FILE}) to ${DISK_SPACE} .." && exit 85
+        # Create an empty file
+        if ! fallocate -l "$DATA_SIZE" "$DISK_FILE"; then
+          if ! truncate -s "$DATA_SIZE" "$DISK_FILE"; then
+            rm -f "$DISK_FILE"
+            error "$FAIL" && exit 77
          fi
        fi

      fi
+      ;;
+    qcow2)
+
+      local DISK_PARAM="$DISK_ALLOC"
+      isCow "$FS" && DISK_PARAM="$DISK_PARAM,nocow=on"
+      [ -n "$DISK_FLAGS" ] && DISK_PARAM="$DISK_PARAM,$DISK_FLAGS"
+
+      if ! qemu-img create -f "$DISK_FMT" -o "$DISK_PARAM" -- "$DISK_FILE" "$DATA_SIZE" ; then
+        rm -f "$DISK_FILE"
+        error "$FAIL" && exit 70
+      fi
+      ;;
+  esac
+
+  if isCow "$FS"; then
+    FA=$(lsattr "$DISK_FILE")
+    if [[ "$FA" != *"C"* ]]; then
+      error "Failed to disable COW for $DISK_DESC image $DISK_FILE on ${FS^^} filesystem (returned $FA)"
    fi
  fi

-  if [ ! -f "${DISK_FILE}" ]; then
-
-    if [[ "${ALLOCATE}" == [Nn]* ]]; then
-
-      # Create an empty file
-      if ! truncate -s "${DISK_SPACE}" "${DISK_FILE}"; then
-        rm -f "${DISK_FILE}"
-        error "Could not create a file for ${DISK_DESC} (${DISK_FILE})" && exit 87
-      fi
-
-    else
-
-      # Check free diskspace
-      SPACE=$(df --output=avail -B 1 "${DIR}" | tail -n 1)
-
-      if (( DATA_SIZE > SPACE )); then
-        error "Not enough free space to create ${DISK_DESC} of ${DISK_SPACE} .."
-        error "Specify a smaller size or disable preallocation with ALLOCATE=N." && exit 86
-      fi
-
-      # Create an empty file
-      if ! fallocate -l "${DISK_SPACE}" "${DISK_FILE}"; then
-        if ! truncate -s "${DISK_SPACE}" "${DISK_FILE}"; then
-          rm -f "${DISK_FILE}"
-          error "Could not create a file for ${DISK_DESC} (${DISK_FILE}) of ${DISK_SPACE} .." && exit 87
-        fi
-      fi
-
-    fi
-
-    # Check if file exists
-    if [ ! -f "${DISK_FILE}" ]; then
-      error "File for ${DISK_DESC} ($DISK_FILE) does not exist!" && exit 88
-    fi
-
-  fi
-
-  # Check the filesize
-  SIZE=$(stat -c%s "${DISK_FILE}")
-
-  if [[ SIZE -ne DATA_SIZE ]]; then
-    error "File for ${DISK_DESC} (${DISK_FILE}) has the wrong size: ${SIZE} bytes" && exit 89
-  fi
-
-  DISK_OPTS="${DISK_OPTS} \
-    -device virtio-scsi-pci,id=hw-${DISK_ID},bus=pcie.0,addr=${DISK_ADDRESS} \
-    -drive file=${DISK_FILE},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
 }

-DISK1_FILE="${STORAGE}/data.img"
+resizeDisk() {
+  local DISK_FILE=$1
+  local DISK_SPACE=$2
+  local DISK_DESC=$3
+  local DISK_FMT=$4
+  local FS=$5
+  local CUR_SIZE DATA_SIZE DIR SPACE

-if [[ ! -f "${DISK1_FILE}" ]] && [[ -f "${STORAGE}/data${DISK_SIZE}.img" ]]; then
-  # Fallback for legacy installs
-  mv "${STORAGE}/data${DISK_SIZE}.img" "${DISK1_FILE}"
+  CUR_SIZE=$(getSize "$DISK_FILE")
+  DATA_SIZE=$(numfmt --from=iec "$DISK_SPACE")
+  local REQ=$((DATA_SIZE-CUR_SIZE))
+  (( REQ < 1 )) && error "Shrinking disks is not supported yet, please increase ${DISK_DESC^^}_SIZE." && exit 71
+
+  if [[ "$ALLOCATE" != [Nn]* ]]; then
+
+    # Check free diskspace
+    DIR=$(dirname "$DISK_FILE")
+    SPACE=$(df --output=avail -B 1 "$DIR" | tail -n 1)
+
+    if (( REQ > SPACE )); then
+      local SPACE_GB=$(( (SPACE + 1073741823)/1073741824 ))
+      error "Not enough free space to resize $DISK_DESC to $DISK_SPACE in $DIR, it has only $SPACE_GB GB available.."
+      error "Please specify a smaller ${DISK_DESC^^}_SIZE or disable preallocation by setting ALLOCATE=N." && exit 74
+    fi
+  fi
+
+  local GB=$(( (CUR_SIZE + 1073741823)/1073741824 ))
+  info "Resizing $DISK_DESC from ${GB}G to $DISK_SPACE..."
+  local FAIL="Could not resize the $DISK_TYPE $DISK_FMT $DISK_DESC image from ${GB}G to $DISK_SPACE ($DISK_FILE)"
+
+  case "${DISK_FMT,,}" in
+    raw)
+
+      if [[ "$ALLOCATE" == [Nn]* ]]; then
+
+        # Resize file by changing its length
+        if ! truncate -s "$DATA_SIZE" "$DISK_FILE"; then
+          error "$FAIL" && exit 75
+        fi
+
+      else
+
+        # Resize file by allocating more space
+        if ! fallocate -l "$DATA_SIZE" "$DISK_FILE"; then
+          if ! truncate -s "$DATA_SIZE" "$DISK_FILE"; then
+            error "$FAIL" && exit 75
+          fi
+        fi
+
+      fi
+      ;;
+    qcow2)
+
+      if ! qemu-img resize -f "$DISK_FMT" "--$DISK_ALLOC" "$DISK_FILE" "$DATA_SIZE" ; then
+        error "$FAIL" && exit 72
+      fi
+
+      ;;
+  esac
+
+  return 0
+}
+
+convertDisk() {
+  local SOURCE_FILE=$1
+  local SOURCE_FMT=$2
+  local DST_FILE=$3
+  local DST_FMT=$4
+  local DISK_BASE=$5
+  local DISK_DESC=$6
+  local FS=$7
+
+  [ -f "$DST_FILE" ] && error "Conversion failed, destination file $DST_FILE already exists?" && exit 79
+  [ ! -f "$SOURCE_FILE" ] && error "Conversion failed, source file $SOURCE_FILE does not exists?" && exit 79
+
+  local TMP_FILE="$DISK_BASE.tmp"
+  rm -f "$TMP_FILE"
+
+  if [[ "$ALLOCATE" != [Nn]* ]]; then
+
+    local DIR CUR_SIZE SPACE
+
+    # Check free diskspace
+    DIR=$(dirname "$TMP_FILE")
+    CUR_SIZE=$(getSize "$SOURCE_FILE")
+    SPACE=$(df --output=avail -B 1 "$DIR" | tail -n 1)
+
+    if (( CUR_SIZE > SPACE )); then
+      local SPACE_GB=$(( (SPACE + 1073741823)/1073741824 ))
+      error "Not enough free space to convert $DISK_DESC to $DST_FMT in $DIR, it has only $SPACE_GB GB available..."
+      error "Please free up some disk space or disable preallocation by setting ALLOCATE=N." && exit 76
+    fi
+  fi
+
+  info "Converting $DISK_DESC to $DST_FMT, please wait until completed..."
+
+  local CONV_FLAGS="-p"
+  local DISK_PARAM="$DISK_ALLOC"
+  isCow "$FS" && DISK_PARAM="$DISK_PARAM,nocow=on"
+
+  if [[ "$DST_FMT" != "raw" ]]; then
+      if [[ "$ALLOCATE" == [Nn]* ]]; then
+        CONV_FLAGS="$CONV_FLAGS -c"
+      fi
+      [ -n "$DISK_FLAGS" ] && DISK_PARAM="$DISK_PARAM,$DISK_FLAGS"
+  fi
+
+  # shellcheck disable=SC2086
+  if ! qemu-img convert -f "$SOURCE_FMT" $CONV_FLAGS -o "$DISK_PARAM" -O "$DST_FMT" -- "$SOURCE_FILE" "$TMP_FILE"; then
+    rm -f "$TMP_FILE"
+    error "Failed to convert $DISK_TYPE $DISK_DESC image to $DST_FMT format in $DIR, is there enough space available?" && exit 79
+  fi
+
+  if [[ "$DST_FMT" == "raw" ]]; then
+      if [[ "$ALLOCATE" != [Nn]* ]]; then
+        # Work around qemu-img bug
+        CUR_SIZE=$(stat -c%s "$TMP_FILE")
+        if ! fallocate -l "$CUR_SIZE" "$TMP_FILE"; then
+            error "Failed to allocate $CUR_SIZE bytes for $DISK_DESC image $TMP_FILE"
+        fi
+      fi
+  fi
+
+  rm -f "$SOURCE_FILE"
+  mv "$TMP_FILE" "$DST_FILE"
+
+  if isCow "$FS"; then
+    FA=$(lsattr "$DST_FILE")
+    if [[ "$FA" != *"C"* ]]; then
+      error "Failed to disable COW for $DISK_DESC image $DST_FILE on ${FS^^} filesystem (returned $FA)"
+    fi
+  fi
+
+  info "Conversion of $DISK_DESC to $DST_FMT completed succesfully!"
+
+  return 0
+}
+
+checkFS () {
+  local FS=$1
+  local DISK_FILE=$2
+  local DISK_DESC=$3
+  local DIR FA
+
+  DIR=$(dirname "$DISK_FILE")
+  [ ! -d "$DIR" ] && return 0
+
+  if [[ "${FS,,}" == "overlay"* ]]; then
+    info "Warning: the filesystem of $DIR is OverlayFS, this usually means it was binded to an invalid path!"
+  fi
+
+  if isCow "$FS"; then
+    if [ -f "$DISK_FILE" ]; then
+      FA=$(lsattr "$DISK_FILE")
+      if [[ "$FA" != *"C"* ]]; then
+        info "Warning: COW (copy on write) is not disabled for $DISK_DESC image file $DISK_FILE, this is recommended on ${FS^^} filesystems!"
+      fi
+    fi
+  fi
+
+  return 0
+}
+
+addDisk () {
+  local DISK_ID=$1
+  local DISK_BASE=$2
+  local DISK_EXT=$3
+  local DISK_DESC=$4
+  local DISK_SPACE=$5
+  local DISK_INDEX=$6
+  local DISK_ADDRESS=$7
+  local DISK_FMT=$8
+  local DISK_FILE="$DISK_BASE.$DISK_EXT"
+  local DIR DATA_SIZE FS PREV_FMT PREV_EXT CUR_SIZE
+
+  DIR=$(dirname "$DISK_FILE")
+  [ ! -d "$DIR" ] && return 0
+
+  [ -z "$DISK_SPACE" ] && DISK_SPACE="16G"
+  DISK_SPACE=$(echo "${DISK_SPACE^^}" | sed 's/MB/M/g;s/GB/G/g;s/TB/T/g')
+  DATA_SIZE=$(numfmt --from=iec "$DISK_SPACE")
+
+  if (( DATA_SIZE < 6442450944 )); then
+    if (( DATA_SIZE < 1 )); then
+      error "Invalid value for ${DISK_DESC^^}_SIZE: $DISK_SPACE" && exit 73
+    else
+      error "Please increase ${DISK_DESC^^}_SIZE to at least 6 GB." && exit 73
+    fi
+  fi
+
+  FS=$(stat -f -c %T "$DIR")
+  checkFS "$FS" "$DISK_FILE" "$DISK_DESC" || exit $?
+
+  if ! [ -f "$DISK_FILE" ] ; then
+
+    if [[ "${DISK_FMT,,}" != "raw" ]]; then
+      PREV_FMT="raw"
+    else
+      PREV_FMT="qcow2"
+    fi
+    PREV_EXT="$(fmt2ext "$PREV_FMT")"
+
+    if [ -f "$DISK_BASE.$PREV_EXT" ] ; then
+      convertDisk "$DISK_BASE.$PREV_EXT" "$PREV_FMT" "$DISK_FILE" "$DISK_FMT" "$DISK_BASE" "$DISK_DESC" "$FS" || exit $?
+    fi
+  fi
+
+  if [ -f "$DISK_FILE" ]; then
+
+    CUR_SIZE=$(getSize "$DISK_FILE")
+
+    if (( DATA_SIZE > CUR_SIZE )); then
+      resizeDisk "$DISK_FILE" "$DISK_SPACE" "$DISK_DESC" "$DISK_FMT" "$FS" || exit $?
+    fi
+
+  else
+
+    createDisk "$DISK_FILE" "$DISK_SPACE" "$DISK_DESC" "$DISK_FMT" "$FS" || exit $?
+
+  fi
+
+  DISK_OPTS="$DISK_OPTS \
+    -device virtio-scsi-pci,id=hw-$DISK_ID,iothread=io2,bus=pcie.0,addr=$DISK_ADDRESS \
+    -drive file=$DISK_FILE,if=none,id=drive-$DISK_ID,format=$DISK_FMT,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 [[ "$ALLOCATE" == [Nn]* ]]; then
+  DISK_TYPE="growable"
+  DISK_ALLOC="preallocation=off"
+else
+  DISK_TYPE="preallocated"
+  DISK_ALLOC="preallocation=falloc"
 fi

-DISK2_FILE="/storage2/data2.img"
+DISK1_FILE="$STORAGE/data"
+if [[ ! -f "$DISK1_FILE.img" ]] && [[ -f "$STORAGE/data${DISK_SIZE}.img" ]]; then
+  # Fallback for legacy installs
+  mv "$STORAGE/data${DISK_SIZE}.img" "$DISK1_FILE.img"
+fi

-if [ ! -f "${DISK2_FILE}" ]; then
+DISK2_FILE="/storage2/data2"
+if [ ! -f "$DISK2_FILE.img" ]; then
  # Fallback for legacy installs
  FALLBACK="/storage2/data.img"
-  if [[ -f "${DISK1_FILE}" ]] && [[ -f "${FALLBACK}" ]]; then
-    SIZE1=$(stat -c%s "${FALLBACK}")
-    SIZE2=$(stat -c%s "${DISK1_FILE}")
+  if [[ -f "$DISK1_FILE.img" ]] && [[ -f "$FALLBACK" ]]; then
+    SIZE1=$(stat -c%s "$FALLBACK")
+    SIZE2=$(stat -c%s "$DISK1_FILE.img")
    if [[ SIZE1 -ne SIZE2 ]]; then
-      mv "${FALLBACK}" "${DISK2_FILE}"
+      mv "$FALLBACK" "$DISK2_FILE.img"
    fi
  fi
 fi

-DISK3_FILE="/storage3/data3.img"
-
-if [ ! -f "${DISK3_FILE}" ]; then
+DISK3_FILE="/storage3/data3"
+if [ ! -f "$DISK3_FILE.img" ]; then
  # Fallback for legacy installs
  FALLBACK="/storage3/data.img"
-  if [[ -f "${DISK1_FILE}" ]] && [[ -f "${FALLBACK}" ]]; then
-    SIZE1=$(stat -c%s "${FALLBACK}")
-    SIZE2=$(stat -c%s "${DISK1_FILE}")
+  if [[ -f "$DISK1_FILE.img" ]] && [[ -f "$FALLBACK" ]]; then
+    SIZE1=$(stat -c%s "$FALLBACK")
+    SIZE2=$(stat -c%s "$DISK1_FILE.img")
    if [[ SIZE1 -ne SIZE2 ]]; then
-      mv "${FALLBACK}" "${DISK3_FILE}"
+      mv "$FALLBACK" "$DISK3_FILE.img"
    fi
  fi
 fi

-DISK4_FILE="/storage4/data4.img"
-DISK5_FILE="/storage5/data5.img"
-DISK6_FILE="/storage6/data6.img"
+DISK4_FILE="/storage4/data4"
+DISK5_FILE="/storage5/data5"
+DISK6_FILE="/storage6/data6"

 : ${DISK2_SIZE:=''}
 : ${DISK3_SIZE:=''}
@@ -187,12 +449,12 @@ DISK6_FILE="/storage6/data6.img"
 : ${DISK5_SIZE:=''}
 : ${DISK6_SIZE:=''}

-addDisk "userdata" "${DISK1_FILE}" "disk" "${DISK_SIZE}" "3" "0xc"
-addDisk "userdata2" "${DISK2_FILE}" "disk2" "${DISK2_SIZE}" "4" "0xd"
-addDisk "userdata3" "${DISK3_FILE}" "disk3" "${DISK3_SIZE}" "5" "0xe"
-addDisk "userdata4" "${DISK4_FILE}" "disk4" "${DISK4_SIZE}" "9" "0x7"
-addDisk "userdata5" "${DISK5_FILE}" "disk5" "${DISK5_SIZE}" "10" "0x8"
-addDisk "userdata6" "${DISK6_FILE}" "disk6" "${DISK6_SIZE}" "11" "0x9"
+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 () {

@@ -201,13 +463,13 @@ addDevice () {
  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
+  [ -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},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}"
+  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
 }
@@ -219,11 +481,11 @@ addDevice () {
 : ${DEVICE5:=''}
 : ${DEVICE6:=''}

-addDevice "userdata7" "${DEVICE}" "6" "0xf"
-addDevice "userdata8" "${DEVICE2}" "7" "0x5"
-addDevice "userdata9" "${DEVICE3}" "8" "0x6"
-addDevice "userdata4" "${DEVICE4}" "9" "0x7"
-addDevice "userdata5" "${DEVICE5}" "10" "0x8"
-addDevice "userdata6" "${DEVICE6}" "11" "0x9"
+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 $?

 return 0
--- a/src/entry.sh
+++ b/src/entry.sh
@@ -1,28 +1,32 @@
 #!/usr/bin/env bash
 set -Eeuo pipefail

-echo "❯ Starting Virtual DSM for Docker v${VERSION}..."
+echo "❯ Starting Virtual DSM for Docker v$(</run/version)..."
 echo "❯ For support visit https://github.com/vdsm/virtual-dsm/"

 cd /run

-. reset.sh   # Initialize system
-. install.sh   # Run installation
-. disk.sh     # Initialize disks
-. network.sh  # Initialize network
-. gpu.sh     # Initialize graphics
-. serial.sh   # Initialize serialport
-. power.sh    # Configure shutdown
-. config.sh    # Configure arguments
+. reset.sh      # Initialize system
+. install.sh    # Run installation
+. disk.sh       # Initialize disks
+. network.sh    # Initialize network
+. gpu.sh        # Initialize graphics
+. cpu.sh        # Initialize processor
+. serial.sh     # Initialize serialport
+. power.sh      # Configure shutdown
+. config.sh     # Configure arguments

 trap - ERR

-set -m
-(
-  [[ "${DEBUG}" == [Yy1]* ]] && info "$VERS" && set -x
-  qemu-system-x86_64 ${ARGS:+ $ARGS} & echo $! > "${QEMU_PID}"
-  { set +x; } 2>/dev/null
-)
-set +m
+if [[ "$CONSOLE" == [Yy]* ]]; then
+  exec qemu-system-x86_64 ${ARGS:+ $ARGS}
+fi

-tail --pid "$(cat "${QEMU_PID}")" --follow /dev/null & wait $!
+[[ "$DEBUG" == [Yy1]* ]] && info "$VERS" && set -x
+msg=$(qemu-system-x86_64 ${ARGS:+ $ARGS})
+
+{ set +x; } 2>/dev/null && terminal "$msg"
+tail -fn +0 "$QEMU_LOG" 2>/dev/null &
+cat "$QEMU_TERM" 2>/dev/null & wait $! || true
+
+sleep 1 && finish 0
--- a/src/gpu.sh
+++ b/src/gpu.sh
@@ -1,45 +1,25 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -Eeuo pipefail

-if [[ "${GPU}" != [Yy1]* ]] || [[ "$ARCH" != "amd64" ]]; then
+if [[ "$GPU" != [Yy1]* ]] || [[ "$ARCH" != "amd64" ]]; then
  return 0
 fi

 [ ! -d /dev/dri ] && mkdir -m 755 /dev/dri

 if [ ! -c /dev/dri/card0 ]; then
-  mknod /dev/dri/card0 c 226 0
+  if mknod /dev/dri/card0 c 226 0; then
+    chmod 666 /dev/dri/card0
+  fi
 fi

 if [ ! -c /dev/dri/renderD128 ]; then
-  mknod /dev/dri/renderD128 c 226 128
+  if mknod /dev/dri/renderD128 c 226 128; then
+    chmod 666 /dev/dri/renderD128
+  fi
 fi

-chmod 666 /dev/dri/card0
-chmod 666 /dev/dri/renderD128
-
-if ! apt-mark showinstall | grep -q "xserver-xorg-video-intel"; then
-
-  info "Installing Intel GPU drivers..."
-
-  export DEBCONF_NOWARNINGS="yes"
-  export DEBIAN_FRONTEND="noninteractive"
-
-  apt-get -qq update
-  apt-get -qq --no-install-recommends -y install xserver-xorg-video-intel > /dev/null
-
-fi
-
-if ! apt-mark showinstall | grep -q "qemu-system-modules-opengl"; then
-
-  info "Installing OpenGL module..."
-
-  export DEBCONF_NOWARNINGS="yes"
-  export DEBIAN_FRONTEND="noninteractive"
-
-  apt-get -qq update
-  apt-get -qq --no-install-recommends -y install qemu-system-modules-opengl > /dev/null
-
-fi
+addPackage "xserver-xorg-video-intel" "Intel GPU drivers"
+addPackage "qemu-system-modules-opengl" "OpenGL module"

 return 0
--- a/src/install.sh
+++ b/src/install.sh
@@ -1,37 +1,81 @@
 #!/usr/bin/env bash
 set -Eeuo pipefail

+: ${URL:=''}    # URL of the PAT file to be downloaded.
+
 if [ -f "$STORAGE"/dsm.ver ]; then
-  BASE=$(cat "${STORAGE}/dsm.ver")
+  BASE=$(cat "$STORAGE/dsm.ver")
 else
  # Fallback for old installs
  BASE="DSM_VirtualDSM_42962"
 fi

-: ${URL:=''}
 [ -n "$URL" ] && BASE=$(basename "$URL" .pat)

 if [[ -f "$STORAGE/$BASE.boot.img" ]] && [[ -f "$STORAGE/$BASE.system.img" ]]; then
-  # Previous installation found
-  return 0
+  return 0  # Previous installation found
 fi

 # Display wait message
 /run/server.sh 5000 install &

-# Download the required files from the Synology website
-DL="https://global.synologydownload.com/download/DSM"
+DL=""
+DL_CHINA="https://cndl.synology.cn/download/DSM"
+DL_GLOBAL="https://global.synologydownload.com/download/DSM"

-if [ -z "$URL" ]; then
-
-  if [ "$ARCH" == "amd64" ]; then
-    URL="$DL/release/7.2.1/69057-1/DSM_VirtualDSM_69057.pat"
-  else
-    URL="$DL/release/7.0.1/42218/DSM_VirtualDSM_42218.pat"
-  fi
+[[ "${URL,,}" == *"cndl.synology"* ]] && DL="$DL_CHINA"
+[[ "${URL,,}" == *"global.synology"* ]] && DL="$DL_GLOBAL"

+if [ -z "$DL" ]; then
+  [ -z "$COUNTRY" ] && setCountry
+  [ -z "$COUNTRY" ] && info "Warning: could not detect country to select mirror!"
+  [[ "${COUNTRY^^}" == "CN" ]] && DL="$DL_CHINA" || DL="$DL_GLOBAL"
 fi

+[ -z "$URL" ] && URL="$DL/release/7.2.1/69057-1/DSM_VirtualDSM_69057.pat"
+
+BASE=$(basename "$URL" .pat)
+
+if [[ "$URL" != "file://$STORAGE/$BASE.pat" ]]; then
+  rm -f "$STORAGE"/"$BASE".pat
+fi
+
+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
+  TMP="$STORAGE/tmp"
+else
+  TMP="/tmp/dsm"
+  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
+  fi
+fi
+
+rm -rf "$TMP" && mkdir -p "$TMP"
+
+# Check free diskspace
+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=$(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
+
 # Check if output is to interactive TTY
 if [ -t 1 ]; then
  PROGRESS="--progress=bar:noscroll"
@@ -39,38 +83,12 @@ else
  PROGRESS="--progress=dot:giga"
 fi

-BASE=$(basename "$URL" .pat)
-
-rm -f "$STORAGE"/"$BASE".pat
-rm -f "$STORAGE"/"$BASE".agent
-rm -f "$STORAGE"/"$BASE".boot.img
-rm -f "$STORAGE"/"$BASE".system.img
-
-MIN_SPACE=6442450944
-FS=$(stat -f -c %T "$STORAGE")
-
-if [[ "$FS" != "fat"* && "$FS" != "vfat"* && "$FS" != "exfat"* && \
-        "$FS" != "ntfs"* && "$FS" != "fuse"* && "$FS" != "msdos"* ]]; then
-  TMP="$STORAGE/tmp"
-else
-  TMP="/tmp/dsm"
-  SPACE=$(df --output=avail -B 1 /tmp | tail -n 1)
-  (( MIN_SPACE > SPACE )) && TMP="$STORAGE/tmp"
-fi
-
-rm -rf /tmp/dsm
-rm -rf "$STORAGE/tmp"
-rm -rf "$TMP" && mkdir -p "$TMP"
-
-# Check free diskspace
-SPACE=$(df --output=avail -B 1 "$TMP" | tail -n 1)
-(( MIN_SPACE > SPACE )) && error "Not enough free space for installation, need at least 6 GB." && exit 95
-
-[[ "${DEBUG}" == [Yy1]* ]] && set -x
+# Download the required files from the Synology website

+ROOT="Y"
 RDC="$STORAGE/dsm.rd"

-if [ ! -f "${RDC}" ]; then
+if [ ! -f "$RDC" ]; then

  info "Install: Downloading installer..."

@@ -79,7 +97,7 @@ if [ ! -f "${RDC}" ]; then
  VERIFY="b4215a4b213ff5154db0488f92c87864"
  LOC="$DL/release/7.0.1/42218/DSM_VirtualDSM_42218.pat"

-  { curl -r "$POS" -sfk -o "$RD" "$LOC"; rc=$?; } || :
+  { curl -r "$POS" -sfk -S -o "$RD" "$LOC"; rc=$?; } || :
  (( rc != 0 )) && error "Failed to download $LOC, reason: $rc" && exit 60

  SUM=$(md5sum "$RD" | cut -f 1 -d " ")
@@ -93,7 +111,7 @@ if [ ! -f "${RDC}" ]; then
    { wget "$LOC" -O "$PAT" -q --no-check-certificate --show-progress "$PROGRESS"; rc=$?; } || :
    (( rc != 0 )) && error "Failed to download $LOC, reason: $rc" && exit 60

-    tar --extract --file="$PAT" --directory="$(dirname "${RD}")"/. "$(basename "${RD}")"
+    tar --extract --file="$PAT" --directory="$(dirname "$RD")"/. "$(basename "$RD")"
    rm "$PAT"

  fi
@@ -102,13 +120,18 @@ if [ ! -f "${RDC}" ]; then

 fi

-if [ -f "${RDC}" ]; then
+if [ -f "$RDC" ]; then

  { xz -dc <"$RDC" >"$TMP/rd" 2>/dev/null; rc=$?; } || :
  (( rc != 1 )) && error "Failed to unxz $RDC, reason $rc" && exit 91

  { (cd "$TMP" && cpio -idm <"$TMP/rd" 2>/dev/null); rc=$?; } || :
-  (( rc != 0 )) && error "Failed to cpio $RDC, reason $rc" && exit 92
+
+  if (( rc != 0 )); then
+    ROOT="N"
+    { (cd "$TMP" && fakeroot cpio -idmu <"$TMP/rd" 2>/dev/null); rc=$?; } || :
+    (( rc != 0 )) && error "Failed to extract $RDC, reason $rc" && exit 92
+  fi

  mkdir -p /run/extract
  for file in $TMP/usr/lib/libcurl.so.4 \
@@ -141,9 +164,17 @@ info "Install: Downloading $(basename "$URL")..."
 PAT="/$BASE.pat"
 rm -f "$PAT"

-{ wget "$URL" -O "$PAT" -q --no-check-certificate --show-progress "$PROGRESS"; rc=$?; } || :
+if [[ "$URL" == "file://"* ]]; then
+
+  cp "${URL:7}" "$PAT"
+
+else
+
+  { wget "$URL" -O "$PAT" -q --no-check-certificate --show-progress "$PROGRESS"; rc=$?; } || :
+  (( rc != 0 )) && error "Failed to download $URL, reason: $rc" && exit 69
+
+fi

-(( rc != 0 )) && error "Failed to download $URL, reason: $rc" && exit 69
 [ ! -f "$PAT" ] && error "Failed to download $URL" && exit 69

 SIZE=$(stat -c%s "$PAT")
@@ -152,27 +183,14 @@ if ((SIZE<250000000)); then
  error "The specified PAT file is probably an update pack as it's too small." && exit 62
 fi

+info "Install: Extracting downloaded image..."
+
 if { tar tf "$PAT"; } >/dev/null 2>&1; then

-  info "Install: Extracting downloaded image..."
  tar xpf "$PAT" -C "$TMP/."

 else

-  if [ "$ARCH" != "amd64" ]; then
-
-    info "Install: Installing QEMU..."
-
-    export DEBCONF_NOWARNINGS="yes"
-    export DEBIAN_FRONTEND="noninteractive"
-
-    apt-get -qq update
-    apt-get -qq --no-install-recommends -y install qemu-user > /dev/null
-
-  fi
-
-  info "Install: Extracting downloaded image..."
-
  export LD_LIBRARY_PATH="/run/extract"

  if [ "$ARCH" == "amd64" ]; then
@@ -187,12 +205,7 @@ else

 fi

-HDA="$TMP/hda1"
-IDB="$TMP/indexdb"
-PKG="$TMP/packages"
-HDP="$TMP/synohdpack_img"
-
-[ ! -f "$HDA.tgz" ] && error "The PAT file contains no OS image." && exit 64
+info "Install: Preparing system partition..."

 BOOT=$(find "$TMP" -name "*.bin.zip")
 [ ! -f "$BOOT" ] && error "The PAT file contains no boot image." && exit 67
@@ -202,29 +215,48 @@ unzip -q -o "$BOOT".zip -d "$TMP"

 SYSTEM="$TMP/sys.img"
 SYSTEM_SIZE=4954537983
+rm -f "$SYSTEM"

 # Check free diskspace
 SPACE=$(df --output=avail -B 1 "$TMP" | tail -n 1)
-(( SYSTEM_SIZE > SPACE )) && error "Not enough free space to create a 4 GB system disk." && exit 87
+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

-if ! fallocate -l "${SYSTEM_SIZE}" "${SYSTEM}"; then
-  if ! truncate -s "${SYSTEM_SIZE}" "${SYSTEM}"; then
-    rm -f "${SYSTEM}" && error "Could not allocate a file for the system disk." && exit 88
+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")
+  if [[ "$FA" != *"C"* ]]; then
+    error "Failed to disable COW for system image $SYSTEM on ${FS^^} filesystem (returned $FA)"
+  fi
+fi
+
+if ! fallocate -l "$SYSTEM_SIZE" "$SYSTEM"; then
+  if ! truncate -s "$SYSTEM_SIZE" "$SYSTEM"; then
+    rm -f "$SYSTEM"
+    error "Could not allocate file $SYSTEM for the system disk." && exit 98
  fi
 fi

 # Check if file exists
-[ ! -f "${SYSTEM}" ] && error "System disk does not exist ($SYSTEM)" && exit 89
+[ ! -f "$SYSTEM" ] && error "System disk does not exist ($SYSTEM)" && exit 99

 # Check the filesize
-SIZE=$(stat -c%s "${SYSTEM}")
-[[ SIZE -ne SYSTEM_SIZE ]] && rm -f "${SYSTEM}" && error "System disk has the wrong size: ${SIZE}" && exit 90
+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"
        echo "label-id: 0x6f9ee2e9"
-        echo "device: ${SYSTEM}"
+        echo "device: $SYSTEM"
        echo "unit: sectors"
        echo "sector-size: 512"
        echo ""
@@ -234,45 +266,72 @@ PART="$TMP/partition.fdisk"

 sfdisk -q "$SYSTEM" < "$PART"

-info "Install: Extracting system partition..."
-
 MOUNT="$TMP/system"
 rm -rf "$MOUNT" && mkdir -p "$MOUNT"

+info "Install: Extracting system partition..."
+
+HDA="$TMP/hda1"
+IDB="$TMP/indexdb"
+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"
-tar xpfJ "$HDA.txz" --absolute-names -C "$MOUNT/"
+
+if [[ "$ROOT" != [Nn]* ]]; then
+
+  tar xpfJ "$HDA.txz" --absolute-names -C "$MOUNT/"
+
+fi

 [ -d "$PKG" ] && mv "$PKG/" "$MOUNT/.SynoUpgradePackages/"
 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/"

-info "Install: Installing system partition..."
+if [ -f "$IDB.txz" ]; then
+  INDEX_DB="$MOUNT/usr/syno/synoman/indexdb/"
+  mkdir -p "$INDEX_DB"
+  tar xpfJ "$IDB.txz" --absolute-names -C "$INDEX_DB"
+fi

 LABEL="1.44.1-42218"
 OFFSET="1048576" # 2048 * 512
 NUMBLOCKS="622560" # (4980480 * 512) / 4096

-mke2fs -q -t ext4 -b 4096 -d "$MOUNT/" -L "$LABEL" -F -E "offset=$OFFSET" "$SYSTEM" "$NUMBLOCKS"
+if [[ "$ROOT" != [Nn]* ]]; then
+
+  info "Install: Installing system partition..."
+
+  mke2fs -q -t ext4 -b 4096 -d "$MOUNT/" -L "$LABEL" -F -E "offset=$OFFSET" "$SYSTEM" "$NUMBLOCKS"
+
+else
+
+  fakeroot -- bash -c "set -Eeu;\
+        tar xpfJ $HDA.txz --absolute-names --skip-old-files -C $MOUNT/;\
+        printf '%b%s%b' '\E[1;34m❯ \E[1;36m' 'Install: Installing system partition...' '\E[0m\n';\
+        mke2fs -q -t ext4 -b 4096 -d $MOUNT/ -L $LABEL -F -E offset=$OFFSET $SYSTEM $NUMBLOCKS"
+
+fi

 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, need at least 6 GB." && exit 94
+if [[ "$URL" == "file://$STORAGE/$BASE.pat" ]]; then
+  rm -f "$PAT"
+else
+  mv -f "$PAT" "$STORAGE"/"$BASE".pat
 fi

-mv -f "$PAT" "$STORAGE"/"$BASE".pat
 mv -f "$BOOT" "$STORAGE"/"$BASE".boot.img
 mv -f "$SYSTEM" "$STORAGE"/"$BASE".system.img

 rm -rf "$TMP"

 { set +x; } 2>/dev/null
-[[ "${DEBUG}" == [Yy1]* ]] && echo
+[[ "$DEBUG" == [Yy1]* ]] && echo

 return 0
--- a/src/network.sh
+++ b/src/network.sh
@@ -6,16 +6,17 @@ set -Eeuo pipefail
 : ${DHCP:='N'}
 : ${MAC:='02:11:32:AA:BB:CC'}

+: ${VM_NET_DEV:=''}
 : ${VM_NET_TAP:='dsm'}
-: ${VM_NET_DEV:='eth0'}
 : ${VM_NET_MAC:="$MAC"}
 : ${VM_NET_HOST:='VirtualDSM'}

-: ${DNS_SERVERS:=''}
 : ${DNSMASQ_OPTS:=''}
 : ${DNSMASQ:='/usr/sbin/dnsmasq'}
 : ${DNSMASQ_CONF_DIR:='/etc/dnsmasq.d'}

+ADD_ERR="Please add the following setting to your container:"
+
 # ######################################
 #  Functions
 # ######################################
@@ -24,44 +25,43 @@ configureDHCP() {

  # Create a macvtap network for the VM guest

-  { ip link add link "${VM_NET_DEV}" name "${VM_NET_TAP}" address "${VM_NET_MAC}" type macvtap mode bridge ; rc=$?; } || :
+  { ip link add link "$VM_NET_DEV" name "$VM_NET_TAP" address "$VM_NET_MAC" type macvtap mode bridge ; rc=$?; } || :

  if (( rc != 0 )); then
    error "Cannot create macvtap interface. Please make sure the network type is 'macvlan' and not 'ipvlan',"
-    error "and that the NET_ADMIN capability has been added to the container config: --cap-add NET_ADMIN" && exit 16
+    error "and that the NET_ADMIN capability has been added to the container: --cap-add NET_ADMIN" && exit 16
  fi

-  while ! ip link set "${VM_NET_TAP}" up; do
+  while ! ip link set "$VM_NET_TAP" up; do
    info "Waiting for address to become available..."
    sleep 2
  done

-  TAP_NR=$(</sys/class/net/"${VM_NET_TAP}"/ifindex)
+  local TAP_NR TAP_PATH MAJOR MINOR
+  TAP_NR=$(</sys/class/net/"$VM_NET_TAP"/ifindex)
  TAP_PATH="/dev/tap${TAP_NR}"

  # Create dev file (there is no udev in container: need to be done manually)
-  IFS=: read -r MAJOR MINOR < <(cat /sys/devices/virtual/net/"${VM_NET_TAP}"/tap*/dev)
-  (( MAJOR < 1)) && error "Cannot find: sys/devices/virtual/net/${VM_NET_TAP}" && exit 18
+  IFS=: read -r MAJOR MINOR < <(cat /sys/devices/virtual/net/"$VM_NET_TAP"/tap*/dev)
+  (( MAJOR < 1)) && error "Cannot find: sys/devices/virtual/net/$VM_NET_TAP" && exit 18

-  [[ ! -e "${TAP_PATH}" ]] && [[ -e "/dev0/${TAP_PATH##*/}" ]] && ln -s "/dev0/${TAP_PATH##*/}" "${TAP_PATH}"
+  [[ ! -e "$TAP_PATH" ]] && [[ -e "/dev0/${TAP_PATH##*/}" ]] && ln -s "/dev0/${TAP_PATH##*/}" "$TAP_PATH"

-  if [[ ! -e "${TAP_PATH}" ]]; then
-    { mknod "${TAP_PATH}" c "$MAJOR" "$MINOR" ; rc=$?; } || :
-    (( rc != 0 )) && error "Cannot mknod: ${TAP_PATH} ($rc)" && exit 20
+  if [[ ! -e "$TAP_PATH" ]]; then
+    { mknod "$TAP_PATH" c "$MAJOR" "$MINOR" ; rc=$?; } || :
+    (( rc != 0 )) && error "Cannot mknod: $TAP_PATH ($rc)" && exit 20
  fi

  { exec 30>>"$TAP_PATH"; rc=$?; } 2>/dev/null || :

  if (( rc != 0 )); then
-    error "Cannot create TAP interface ($rc). Please add the following docker settings to your "
-    error "container: --device-cgroup-rule='c ${MAJOR}:* rwm' --device=/dev/vhost-net" && exit 21
+    error "Cannot create TAP interface ($rc). $ADD_ERR --device-cgroup-rule='c *:* rwm'" && exit 21
  fi

  { exec 40>>/dev/vhost-net; rc=$?; } 2>/dev/null || :

  if (( rc != 0 )); then
-    error "VHOST can not be found ($rc). Please add the following "
-    error "docker setting to your container: --device=/dev/vhost-net" && exit 22
+    error "VHOST can not be found ($rc). $ADD_ERR --device=/dev/vhost-net" && exit 22
  fi

  NET_OPTS="-netdev tap,id=hostnet0,vhost=on,vhostfd=40,fd=30"
@@ -69,64 +69,58 @@ configureDHCP() {
  return 0
 }

-configureDNS () {
+configureDNS() {

  # dnsmasq configuration:
  DNSMASQ_OPTS="$DNSMASQ_OPTS --dhcp-range=$VM_NET_IP,$VM_NET_IP --dhcp-host=$VM_NET_MAC,,$VM_NET_IP,$VM_NET_HOST,infinite --dhcp-option=option:netmask,255.255.255.0"

  # Create lease file for faster resolve
-  echo "0 $VM_NET_MAC $VM_NET_IP $VM_NET_HOST 01:${VM_NET_MAC}" > /var/lib/misc/dnsmasq.leases
+  echo "0 $VM_NET_MAC $VM_NET_IP $VM_NET_HOST 01:$VM_NET_MAC" > /var/lib/misc/dnsmasq.leases
  chmod 644 /var/lib/misc/dnsmasq.leases

-  # Build DNS options from container /etc/resolv.conf
-
-  if [[ "${DEBUG}" == [Yy1]* ]]; then
-    echo "/etc/resolv.conf:" && echo && cat /etc/resolv.conf && echo
-  fi
-
-  mapfile -t nameservers < <( { grep '^nameserver' /etc/resolv.conf || true; } | sed 's/\t/ /g' | sed 's/nameserver //' | sed 's/ //g')
-  searchdomains=$( { grep '^search' /etc/resolv.conf || true; } | sed 's/\t/ /g' | sed 's/search //' | sed 's/#.*//' | sed 's/\s*$//g' | sed 's/ /,/g')
-  domainname=$(echo "$searchdomains" | awk -F"," '{print $1}')
-
-  for nameserver in "${nameservers[@]}"; do
-    nameserver=$(echo "$nameserver" | sed 's/#.*//' )
-    if ! [[ "$nameserver" =~ .*:.* ]]; then
-      [[ -z "$DNS_SERVERS" ]] && DNS_SERVERS="$nameserver" || DNS_SERVERS="$DNS_SERVERS,$nameserver"
-    fi
-  done
-
-  [[ -z "$DNS_SERVERS" ]] && DNS_SERVERS="1.1.1.1"
-
-  DNSMASQ_OPTS="$DNSMASQ_OPTS --dhcp-option=option:dns-server,$DNS_SERVERS --dhcp-option=option:router,${VM_NET_IP%.*}.1"
-
-  if [ -n "$searchdomains" ] && [ "$searchdomains" != "." ]; then
-    DNSMASQ_OPTS="$DNSMASQ_OPTS --dhcp-option=option:domain-search,$searchdomains --dhcp-option=option:domain-name,$domainname"
-  else
-    [[ -z $(hostname -d) ]] || DNSMASQ_OPTS="$DNSMASQ_OPTS --dhcp-option=option:domain-name,$(hostname -d)"
-  fi
-
+  # Set DNS server and gateway
+  DNSMASQ_OPTS="$DNSMASQ_OPTS --dhcp-option=option:dns-server,${VM_NET_IP%.*}.1 --dhcp-option=option:router,${VM_NET_IP%.*}.1"
  DNSMASQ_OPTS=$(echo "$DNSMASQ_OPTS" | sed 's/\t/ /g' | tr -s ' ' | sed 's/^ *//')

-  [[ "${DEBUG}" == [Yy1]* ]] && set -x
+  [[ "$DEBUG" == [Yy1]* ]] && set -x
  $DNSMASQ ${DNSMASQ_OPTS:+ $DNSMASQ_OPTS}
  { set +x; } 2>/dev/null
-  [[ "${DEBUG}" == [Yy1]* ]] && echo
+  [[ "$DEBUG" == [Yy1]* ]] && echo

  return 0
 }

-configureNAT () {
+configureNAT() {
+
+  # Create the necessary file structure for /dev/net/tun
+  if [ ! -c /dev/net/tun ]; then
+    [ ! -d /dev/net ] && mkdir -m 755 /dev/net
+    if mknod /dev/net/tun c 10 200; then
+      chmod 666 /dev/net/tun
+    fi
+  fi
+
+  if [ ! -c /dev/net/tun ]; then
+    error "TUN device missing. $ADD_ERR --cap-add NET_ADMIN" && exit 25
+  fi
+
+  # Check port forwarding flag
+  if [[ $(< /proc/sys/net/ipv4/ip_forward) -eq 0 ]]; then
+    { sysctl -w net.ipv4.ip_forward=1 ; rc=$?; } || :
+    if (( rc != 0 )); then
+      error "IP forwarding is disabled. $ADD_ERR --sysctl net.ipv4.ip_forward=1" && exit 24
+    fi
+  fi

  # Create a bridge with a static IP for the VM guest

  VM_NET_IP='20.20.20.21'
-  [[ "${DEBUG}" == [Yy1]* ]] && set -x
+  [[ "$DEBUG" == [Yy1]* ]] && set -x

  { ip link add dev dockerbridge type bridge ; rc=$?; } || :

  if (( rc != 0 )); then
-    error "Capability NET_ADMIN has not been set most likely. Please add the "
-    error "following docker setting to your container: --cap-add NET_ADMIN" && exit 23
+    error "Failed to create bridge. $ADD_ERR --cap-add NET_ADMIN" && exit 23
  fi

  ip address add ${VM_NET_IP%.*}.1/24 broadcast ${VM_NET_IP%.*}.255 dev dockerbridge
@@ -137,21 +131,22 @@ configureNAT () {
  done

  # QEMU Works with taps, set tap to the bridge created
-  ip tuntap add dev "${VM_NET_TAP}" mode tap
+  ip tuntap add dev "$VM_NET_TAP" mode tap

-  while ! ip link set "${VM_NET_TAP}" up promisc on; do
+  while ! ip link set "$VM_NET_TAP" up promisc on; do
    info "Waiting for tap to become available..."
    sleep 2
  done

-  ip link set dev "${VM_NET_TAP}" master dockerbridge
+  ip link set dev "$VM_NET_TAP" master dockerbridge

  # Add internet connection to the VM
-  IP=$(ip address show dev "${VM_NET_DEV}" | grep inet | awk '/inet / { print $2 }' | cut -f1 -d/)
+  update-alternatives --set iptables /usr/sbin/iptables-legacy > /dev/null
+  update-alternatives --set ip6tables /usr/sbin/ip6tables-legacy > /dev/null

-  iptables -t nat -A POSTROUTING -o "${VM_NET_DEV}" -j MASQUERADE
-  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
+  iptables -t nat -A POSTROUTING -o "$VM_NET_DEV" -j MASQUERADE
+  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
    # Hack for guest VMs complaining about "bad udp checksums in 5 packets"
@@ -159,17 +154,9 @@ configureNAT () {
  fi

  { set +x; } 2>/dev/null
-  [[ "${DEBUG}" == [Yy1]* ]] && echo
+  [[ "$DEBUG" == [Yy1]* ]] && echo

-  # Check port forwarding flag
-  if [[ $(< /proc/sys/net/ipv4/ip_forward) -eq 0 ]]; then
-    { sysctl -w net.ipv4.ip_forward=1 ; rc=$?; } || :
-    if (( rc != 0 )); then
-      error "Please add the following docker setting to your container: --sysctl net.ipv4.ip_forward=1" && exit 24
-    fi
-  fi
-
-  NET_OPTS="-netdev tap,ifname=${VM_NET_TAP},script=no,downscript=no,id=hostnet0"
+  NET_OPTS="-netdev tap,ifname=$VM_NET_TAP,script=no,downscript=no,id=hostnet0"

  { exec 40>>/dev/vhost-net; rc=$?; } 2>/dev/null || :
  (( rc == 0 )) && NET_OPTS="$NET_OPTS,vhost=on,vhostfd=40"
@@ -179,65 +166,86 @@ configureNAT () {
  return 0
 }

-closeNetwork () {
+closeNetwork() {

-  if [[ "${DHCP}" == [Yy1]* ]]; then
+  exec 30<&- || true
+  exec 40<&- || true

-    ip link set "${VM_NET_TAP}" down || true
-    ip link delete "${VM_NET_TAP}" || true
+  if [[ "$DHCP" == [Yy1]* ]]; then
+
+    fKill "server.sh"
+
+    ip link set "$VM_NET_TAP" down || true
+    ip link delete "$VM_NET_TAP" || true

  else

-    ip link set "${VM_NET_TAP}" down promisc off || true
-    ip link delete "${VM_NET_TAP}" || true
+    fKill "dnsmasq"
+
+    ip link set "$VM_NET_TAP" down promisc off || true
+    ip link delete "$VM_NET_TAP" || true

    ip link set dockerbridge down || true
    ip link delete dockerbridge || true

  fi
+
+  return 0
+}
+
+getInfo() {
+
+  if [ -z "$VM_NET_DEV" ]; then
+    # Automaticly detect the default network interface
+    VM_NET_DEV=$(awk '$2 == 00000000 { print $1 }' /proc/net/route)
+    [ -z "$VM_NET_DEV" ] && VM_NET_DEV="eth0"
+  fi
+
+  if [ ! -d "/sys/class/net/$VM_NET_DEV" ]; then
+    error "Network interface '$VM_NET_DEV' does not exist inside the container!"
+    error "$ADD_ERR -e \"VM_NET_DEV=NAME\" to specify another interface name." && exit 27
+  fi
+
+  VM_NET_MAC="${VM_NET_MAC//-/:}"
+  if [[ ${#VM_NET_MAC} == 12 ]]; then
+    m="$VM_NET_MAC"
+    VM_NET_MAC="${m:0:2}:${m:2:2}:${m:4:2}:${m:6:2}:${m:8:2}:${m:10:2}"
+  fi
+
+  if [[ ${#VM_NET_MAC} != 17 ]]; then
+    error "Invalid mac address: '$VM_NET_MAC', should be 12 or 17 digits long!" && exit 28
+  fi
+
+  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
+
+  if [[ "$DEBUG" == [Yy1]* ]]; then
+    info "Container IP is $IP with gateway $GATEWAY on interface $VM_NET_DEV" && echo
+  fi
+
+  return 0
 }

 # ######################################
 #  Configure Network
 # ######################################

-{ pkill -f server.sh || true; } 2>/dev/null
+fKill "server.sh"

-# Create the necessary file structure for /dev/net/tun
-if [ ! -c /dev/net/tun ]; then
-  [ ! -d /dev/net ] && mkdir -m 755 /dev/net
-  mknod /dev/net/tun c 10 200
-  chmod 666 /dev/net/tun
-fi
-
-[ ! -c /dev/net/tun ] && error "TUN network interface not available..." && exit 85
-
-# Create the necessary file structure for /dev/vhost-net
 if [ ! -c /dev/vhost-net ]; then
-  mknod /dev/vhost-net c 10 238
-  chmod 660 /dev/vhost-net
+  if mknod /dev/vhost-net c 10 238; then
+    chmod 660 /dev/vhost-net
+  fi
 fi

-update-alternatives --set iptables /usr/sbin/iptables-legacy > /dev/null
-update-alternatives --set ip6tables /usr/sbin/ip6tables-legacy > /dev/null
+getInfo

-VM_NET_MAC="${VM_NET_MAC//-/:}"
-GATEWAY=$(ip r | grep default | awk '{print $3}')
-
-if [[ "${DEBUG}" == [Yy1]* ]]; then
-
-  IP=$(ip address show dev "${VM_NET_DEV}" | grep inet | awk '/inet / { print $2 }' | cut -f1 -d/)
-  info "Container IP is ${IP} with gateway ${GATEWAY}" && echo
-
-fi
-
-if [[ "${DHCP}" == [Yy1]* ]]; then
+if [[ "$DHCP" == [Yy1]* ]]; then

  if [[ "$GATEWAY" == "172."* ]]; then
-    if [[ "${DEBUG}" == [Yy1]* ]]; then
-      info "Warning: Are you sure the container is on a macvlan network?"
-    else
-      error "You can only enable DHCP while the container is on a macvlan network!" && exit 86
+    if [[ "$DEBUG" != [Yy1]* ]]; then
+      error "You can only enable DHCP while the container is on a macvlan network!" && exit 26
    fi
  fi

@@ -254,6 +262,6 @@ else

 fi

-NET_OPTS="${NET_OPTS} -device virtio-net-pci,romfile=,netdev=hostnet0,mac=${VM_NET_MAC},id=net0"
+NET_OPTS="$NET_OPTS -device virtio-net-pci,romfile=,netdev=hostnet0,mac=$VM_NET_MAC,id=net0"

 return 0
--- a/src/power.sh
+++ b/src/power.sh
@@ -3,72 +3,164 @@ set -Eeuo pipefail

 # Configure QEMU for graceful shutdown

+API_CMD=6
+API_TIMEOUT=50
+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/qemu.pid
-QEMU_COUNT=/run/qemu.count
+if [[ "$KVM" == [Nn]* ]]; then
+  API_TIMEOUT=$(( API_TIMEOUT*2 ))
+  QEMU_TIMEOUT=$(( QEMU_TIMEOUT*2 ))
+fi

-rm -f "${QEMU_PID}"
-rm -f "${QEMU_COUNT}"
+rm -f "$QEMU_PID"
+rm -f "$QEMU_LOG"
+rm -f "$QEMU_END"
+touch "$QEMU_LOG"

-_trap(){
-    func="$1" ; shift
-    for sig ; do
-        trap "$func $sig" "$sig"
+_trap() {
+  func="$1" ; shift
+  for sig ; do
+    trap "$func $sig" "$sig"
+  done
+}
+
+finish() {
+
+  local pid
+  local reason=$1
+
+  if [ -f "$QEMU_PID" ]; then
+
+    pid="$(cat "$QEMU_PID")"
+    echo && error "Forcefully terminating QEMU process, reason: $reason..."
+    { kill -15 "$pid" || true; } 2>/dev/null
+
+    while isAlive "$pid"; do
+      sleep 1
+      # Workaround for zombie pid
+      [ ! -f "$QEMU_PID" ] && break
    done
+  fi
+
+  fKill "print.sh"
+  fKill "host.bin"
+
+  closeNetwork
+
+  sleep 1
+  echo && echo "❯ Shutdown completed!"
+
+  exit "$reason"
+}
+
+terminal() {
+
+  local msg=$1
+
+  if [[ "${msg,,}" != "char"* ||  "$msg" != *"serial0)" ]]; then
+    echo "$msg"
+  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#*charserial0}"
+    dev="${dev#*pty:}"
+    dev="${dev%%$'\n'*}"
+    dev="${dev%%$'\r'*}"
+  fi
+
+  if [ ! -c "$dev" ]; then
+    error "Device '$dev' not found!"
+    finish 34 && return 34
+  fi
+
+  QEMU_TERM="$dev"
+  return 0
 }

 _graceful_shutdown() {

+  local cnt=0
+  local code=$?
+  local pid url response
+
  set +e

-  [ ! -f "${QEMU_PID}" ] && exit 130
-  [ -f "${QEMU_COUNT}" ] && return
+  if [ -f "$QEMU_END" ]; then
+    echo && info "Received $1 signal while already shutting down..."
+    return
+  fi

-  echo && info "Received $1 signal, shutting down..."
-  echo 0 > "${QEMU_COUNT}"
+  touch "$QEMU_END"
+  echo && info "Received $1 signal, sending shutdown command..."
+
+  if [ ! -f "$QEMU_PID" ]; then
+    echo && error "QEMU PID file does not exist?"
+    finish "$code" && return "$code"
+  fi
+
+  pid="$(cat "$QEMU_PID")"
+
+  if ! isAlive "$pid"; then
+    echo && error "QEMU process does not exist?"
+    finish "$code" && return "$code"
+  fi

  # Don't send the powerdown signal because vDSM ignores ACPI signals
  # echo 'system_powerdown' | nc -q 1 -w 1 localhost "${QEMU_PORT}" > /dev/null

  # Send shutdown command to guest agent via serial port
-  RESPONSE=$(curl -s -m 5 -S http://127.0.0.1:2210/read?command=6 2>&1)
+  url="http://$API_HOST/read?command=$API_CMD&timeout=$API_TIMEOUT"
+  response=$(curl -sk -m "$(( API_TIMEOUT+2 ))" -S "$url" 2>&1)

-  if [[ ! "${RESPONSE}" =~ "\"success\"" ]] ; then
+  if [[ "$response" =~ "\"success\"" ]]; then

-    echo && error "Could not send shutdown command to the guest ($RESPONSE)"
+    echo && info "Virtual DSM is now ready to shutdown..."

-    kill -15 "$(cat "${QEMU_PID}")"
-    pkill -f qemu-system-x86_64 || true
+  else
+
+    response="${response#*message\"\: \"}"
+    [ -z "$response" ] && response="second signal"
+    echo && error "Forcefully terminating because of: ${response%%\"*}"
+    { kill -15 "$pid" || true; } 2>/dev/null

  fi

-  while [ "$(cat ${QEMU_COUNT})" -lt "${QEMU_TIMEOUT}" ]; do
+  while [ "$cnt" -lt "$QEMU_TIMEOUT" ]; do

-    # Increase the counter
-    echo $(($(cat ${QEMU_COUNT})+1)) > ${QEMU_COUNT}
+    ! isAlive "$pid" && break

-    # Try to connect to qemu
-    if echo 'info version'| nc -q 1 -w 1 localhost "${QEMU_PORT}" >/dev/null 2>&1 ; then
+    sleep 1
+    cnt=$((cnt+1))

-      sleep 1
+    [[ "$DEBUG" == [Yy1]* ]] && info "Shutting down, waiting... ($cnt/$QEMU_TIMEOUT)"

-      CNT="$(cat ${QEMU_COUNT})/${QEMU_TIMEOUT}"
-      [[ "${DEBUG}" == [Yy1]* ]] && info "Shutting down, waiting... (${CNT})"
-
-    fi
+    # Workaround for zombie pid
+    [ ! -f "$QEMU_PID" ] && break

  done

-  echo && echo "❯ Quitting..."
-  echo 'quit' | nc -q 1 -w 1 localhost "${QEMU_PORT}" >/dev/null 2>&1 || true
+  if [ "$cnt" -ge "$QEMU_TIMEOUT" ]; then
+    echo && error "Shutdown timeout reached, aborting..."
+  fi

-  closeNetwork
-
-  return
+  finish "$code" && return "$code"
 }

-_trap _graceful_shutdown SIGTERM SIGHUP SIGINT SIGABRT SIGQUIT
+if [[ "$CONSOLE" != [Yy]* ]]; then
+  _trap _graceful_shutdown SIGTERM SIGHUP SIGINT SIGABRT SIGQUIT
+fi

-MON_OPTS="-monitor telnet:localhost:${QEMU_PORT},server,nowait,nodelay"
+MON_OPTS="\
+        -pidfile $QEMU_PID \
+        -monitor telnet:localhost:$QEMU_PORT,server,nowait,nodelay"
--- a/src/print.sh
+++ b/src/print.sh
@@ -1,66 +1,87 @@
 #!/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" ; }
+: ${DHCP:='N'}
+
+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"
+url="http://127.0.0.1:2210/read?command=10"
+
+resp_err="Guest returned an invalid response:"
+curl_err="Failed to connect to guest: curl error"
+jq_err="Failed to parse response from guest: jq error"

 while [ ! -f  "$file" ]
 do

+  # Check if not shutting down
+  [ -f "$shutdown" ] && exit 1
+
  sleep 3
-  [ -f "$file" ] && continue

-  # Retrieve IP from guest VM
+  [ -f "$shutdown" ] && exit 1
+  [ -f "$file" ] && break

-  set +e
-  RESPONSE=$(curl -s -m 16 -S http://127.0.0.1:2210/read?command=10 2>&1)
-  set -e
+  # Retrieve network info from guest VM
+  { json=$(curl -m 20 -sk "$url"); rc=$?; } || :

-  if [[ ! "${RESPONSE}" =~ "\"success\"" ]] ; then
-    error "Failed to connect to guest: $RESPONSE" && continue
+  [ -f "$shutdown" ] && exit 1
+  (( rc != 0 )) && error "$curl_err $rc" && continue
+
+  { result=$(echo "$json" | jq -r '.status'); rc=$?; } || :
+  (( rc != 0 )) && error "$jq_err $rc ( $json )" && continue
+  [[ "$result" == "null" ]] && error "$resp_err $json" && continue
+
+  if [[ "$result" != "success" ]] ; then
+    { msg=$(echo "$json" | jq -r '.message'); rc=$?; } || :
+    error "Guest replied $result: $msg" && continue
  fi

-  # Retrieve the HTTP port number
-  if [[ ! "${RESPONSE}" =~ "\"http_port\"" ]] ; then
-    error "Failed to parse response from guest: $RESPONSE" && continue
+  { port=$(echo "$json" | jq -r '.data.data.dsm_setting.data.http_port'); rc=$?; } || :
+  (( rc != 0 )) && error "$jq_err $rc ( $json )" && continue
+  [[ "$port" == "null" ]] && error "$resp_err $json" && continue
+  [ -z "$port" ] && continue
+
+  { ip=$(echo "$json" | jq -r '.data.data.ip.data[] | select((.name=="eth0") and has("ip")).ip'); rc=$?; } || :
+  (( rc != 0 )) && error "$jq_err $rc ( $json )" && continue
+  [[ "$ip" == "null" ]] && error "$resp_err $json" && continue
+
+  if [ -z "$ip" ]; then
+    [[ "$DHCP" == [Yy1]* ]] && continue
+    ip="20.20.20.21"
  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
-
-  echo "${IP}:${PORT}" > $file
+  echo "$ip:$port" > $file

 done

-LOCATION=$(cat "$file")
+[ -f "$shutdown" ] && exit 1
+
+location=$(cat "$file")
+
+if [[ "$location" != "20.20"* ]]; then
+
+  msg="http://$location"

-if [[ "$LOCATION" == "20.20"* ]]; then
-  MSG="port ${LOCATION##*:}"
 else
-  MSG="http://${LOCATION}"
+
+  ip="$(cat "$address")"
+  port="${location##*:}"
+
+  if [[ "$ip" == "172."* ]]; then
+    msg="port $port"
+  else
+    msg="http://$ip:$port"
+  fi
+
 fi

 echo "" >&2
-info "--------------------------------------------------------"
-info " You can now login to DSM at ${MSG}"
-info "--------------------------------------------------------"
+info "-----------------------------------------------------------"
+info " You can now login to DSM at $msg"
+info "-----------------------------------------------------------"
 echo "" >&2
--- a/src/reset.sh
+++ b/src/reset.sh
@@ -1,22 +1,27 @@
 #!/usr/bin/env bash
 set -Eeuo pipefail

-info () { echo -e "\E[1;34m❯ \E[1;36m$1\E[0m" ; }
-error () { echo -e >&2 "\E[1;31m❯ ERROR: $1\E[0m" ; }
-trap 'error "Status $? while: ${BASH_COMMAND} (line $LINENO/$BASH_LINENO)"' ERR
+info () { printf "%b%s%b" "\E[1;34m❯ \E[1;36m" "$1" "\E[0m\n"; }
+error () { printf "%b%s%b" "\E[1;31m❯ " "ERROR: $1" "\E[0m\n" >&2; }
+
+trap 'error "Status $? while: $BASH_COMMAND (line $LINENO/$BASH_LINENO)"' ERR

 [ ! -f "/run/entry.sh" ] && error "Script must run inside Docker container!" && exit 11
 [ "$(id -u)" -ne "0" ] && error "Script must be executed with root privileges." && exit 12

 # Docker environment variables

-: ${GPU:='N'}           # Enable GPU passthrough
-: ${DEBUG:='N'}         # Enable debugging mode
+: ${TZ:=''}             # System local timezone
+: ${GPU:='N'}           # Disable GPU passthrough
+: ${KVM:='Y'}           # Enable KVM acceleration
+: ${DEBUG:='N'}         # Disable debugging mode
+: ${COUNTRY:=''}        # Country code for mirror
+: ${CONSOLE:='N'}       # Disable console mode
 : ${ALLOCATE:='Y'}      # Preallocate diskspace
 : ${ARGUMENTS:=''}      # Extra QEMU parameters
 : ${CPU_CORES:='1'}     # Amount of CPU cores
+: ${RAM_SIZE:='1G'}     # Maximum RAM amount
 : ${DISK_SIZE:='16G'}   # Initial data disk size
-: ${RAM_SIZE:='512M'}   # Maximum RAM amount

 # Helper variables

@@ -25,15 +30,120 @@ MINOR=$(uname -r | cut -d '.' -f2)
 ARCH=$(dpkg --print-architecture)
 VERS=$(qemu-system-x86_64 --version | head -n 1 | cut -d '(' -f 1)

-# Cleanup files
-
-rm -f /run/dsm.url
-rm -f /run/qemu.pid
-rm -f /run/qemu.count
-
 # Check folder

 STORAGE="/storage"
-[ ! -d "$STORAGE" ] && error "Storage folder (${STORAGE}) not found!" && exit 13
+[ ! -d "$STORAGE" ] && error "Storage folder ($STORAGE) not found!" && exit 13
+
+# 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
+
+# Cleanup dirs
+
+rm -rf /tmp/dsm
+rm -f /tmp/server.*
+rm -rf "$STORAGE/tmp"
+
+# Helper functions
+
+isAlive() {
+  local pid=$1
+
+  if kill -0 "$pid" 2>/dev/null; then
+    return 0
+  fi
+
+  return 1
+}
+
+pKill() {
+  local pid=$1
+
+  { kill -15 "$pid" || true; } 2>/dev/null
+
+  while isAlive "$pid"; do
+    sleep 0.1
+  done
+
+  return 0
+}
+
+fKill() {
+  local name=$1
+
+  { pkill -f "$name" || true; } 2>/dev/null
+
+  while pgrep -f -l "$name" >/dev/null; do
+    sleep 0.1
+  done
+
+  return 0
+}
+
+getCountry() {
+  local url=$1
+  local query=$2
+  local rc json result
+
+  { json=$(curl -m 5 -H "Accept: application/json" -sfk "$url"); rc=$?; } || :
+  (( rc != 0 )) && return 0
+
+  { result=$(echo "$json" | jq -r "$query" 2> /dev/null); rc=$?; } || :
+  (( rc != 0 )) && return 0
+
+  [[ ${#result} -ne 2 ]] && return 0
+  [[ "${result^^}" == "XX" ]] && return 0
+
+  COUNTRY="${result^^}"
+
+  return 0
+}
+
+setCountry() {
+
+  [[ "${TZ,,}" == "asia/harbin" ]] && COUNTRY="CN"
+  [[ "${TZ,,}" == "asia/beijing" ]] && COUNTRY="CN"
+  [[ "${TZ,,}" == "asia/urumqi" ]] && COUNTRY="CN"
+  [[ "${TZ,,}" == "asia/kashgar" ]] && COUNTRY="CN"
+  [[ "${TZ,,}" == "asia/shanghai" ]] && COUNTRY="CN"
+  [[ "${TZ,,}" == "asia/chongqing" ]] && COUNTRY="CN"
+
+  [ -z "$COUNTRY" ] && getCountry "https://api.ipapi.is" ".location.country_code"
+  [ -z "$COUNTRY" ] && getCountry "https://ifconfig.co/json" ".country_iso"
+  [ -z "$COUNTRY" ] && getCountry "https://ipinfo.io/json" ".country"
+  [ -z "$COUNTRY" ] && getCountry "https://api.myip.com" ".cc"
+
+  return 0
+}
+
+addPackage() {
+  local pkg=$1
+  local desc=$2
+
+  if apt-mark showinstall | grep -qx "$pkg"; then
+    return 0
+  fi
+
+  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
+
+  return 0
+}

 return 0
--- a/src/serial.sh
+++ b/src/serial.sh
@@ -1,39 +1,24 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -Eeuo pipefail

 # Docker environment variables

-: ${HOST_CPU:=''}
 : ${HOST_MAC:=''}
 : ${HOST_DEBUG:=''}
 : ${HOST_SERIAL:=''}
 : ${HOST_MODEL:=''}
 : ${GUEST_SERIAL:=''}

-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')
-fi
-
-if [ -n "$HOST_CPU" ]; then
-  HOST_CPU="$HOST_CPU,,"
-else
-  if [ "$ARCH" == "amd64" ]; then
-    HOST_CPU="QEMU, Virtual CPU, X86_64"
-  else
-    HOST_CPU="QEMU, Virtual CPU, $ARCH"
-  fi
-fi
-
 HOST_ARGS=()
-HOST_ARGS+=("-cpu=${CPU_CORES}")
-HOST_ARGS+=("-cpu_arch=${HOST_CPU}")
+HOST_ARGS+=("-cpu=$CPU_CORES")
+HOST_ARGS+=("-cpu_arch=$HOST_CPU")

-[ -n "$HOST_MAC" ] && HOST_ARGS+=("-mac=${HOST_MAC}")
-[ -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_MAC" ] && HOST_ARGS+=("-mac=$HOST_MAC")
+[ -n "$HOST_MODEL" ] && HOST_ARGS+=("-model=$HOST_MODEL")
+[ -n "$HOST_SERIAL" ] && HOST_ARGS+=("-hostsn=$HOST_SERIAL")
+[ -n "$GUEST_SERIAL" ] && HOST_ARGS+=("-guestsn=$GUEST_SERIAL")

-if [[ "${HOST_DEBUG}" == [Yy1]* ]]; then
+if [[ "$HOST_DEBUG" == [Yy1]* ]]; then
  set -x
  ./host.bin "${HOST_ARGS[@]}" &
  { set +x; } 2>/dev/null
@@ -45,27 +30,27 @@ fi
 cnt=0
 sleep 0.2

-while ! nc -z -w1 127.0.0.1 2210 > /dev/null 2>&1; do
+while ! nc -z -w2 127.0.0.1 2210 > /dev/null 2>&1; do
  sleep 0.1
  cnt=$((cnt + 1))
-  (( cnt > 20 )) && error "Failed to connect to qemu-host.." && exit 58
+  (( cnt > 50 )) && error "Failed to connect to qemu-host.." && exit 58
 done

 cnt=0

-while ! nc -z -w1 127.0.0.1 12345 > /dev/null 2>&1; do
+while ! nc -z -w2 127.0.0.1 12345 > /dev/null 2>&1; do
  sleep 0.1
  cnt=$((cnt + 1))
-  (( cnt > 20 )) && error "Failed to connect to qemu-host.." && exit 59
+  (( cnt > 50 )) && error "Failed to connect to qemu-host.." && exit 59
 done

 # Configure serial ports

 SERIAL_OPTS="\
-        -serial mon:stdio \
-        -device virtio-serial-pci,id=virtio-serial0,bus=pcie.0,addr=0x3 \
+        -serial none \
        -chardev pty,id=charserial0 \
        -device isa-serial,chardev=charserial0,id=serial0 \
+        -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"

--- a/src/server.sh
+++ b/src/server.sh
@@ -14,9 +14,9 @@ trap 'stop' EXIT SIGINT SIGTERM SIGHUP
 html()
 {
    local h="<!DOCTYPE html><HTML><HEAD><TITLE>VirtualDSM</TITLE>"
-    h="${h} <STYLE>body { color: white; background-color: #125bdb; font-family: Verdana,"
-    h="${h} Arial,sans-serif; } a, a:hover, a:active, a:visited { color: white; }</STYLE></HEAD>"
-    h="${h}<BODY><BR><BR><H1><CENTER>$1</CENTER></H1></BODY></HTML>"
+    h="$h<STYLE>body { color: white; background-color: #125bdb; font-family: Verdana,"
+    h="$h Arial,sans-serif; } a, a:hover, a:active, a:visited { color: white; }</STYLE></HEAD>"
+    h="$h<BODY><BR><BR><H1><CENTER>$1</CENTER></H1></BODY></HTML>"

    echo "$h"
 }
@@ -33,8 +33,8 @@ if [[ "$2" != "/"* ]]; then
  HTML=$(html "$BODY")
  printf '%b' "HTTP/1.1 200 OK\nContent-Length: ${#HTML}\nConnection: close\n\n$HTML" > "$TMP_FILE"

-  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 $!
+  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
  
@@ -46,15 +46,15 @@ if [[ "$2" != "/run/ip.sh" ]]; then

 else

-  BODY="The location of DSM is <a href='http://\${LOCATION}'>http://\${LOCATION}</a><script>"
-  BODY="${BODY}setTimeout(function(){ window.location.assign('http://\${LOCATION}'); }, 3000);</script>"
+  BODY="The location of DSM is <a href='http://\$LOCATION'>http://\$LOCATION</a><script>"
+  BODY="$BODY setTimeout(function(){ window.location.assign('http://\$LOCATION'); }, 3000);</script>"
  WAIT="Please wait while discovering IP...<script>setTimeout(() => { document.location.reload(); }, 4999);</script>"

  HTML=$(html "xxx")

  { echo "#!/bin/bash"
    echo "[ -f \"/run/dsm.url\" ] && LOCATION=\$(cat \"/run/dsm.url\")"
-    echo "HTML=\"$HTML\"; [ -z \"\${LOCATION}\" ] && BODY=\"$WAIT\" || BODY=\"$BODY\"; HTML=\${HTML/xxx/\$BODY}"
+    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"
Author	SHA1	Message	Date
Kroese	08616f1057	build: Update Dockerfile (#518 )	2023-12-29 00:24:36 +01:00
Kroese	e6193b1020	fix: Port forwarding (#517 )	2023-12-28 21:30:28 +01:00
Kroese	f28b9903f3	fix: iptables for NAT (#516 )	2023-12-28 21:20:38 +01:00
Kroese	7bf2d119ea	feat: Validate mac address (#515 )	2023-12-28 20:54:33 +01:00
Kroese	527bded1b2	feat: Detect default interface * feat: Detect default interface	2023-12-28 20:25:04 +01:00
Kroese	1208c53ebb	feat: Check network interface (#513 )	2023-12-28 18:26:56 +01:00
Kroese	973efa2d27	feat: Show daemon log * feat: Show daemon log	2023-12-28 17:58:07 +01:00
Kroese	d09588b915	fix: Refactor * fix: Refactor	2023-12-28 16:08:12 +01:00
Kroese	19aa313753	fix: Shellcheck (#509 )	2023-12-28 08:35:51 +01:00
Kroese	9db12cd25f	fix: Device detection * fix: Device detection	2023-12-28 08:31:32 +01:00
Kroese	69e785e6ee	fix: Shutdown message * fix: Shutdown message	2023-12-28 05:26:53 +01:00
Kroese	159fce6839	fix: Detect device * fix: Detect device	2023-12-28 05:04:40 +01:00
Kroese	08e4084458	feat: Daemonize QEMU * feat: Daemonize QEMU	2023-12-28 03:42:06 +01:00
Kroese	06f210846c	fix: KVM flag (#504 )	2023-12-27 16:28:24 +01:00
Kroese	74629e4b55	fix: Installation (#501 )	2023-12-27 04:07:45 +01:00
Kroese	6e8af6e52f	fix: Host CPU (#500 )	2023-12-27 03:23:39 +01:00
Kroese	38611a7af2	fix: Host CPU (#499 )	2023-12-27 03:18:03 +01:00
Kroese	f089acc01a	fix: CPU features (#496 )	2023-12-25 05:58:14 +01:00
Kroese	5a7ecb48d6	fix: Error messages (#495 )	2023-12-25 05:03:00 +01:00
Kroese	5b3880aa5e	fix: Error messages (#494 )	2023-12-25 04:48:18 +01:00
Kroese	4653aafbee	docs: Readme (#493 )	2023-12-25 04:21:50 +01:00
Kroese	281f2992ff	fix: Close file descriptors * fix: Close file descriptors	2023-12-25 04:04:01 +01:00
Kroese	4bdcf8bfe1	fix: Skip mknod errors (#491 )	2023-12-24 14:39:37 +01:00
Kroese	62acaa95bf	fix: Check attribute (#490 )	2023-12-24 14:27:29 +01:00
Kroese	369bff339d	fix: Update Dockerfile (#489 )	2023-12-24 02:54:57 +01:00
Kroese	5332d387f4	fix: Set file attribute (#488 ) * fix: Set file attribute	2023-12-24 02:41:44 +01:00
Kroese	f0d08ef263	fix: Remove flag (#487 ) * fix: Remove flag	2023-12-23 22:58:45 +01:00
Kroese	e4334f9499	fix: Ignore mknod errors (#486 )	2023-12-23 22:28:25 +01:00
Kroese	627ec56262	feat: LINUX_IMMUTABLE flag (#485 ) * feat: LINUX_IMMUTABLE flag	2023-12-23 21:26:23 +01:00
Kroese	251cf8121e	feat: Add LINUX_IMMUTABLE flag (#484 ) To change directory attributes on COW filesystems	2023-12-23 20:35:06 +01:00
Kroese	87fad1b0e9	feat: Set directory attributes (#483 ) * feat: Set directory attributes	2023-12-23 20:01:27 +01:00
Kroese	698516ac8c	feat: Detect country from timezone (#482 )	2023-12-23 18:46:14 +01:00
databreach	dae5d75674	feat: Improve support for unprivileged hosts (including LXC) (#479 ) * * Add fakeroot to extract the dsm system without elevated permissions * Remove obsolete docker variable "DEV" used to exclude extraction of device nodes * feat: Detect unprivileged container * fix: Use fakeroot for mke2fs --------- Co-authored-by: Kroese <kroese@users.noreply.github.com>	2023-12-23 18:04:43 +01:00
Kroese	95facffa9b	fix: Use specified LAN adaptor (#481 ) * fix: Use specified LAN adaptor	2023-12-23 15:23:36 +01:00
Kroese	682e0a9952	feat: Check filesystem (#477 ) * feat: Check filesystem	2023-12-22 15:00:22 +01:00
Kroese	9a97dfdc70	fix: Check filesystem (#476 )	2023-12-22 06:15:33 +01:00
Kroese	2f383699f9	feat: Firewall info feat: Firewall info	2023-12-22 05:20:44 +01:00
Kroese	8137a137b3	fix: Disable device nodes	2023-12-22 05:10:22 +01:00
Kroese	1339d51796	feat: Firewall info	2023-12-22 04:47:58 +01:00
Kroese	dce447c974	fix: Quit message	2023-12-22 04:24:48 +01:00
Kroese	ef5b650991	fix: Shutdown loop (#474 )	2023-12-20 12:09:25 +01:00
Kroese	fd19c7b4f3	feat: Log creation info (#473 )	2023-12-20 03:34:26 +01:00
Kroese	727297642c	fix: Exit counter (#472 )	2023-12-20 02:00:07 +01:00
Kroese	cd457801e7	fix: Set IP in bridge mode * fix: Set IP in bridge mode	2023-12-20 01:52:55 +01:00
Kroese	392e7afdfe	fix: Allocate after conversion fix: Allocate after conversion	2023-12-19 08:54:43 +01:00
Kroese	b425e34907	fix: Allocate after conversion	2023-12-19 08:54:08 +01:00
Kroese	7c2e2fc7b1	feat: Enable IO threading feat: Enable IO threading	2023-12-19 06:16:28 +01:00
Kroese	9bac0c94a8	feat: Detect COW on btrfs	2023-12-19 06:11:50 +01:00
Kroese	631568681e	feat: Detect COW on BTRFS	2023-12-19 06:01:50 +01:00
Kroese	6599861dbb	feat: Detect COW on BTRFS	2023-12-19 05:46:49 +01:00
Kroese	3bcd831531	fix: Display timeout	2023-12-19 04:30:01 +01:00
Kroese	fafd4a4fca	feat: Enable IO threading	2023-12-19 03:59:19 +01:00
Kroese	5b69178f08	docs: Allocation	2023-12-19 03:33:41 +01:00
Kroese	479a30369d	feat: Enable IO threading	2023-12-19 02:34:48 +01:00
Kroese	ba522a4acb	feat: Increase clustersize for qcow2 * feat: Increase clustersize for qcow2	2023-12-18 17:34:40 +01:00
Kroese	3ab6d2c418	docs: Allocation	2023-12-18 16:48:01 +01:00
Kroese	b71b2245cb	fix: Check diskspace * fix: Check diskspace	2023-12-18 16:44:26 +01:00
Kroese	bbea0eb429	docs: Readme	2023-12-18 12:39:11 +01:00
Kroese	c28c5cfbaa	docs: Allocation	2023-12-18 12:36:03 +01:00
Kroese	be3fd30cb2	feat: Honor allocation flag for qcow2 * feat: Honor allocation flag for qcow2	2023-12-18 12:18:28 +01:00
Kroese	e3942da906	feat: Set NOCOW flag for btrfs feat: Set NOCOW flag for btrfs	2023-12-17 11:42:08 +01:00
Kroese	d66be1a228	fix: Do not set flags on resize	2023-12-17 11:25:42 +01:00
Kroese	72085d3711	fix: Set qcow2 flags	2023-12-17 11:17:26 +01:00
Kroese	e7cdbb1db5	feat: Optimize qcow2 flags	2023-12-17 10:51:30 +01:00
Kroese	7a592e0cea	docs: DHCP mode	2023-12-17 10:08:55 +01:00
Kroese	107a4b87d5	fix: Quotes	2023-12-17 10:04:00 +01:00
Kroese	8b0ec3bef7	fix: Remove healthcheck exception	2023-12-17 09:57:50 +01:00
Kroese	aaded40a4f	fix: Cleanup server files	2023-12-17 09:54:07 +01:00
Kroese	7f77bb88ab	fix: Grammar	2023-12-17 09:50:07 +01:00
Kroese	95c3b2caad	fix: Default folder	2023-12-17 09:39:19 +01:00
Kroese	150c450bf6	docs: Default folder	2023-12-17 09:37:36 +01:00
Kroese	932c23afba	fix: Check SSE4.2	2023-12-16 15:57:30 +01:00
Kroese	2e0107e46f	fix: Bash shebang * fix: Bash shebang	2023-12-16 07:42:57 +01:00
Kroese	d22a3a4c7d	feat: Support more CPU models feat: Support more CPU models	2023-12-16 06:44:58 +01:00
Kroese	f93f870626	feat: CPU features	2023-12-16 06:31:43 +01:00
Kroese	a2e55c5dda	fix: Configuration variables	2023-12-16 05:11:20 +01:00
Kroese	32748509ea	fix: CPU configuration	2023-12-16 05:08:34 +01:00
Kroese	970a662170	fix: CPU configuration	2023-12-16 05:04:17 +01:00
Kroese	8925323a6e	feat: KVM flag	2023-12-16 04:55:40 +01:00
Kroese	10915a601c	feat: Display emulated CPU	2023-12-16 04:44:15 +01:00
Kroese	2cc1af19b1	fix: Configure CPU	2023-12-16 04:38:15 +01:00
Kroese	6670ca4fe1	fix: Configuration	2023-12-16 04:36:56 +01:00
Kroese	d3f77c848c	feat: Emulate SSE4.2 on ARM64	2023-12-16 04:36:00 +01:00
Kroese	3f2ca67051	feat: Emulate SSE4.2 on ARM64	2023-12-16 04:22:21 +01:00
Kroese	3812101366	feat: Add KVM flag	2023-12-16 04:02:11 +01:00
Kroese	db72acfc4f	feat: Install DSM 7.2 on ARM64	2023-12-16 03:12:55 +01:00
Kroese	1b3d760f5f	fix: Set CPU model	2023-12-16 03:07:08 +01:00
Kroese	539f5de6d9	fix: Add qemu-user package on arm64	2023-12-16 02:45:16 +01:00
Kroese	fe2d072056	fix: Check for SSE4.2 support	2023-12-16 02:05:54 +01:00
Kroese	469ee67942	fix: Error codes	2023-12-16 01:42:02 +01:00
Kroese	95991d8f5d	fix: Error codes	2023-12-16 01:36:33 +01:00
Kroese	7e12585429	fix: Error codes	2023-12-16 01:30:34 +01:00
Kroese	c335078aac	feat: Display emulated CPU	2023-12-16 01:00:42 +01:00
Kroese	f1fbbb5623	feat: Configure CPU model	2023-12-16 00:35:08 +01:00
Kroese	b6502e0a38	fix: Simplify healthcheck fix: Simplify healthcheck	2023-12-15 09:17:53 +01:00
Kroese	2fab3e5897	fix: Simplify healthcheck	2023-12-15 09:01:19 +01:00
Kroese	a4ea89d6e7	fix: Extended error message	2023-12-15 08:49:37 +01:00
Kroese	c451f253fa	build: Release token (#454 )	2023-12-14 03:45:32 +01:00
Kroese	03121b6c6d	build: Renovate (#452 )	2023-12-11 00:32:18 +01:00
Kroese	007d20c315	fix: Message variables * fix: Message variables	2023-12-10 16:54:02 +01:00
Kroese	26d6fa9fcc	feat: Improve shutdown * feat: Improve shutdown	2023-12-10 15:58:37 +01:00
Kroese	b9f3e52ba4	feat: Improve shutdown (#448 ) * feat: Improve shutdown	2023-12-10 09:22:35 +01:00
Kroese	03d2665725	fix: Local variables (#447 ) * fix: Local variables * fix: Keep location	2023-12-10 00:26:13 +01:00
Kroese	ba7fd2fe4a	fix: Error checking (#446 )	2023-12-09 21:45:31 +01:00
Kroese	a8bcae16a4	fix: Remove curly braces * fix: Remove curly braces	2023-12-09 21:19:08 +01:00
Kroese	2f19d31a81	feat: Show conversion progress (#444 ) * feat: Show conversion progress	2023-12-09 15:15:25 +01:00
Kroese	54692e3a75	fix: Move progress (#443 )	2023-12-09 06:19:07 +01:00
Kroese	029235a34d	docs: Readme (#442 )	2023-12-09 05:52:21 +01:00
Kroese	180573d69f	fix: Diskspace warning (#441 )	2023-12-09 05:40:10 +01:00
Kroese	8fa900335a	feat: Add qcow2 disk format (#440 ) * feat: Add qcow2 disk format	2023-12-09 02:55:39 +01:00
Kroese	a527080ccd	feat: Print curl error (#438 ) * feat: Print curl error	2023-12-07 23:36:57 +01:00
Kroese	ce6d60c611	Parse JSON with JQ (#437 ) * feat: Parse JSON with JQ	2023-12-07 23:18:47 +01:00
Kroese	ff9fd9b377	fix: Set timeout (#435 )	2023-12-06 07:16:30 +01:00
Kroese	9e61be15e6	build: Platforms (#433 )	2023-12-06 06:39:57 +01:00
Kroese	b1d53b42ca	fix: File support	2023-12-06 05:56:25 +01:00
Kroese	143a2151fb	fix: Increase timeout (#431 ) * fix: Increase timeout	2023-12-06 05:37:03 +01:00
Kroese	7fd29e30b3	fix: Match package	2023-12-05 07:53:03 +01:00
Kroese	efe46e1fdc	feat: Mirror selection * feat: Country detection	2023-12-05 06:56:20 +01:00
Kroese	2cf4ca07f4	fix: Set request header	2023-12-04 17:14:55 +01:00
Kroese	b88207f0dd	fix: Check diskspace	2023-12-04 15:32:17 +01:00
Kroese	70e10b1d56	fix: Deduce mirror from URL * fix: Deduce mirror from URL	2023-12-04 15:10:49 +01:00
Kroese	ced994d94a	fix: Force JSON response	2023-12-04 14:35:59 +01:00
Kroese	354bd2429b	feat: Country detection * feat: Country detection	2023-12-04 14:21:37 +01:00
Kroese	c1d3d15d4e	fix: DNS resolution * fix: DNS resolution	2023-12-04 07:20:40 +01:00
Kroese	95b2b83ac6	fix: DNS resolution	2023-12-03 08:33:52 +01:00
Kroese	c3c4d966b4	feat: Print available diskspace * feat: Print available diskspace	2023-12-03 08:29:09 +01:00
Kroese	a768fecfde	fix: Default RAM size * fix: Default RAM size	2023-12-01 03:55:25 +01:00
Kroese	01e41a4014	build: Annotations (#414 )	2023-11-30 14:04:47 +01:00
Kroese	eb4852683b	build: Annotations (#413 )	2023-11-30 13:53:00 +01:00
Kroese	6218333fec	feat: Console mode * feat: Console mode * fix: Increase timeout	2023-11-29 20:24:28 +01:00
Kroese	f32d8cbefc	feat: Read version from image feat: Read version from image	2023-11-29 18:13:37 +01:00
Kroese	3e985502c2	docs: Networking	2023-11-29 18:11:19 +01:00
Kroese	ad3132e8c2	docs: Networking	2023-11-29 18:09:02 +01:00
Kroese	830ace0e47	feat: Read version from image	2023-11-29 18:07:41 +01:00
Kroese	1c36893729	build: Set version	2023-11-29 18:05:47 +01:00
Kroese	a87aaab6f7	build: Docker metadata	2023-11-29 18:03:34 +01:00
Kroese	21699b8960	build: Bash build: Bash	2023-11-29 08:52:15 +01:00
Kroese	87ee25d404	build: Bash	2023-11-29 08:51:52 +01:00
Kroese	c1714f9e6b	build: External labels * build: External labels	2023-11-29 08:26:41 +01:00
Kroese	754765b766	docs: Readme docs: Readme	2023-11-28 11:51:06 +01:00
Kroese	419f0cf571	docs: Readme	2023-11-28 11:50:47 +01:00
Kroese	55d9ac521f	build: Push to mirror build: Push to mirror	2023-11-26 04:06:16 +01:00
Kroese	3406b3b471	build: Push to mirror	2023-11-26 04:05:58 +01:00
Kroese	f067ad2458	build: Concurrency build: Concurrency	2023-11-24 04:09:16 +01:00
Kroese	7eafd0a969	build: Concurrency	2023-11-24 04:08:53 +01:00
Kroese	116f30bc0a	fix: Cleanup dirs fix: Cleanup dirs	2023-11-24 01:41:19 +01:00
Kroese	04aa20e836	fix: Cleanup dirs	2023-11-24 01:37:39 +01:00
Kroese	3bf4cc861b	docs: Readme docs: Readme	2023-11-23 21:21:14 +01:00
Kroese	3c6620a3f9	docs: Readme	2023-11-23 21:20:29 +01:00
Kroese	ab0ea5a1d8	docs: Readme docs: Readme	2023-11-22 19:17:24 +01:00
Kroese	f894ad2686	docs: Readme	2023-11-22 19:16:08 +01:00
Kroese	570340d4e5	fix: Healthcheck start period fix: Healthcheck start period	2023-11-20 11:46:38 +01:00
Kroese	7dbe706282	fix: Healthcheck start period	2023-11-20 11:45:28 +01:00
Kroese	0c9559f695	fix: Variables fix: Variables	2023-11-19 20:16:10 +01:00
Kroese	3113e2b64e	fix: Variables	2023-11-19 19:56:11 +01:00
Kroese	f0ce992a27	feat: Control device nodes #382 feat: Control device nodes #382	2023-11-17 15:16:36 +01:00
databreach	6334cfc8bc	Control device nodes Add control over whether device nodes are created.	2023-11-17 14:39:53 +01:00
Kroese	451a569617	fix: Remove unused vars fix: Remove unused vars	2023-11-16 23:28:53 +01:00
Kroese	44d82d6544	fix: Remove unused vars	2023-11-16 23:28:12 +01:00
Kroese	618ec66401	fix: Remove size check fix: Remove size check	2023-11-16 23:02:31 +01:00
Kroese	d24ae86c12	fix: Remove size check	2023-11-16 23:00:21 +01:00
Kroese	32db74e50d	style: Tabs style: Tabs	2023-11-16 21:59:03 +01:00
Kroese	503c89f08c	style: Tabs	2023-11-16 21:57:43 +01:00