fix: Check SSE4.2

fix: Bash shebang
* fix: Bash shebang
2025-11-07 02:23:42 +08:00 · 2023-12-16 15:57:30 +01:00 · 2023-12-16 07:42:57 +01:00 · 2023-12-16 06:44:58 +01:00 · 2023-12-16 06:31:43 +01:00 · 2023-12-16 05:11:20 +01:00
28 changed files with 1382 additions and 995 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
@@ -12,7 +12,10 @@ on:
      - '.dockerignore'
      - '.github/**'
      - '.github/workflows/**'
-      - 'Dockerfile'
+
+concurrency:
+  group: build
+  cancel-in-progress: false

 jobs:
  shellcheck:
@@ -23,101 +26,67 @@ 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@v2
      -
        name: Checkout
-        uses: actions/checkout@v3
+        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+=("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@v2
+        uses: docker/login-action@v3
        with:
          username: ${{ secrets.DOCKERHUB_USERNAME }}
          password: ${{ secrets.DOCKERHUB_TOKEN }}
      -
        name: Login to GitHub Container Registry
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
        with:
          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: Get previous tag
-        id: previousTag
-        run: |
-          name=$(git --no-pager tag --sort=creatordate --merged ${{ github.ref_name }} | tail -1)
-          echo "previousTag: $name"
-          echo "previousTag=$name" >> $GITHUB_ENV
-      -
-        name: Generate changelog
-        id: changelog
-        uses: requarks/changelog-action@v1
+        uses: docker/build-push-action@v5
        with:
-          token: ${{ github.token }}
-          fromTag: ${{ github.ref_name }}
-          toTag: ${{ env.previousTag }}
-          writeToFile: false
-          reverseOrder: true
-          includeInvalidCommits: true
-          excludeTypes: "docs,build,chore"
+          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 }}"
-          body: |
-            ${{ steps.changelog.outputs.changes }}
-
-            **Full Changelog**: https://github.com/${{ github.repository }}/compare//${{ env.previousTag }}...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/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -7,8 +7,8 @@ jobs:
    name: shellcheck
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
      - name: Run ShellCheck
        uses: ludeeus/action-shellcheck@master
 env:
-        SHELLCHECK_OPTS: -x -e SC2001 -e SC2002 -e SC2223 -e SC2034 -e SC2064 -e SC2317 -e SC2028
+        SHELLCHECK_OPTS: -x --source-path=src -e SC2001 -e SC2002 -e SC2223 -e SC2034 -e SC2064 -e SC2317 -e SC2028 -e SC2153 -e SC2004 
--- a/.github/workflows/hub.yml
+++ b/.github/workflows/hub.yml
@@ -12,13 +12,13 @@ jobs:
  dockerHubDescription:
    runs-on: ubuntu-latest
    steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
    - 
      name: Docker Hub Description
      uses: peter-evans/dockerhub-description@v3
      with:
        username: ${{ secrets.DOCKERHUB_USERNAME }}
        password: ${{ secrets.DOCKERHUB_TOKEN }}
-        repository: ${{ github.repository }}
+        repository: ${{ secrets.DOCKERHUB_REPO }}
        short-description: ${{ github.event.repository.description }}
        readme-filepath: ./readme.md
--- a/42
+++ b/42
@@ -1,4 +1,4 @@
-FROM ghcr.io/qemu-tools/qemu-host as builder
+FROM qemux/qemu-host as builder

 #  FROM golang as builder
 #  WORKDIR /
@@ -7,13 +7,17 @@ FROM ghcr.io/qemu-tools/qemu-host as builder
 #  RUN go mod download
 #  RUN CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o /qemu-host.bin .

-FROM debian:bookworm-slim
+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 \
+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 \
@@ -21,23 +25,21 @@ RUN apt-get update && apt-get -y upgrade && \
        unzip \
        socat \
        procps \
-	dnsmasq \
        xz-utils \
        iptables \
        iproute2 \
+        dnsmasq \
        net-tools \
-	btrfs-progs \
-	netcat-openbsd \
+        qemu-utils \
        ca-certificates \
+        netcat-openbsd \
        qemu-system-x86 \
+        "$extra" \
    && apt-get clean \
    && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*

-COPY run/*.sh /run/
-COPY agent/*.sh /agent/
-
+COPY ./src /run/
 COPY --from=builder /qemu-host.bin /run/host.bin
-
 RUN chmod +x /run/*.sh && chmod +x /run/*.bin

 VOLUME /storage
@@ -48,21 +50,13 @@ 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.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/kroese/virtual-dsm/
-LABEL org.opencontainers.image.url=https://hub.docker.com/r/kroese/virtual-dsm/
+HEALTHCHECK --interval=60s --start-period=45s --retries=2 CMD /run/check.sh

-HEALTHCHECK --interval=60s --retries=2 CMD /run/check.sh
-
-ENTRYPOINT ["/run/run.sh"]
+ENTRYPOINT ["/usr/bin/tini", "-s", "/run/entry.sh"]
--- a/agent/agent.sh
+++ b/agent/agent.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 set -u

-VERSION="7"
+VERSION="9"
 HEADER="VirtualDSM Agent"

 # Functions
@@ -38,15 +38,19 @@ function downloadUpdate {

  # Auto update the agent

-  URL="https://raw.githubusercontent.com/kroese/virtual-dsm/master/agent/agent.sh"
+  URL="https://raw.githubusercontent.com/vdsm/virtual-dsm/master/agent/agent.sh"
  
  remote_size=$(curl -sIk -m 4 "${URL}" | grep -i "content-length:" | tr -d " \t" | cut -d ':' -f 2)
  remote_size=${remote_size//$'\r'}

  [[ "$remote_size" == "" || "$remote_size" == "0" ]] && return

+  remote_size=$(($remote_size+0))
+  ((remote_size<100)) && return
+
  SCRIPT=$(readlink -f "${BASH_SOURCE[0]}")
  local_size=$(stat -c%s "$SCRIPT")
+  local_size=$(($local_size+0))

  [[ remote_size -eq local_size ]] && return

@@ -100,6 +104,8 @@ function installPackages {
 trap finish SIGINT SIGTERM

 ts=$(date +%s%N)
+
+echo ""
 echo "❯ Started $HEADER v$VERSION..."

 checkNMI
@@ -124,31 +130,6 @@ else

 fi

-delay=500
-elapsed=$((($(date +%s%N) - ts)/1000000))
-
-if [[ delay -gt elapsed ]]; then
-  difference=$((delay-elapsed))
-  float=$(echo | awk -v diff="${difference}" '{print diff * 0.001}')
-  sleep "$float"
-fi
-
-# Display message in docker log output
-
-IP=$(ip address show dev eth0 | grep inet | awk '/inet / { print $2 }' | cut -f1 -d/)
-
-if [[ "$IP" == "20.20"* ]]; then
-  MSG="port 5000"
-else
-  MSG="http://${IP}:5000"
-fi
-
-echo ""
-info "--------------------------------------------------------"
-info " You can now login to DSM at ${MSG}"
-info "--------------------------------------------------------"
-echo ""
-
 # Wait for NMI interrupt as a shutdown signal

 while true; do
--- a/agent/service.sh
+++ b/agent/service.sh
@@ -28,7 +28,7 @@ start() {

  if [ ! -f "$SCRIPT" ]; then

-    URL="https://raw.githubusercontent.com/kroese/virtual-dsm/master/agent/agent.sh"
+    URL="https://raw.githubusercontent.com/vdsm/virtual-dsm/master/agent/agent.sh"

    if ! curl -sfk -m 10 -o "${SCRIPT}" "${URL}"; then
      error 'Failed to download agent script.' > /dev/ttyS0
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,13 +2,14 @@ version: "3"
 services:
    dsm:
        container_name: dsm
-        image: kroese/virtual-dsm:latest
+        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'
@@ -19,4 +20,4 @@ services:
        volumes:
            - /opt/dsm:/storage
        restart: on-failure
-        stop_grace_period: 1m
+        stop_grace_period: 2m
--- a/readme.md
+++ b/readme.md
@@ -1,6 +1,6 @@
 <h1 align="center">Virtual DSM for Docker<br />
 <div align="center">
-<img src="https://github.com/kroese/virtual-dsm/raw/master/.github/screen.jpg" title="Screenshot" style="max-width:100%;" width="432" />
+<img src="https://github.com/vdsm/virtual-dsm/raw/master/.github/screen.jpg" title="Screenshot" style="max-width:100%;" width="432" />
 </div>
 <div align="center">

@@ -10,13 +10,14 @@
 [![Pulls]][hub_url]

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

 ## Features

- - Multi-platform
+ - Multiple disks
 - KVM acceleration
- - Graceful shutdown
+ - GPU passthrough
 - Upgrades supported
 
 ## Usage
@@ -28,12 +29,11 @@ version: "3"
 services:
  dsm:
    container_name: dsm
-        image: kroese/virtual-dsm:latest
+    image: vdsm/virtual-dsm:latest
    environment:
      DISK_SIZE: "16G"
    devices:
      - /dev/kvm
-            - /dev/vhost-net
    cap_add:
      - NET_ADMIN
    ports:
@@ -41,13 +41,13 @@ services:
    volumes:
      - /opt/dsm:/storage
    restart: on-failure
-        stop_grace_period: 1m
+    stop_grace_period: 2m
 ```

 Via `docker run`

 ```bash
-docker run -it --rm -p 5000:5000 --device=/dev/kvm --cap-add NET_ADMIN --stop-timeout 60 kroese/virtual-dsm:latest
+docker run -it --rm -p 5000:5000 --device=/dev/kvm --cap-add NET_ADMIN --stop-timeout 60 vdsm/virtual-dsm:latest
 ```

 ## FAQ
@@ -58,10 +58,10 @@ 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 data loss. 
+    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?

@@ -74,25 +74,38 @@ docker run -it --rm -p 5000:5000 --device=/dev/kvm --cap-add NET_ADMIN --stop-ti

    Replace the example path `/home/user/data` with the desired storage folder.

-  * ### How do I change the space reserved by the virtual disk? 
+  * ### How do I add multiple disks?

-    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:
+    To create additional disks, modify your compose file like this:
    
    ```yaml
    environment:
-        ALLOCATE: "N"
+      DISK2_SIZE: "32G"
+      DISK3_SIZE: "64G"
+    volumes:
+      - /home/example:/storage2
+      - /mnt/data/example:/storage3
    ```

-    Keep in mind that this will not affect any of your existing disks, it only applies to newly created disks.
+  * ### 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 variable:
+
+    ```yaml
+    environment:
+      DISK_FMT: "qcow2"
+    ```
+
+    This can also be used to convert any existing disks to the ```qcow2``` format.

  * ### 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?
@@ -159,36 +172,49 @@ docker run -it --rm -p 5000:5000 --device=/dev/kvm --cap-add NET_ADMIN --stop-ti

    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.

+  * ### 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?

-    By default, version 7.2 will be installed, but if you prefer an older version, you can add its URL to your compose file as follows:
+    By default, version 7.2.1 will be installed, but if you prefer an older version, you can add its download URL to your compose file as follows:

    ```yaml
    environment:
      URL: "https://global.synologydownload.com/download/DSM/release/7.0.1/42218/DSM_VirtualDSM_42218.pat"
    ```

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

  * ### What are the differences compared to the standard DSM?

-    There are only two minor differences: the Virtual Machine Manager package is not provided, and Surveillance Station doesn't include any free licenses.
+    There are only two minor differences: the Virtual Machine Manager package is not available, and Surveillance Station will not include any free licenses.
    
  * ### Is this project legal?

    Yes, this project contains only open-source code and does not distribute any copyrighted material. Neither does it try to circumvent any copyright protection measures. So under all applicable laws, this project would be considered legal. 
    
-    However, by installing Synology's Virtual DSM, you must accept their end-user license agreement, which does not permit installation on non-Synology hardware. So only run this project on an official Synology NAS via the Container Manager package, as any other use will be a violation of their terms and conditions.
+    However, by installing Synology's Virtual DSM, you must accept their end-user license agreement, which does not permit installation on non-Synology hardware. So only run this project on an official Synology NAS, as any other use will be a violation of their terms and conditions.

 ## Disclaimer

 Only run this container on Synology hardware, any other use is not permitted by their EULA. The product names, logos, brands, and other trademarks referred to within this project are the property of their respective trademark holders. This project is not affiliated, sponsored, or endorsed by Synology, Inc.

-[build_url]: https://github.com/kroese/virtual-dsm/
-[hub_url]: https://hub.docker.com/r/kroese/virtual-dsm
-[tag_url]: https://hub.docker.com/r/kroese/virtual-dsm/tags
+[build_url]: https://github.com/vdsm/virtual-dsm/
+[hub_url]: https://hub.docker.com/r/vdsm/virtual-dsm
+[tag_url]: https://hub.docker.com/r/vdsm/virtual-dsm/tags

-[Build]: https://github.com/kroese/virtual-dsm/actions/workflows/build.yml/badge.svg
-[Size]: https://img.shields.io/docker/image-size/kroese/virtual-dsm/latest?color=066da5&label=size
+[Build]: https://github.com/vdsm/virtual-dsm/actions/workflows/build.yml/badge.svg
+[Size]: https://img.shields.io/docker/image-size/vdsm/virtual-dsm/latest?color=066da5&label=size
 [Pulls]: https://img.shields.io/docker/pulls/kroese/virtual-dsm.svg?style=flat&label=pulls&logo=docker
-[Version]: https://img.shields.io/docker/v/kroese/virtual-dsm?arch=amd64&sort=date&color=066da5
+[Version]: https://img.shields.io/docker/v/vdsm/virtual-dsm/latest?arch=amd64&sort=semver&color=066da5
--- a/run/check.sh
+++ b/run/check.sh
@@ -1,49 +0,0 @@
-#!/usr/bin/env bash
-set -u
-
-[ ! -f "/run/qemu.pid" ] && echo "QEMU not running yet.." && exit 0
-
-# 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)
-
-if [[ ! "${RESPONSE}" =~ "\"success\"" ]] ; then
-  echo "Failed to connect to guest: $RESPONSE" && exit 1
-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
-
-if ! curl -m 3 -ILfSs "http://${IP}:${PORT}/" > /dev/null; then
-  echo "Failed to reach ${IP}:${PORT}"
-  exit 1
-fi
-
-if [[ "$IP" == "20.20"* ]]; then
-  echo "Healthcheck OK"
-else
-  echo "Healthcheck OK ( $IP )"
-fi
-
-exit 0
--- a/run/disk.sh
+++ b/run/disk.sh
@@ -1,155 +0,0 @@
-#!/usr/bin/env bash
-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
-
-BOOT="$STORAGE/$BASE.boot.img"
-SYSTEM="$STORAGE/$BASE.system.img"
-
-[ ! -f "$BOOT" ] && error "Virtual DSM boot-image does not exist ($BOOT)" && exit 81
-[ ! -f "$SYSTEM" ] && error "Virtual DSM system-image does not exist ($SYSTEM)" && exit 82
-
-DATA="${STORAGE}/data.img"
-
-if [[ ! -f "${DATA}" ]] && [[ -f "$STORAGE/data$DISK_SIZE.img" ]]; then
-  # Fallback for legacy installs
-  DATA="$STORAGE/data$DISK_SIZE.img"
-fi
-
-DISK_SIZE=$(echo "${DISK_SIZE}" | sed 's/MB/M/g;s/GB/G/g;s/TB/T/g')
-DATA_SIZE=$(numfmt --from=iec "${DISK_SIZE}")
-
-if (( DATA_SIZE < 6442450944 )); then
-  error "Please increase DISK_SIZE to at least 6 GB." && exit 83
-fi
-
-if [ -f "${DATA}" ]; then
-
-  OLD_SIZE=$(stat -c%s "${DATA}")
-
-  if [ "$DATA_SIZE" -gt "$OLD_SIZE" ]; then
-
-    info "Resizing data disk from $OLD_SIZE to $DATA_SIZE bytes.."
-
-    if [[ "${ALLOCATE}" == [Nn]* ]]; then
-
-      # Resize file by changing its length
-      if ! truncate -s "${DATA_SIZE}" "${DATA}"; then
-        error "Could not resize the file for the virtual disk." && exit 85
-      fi
-
-    else
-
-      REQ=$((DATA_SIZE-OLD_SIZE))
-
-      # Check free diskspace
-      SPACE=$(df --output=avail -B 1 "${STORAGE}" | tail -n 1)
-
-      if (( REQ > SPACE )); then
-        error "Not enough free space to resize virtual disk to ${DISK_SIZE}."
-        error "Specify a smaller size or disable preallocation with ALLOCATE=N." && exit 84
-      fi
-
-      # Resize file by allocating more space
-      if ! fallocate -l "${DATA_SIZE}" "${DATA}"; then
-        if ! truncate -s "${DATA_SIZE}" "${DATA}"; then
-          error "Could not resize the file for the virtual disk." && exit 85
-        fi
-      fi
-
-      if [[ "${ALLOCATE}" == [Zz]* ]]; then
-
-        GB=$(( (REQ + 1073741823)/1073741824 ))
-
-        info "Preallocating ${GB} GB of diskspace, please wait..."
-        dd if=/dev/urandom of="${DATA}" seek="${OLD_SIZE}" count="${REQ}" bs=1M iflag=count_bytes oflag=seek_bytes status=none
-
-      fi
-    fi
-  fi
-
-  if [ "$DATA_SIZE" -lt "$OLD_SIZE" ]; then
-
-    info "Shrinking existing disks is not supported yet!"
-    info "Creating backup of old drive in storage folder..."
-
-    mv -f "${DATA}" "${DATA}.bak"
-
-  fi
-fi
-
-if [ ! -f "${DATA}" ]; then
-
-  if [[ "${ALLOCATE}" == [Nn]* ]]; then
-
-    # Create an empty file
-    if ! truncate -s "${DATA_SIZE}" "${DATA}"; then
-      rm -f "${DATA}"
-      error "Could not create a file for the virtual disk." && exit 87
-    fi
-
-  else
-
-    # Check free diskspace
-    SPACE=$(df --output=avail -B 1 "${STORAGE}" | tail -n 1)
-
-    if (( DATA_SIZE > SPACE )); then
-      error "Not enough free space to create a virtual disk of ${DISK_SIZE}."
-      error "Specify a smaller size or disable preallocation with ALLOCATE=N." && exit 86
-    fi
-
-    # Create an empty file
-    if ! fallocate -l "${DATA_SIZE}" "${DATA}"; then
-      if ! truncate -s "${DATA_SIZE}" "${DATA}"; then
-        rm -f "${DATA}"
-        error "Could not create a file for the virtual disk." && exit 87
-      fi
-    fi
-
-    if [[ "${ALLOCATE}" == [Zz]* ]]; then
-
-      info "Preallocating ${DISK_SIZE} of diskspace, please wait..."
-      dd if=/dev/urandom of="${DATA}" count="${DATA_SIZE}" bs=1M iflag=count_bytes status=none
-
-    fi
-  fi
-
-  # Check if file exists
-  if [ ! -f "${DATA}" ]; then
-    error "Virtual disk does not exist ($DATA)" && exit 88
-  fi
-
-  # Format as BTRFS filesystem
-  mkfs.btrfs -q -L data -d single -m dup "${DATA}" > /dev/null
-
-fi
-
-# Check the filesize
-SIZE=$(stat -c%s "${DATA}")
-
-if [[ SIZE -ne DATA_SIZE ]]; then
-  error "Virtual disk has the wrong size: ${SIZE}" && exit 89
-fi
-
-AGENT="${STORAGE}/${BASE}.agent"
-[ -f "$AGENT" ] && AGENT_VERSION=$(cat "${AGENT}") || AGENT_VERSION=1
-
-if ((AGENT_VERSION < 5)); then
-  info "The installed VirtualDSM Agent v${AGENT_VERSION} is an outdated version, please upgrade it."
-fi
-
-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 \
-    -device virtio-scsi-pci,id=hw-userdata,bus=pcie.0,addr=0xc \
-    -drive file=${DATA},if=none,id=drive-userdata,format=raw,cache=${DISK_CACHE},aio=${DISK_IO},discard=${DISK_DISCARD},detect-zeroes=on \
-    -device scsi-hd,bus=hw-userdata.0,channel=0,scsi-id=0,lun=0,drive=drive-userdata,id=userdata0,rotation_rate=${DISK_ROTATION},bootindex=3"
--- a/run/install.sh
+++ b/run/install.sh
@@ -1,262 +0,0 @@
-#!/usr/bin/env bash
-set -Eeuo pipefail
-
-# Display wait message
-/run/server.sh 5000 install &
-
-# Download the required files from the Synology website
-DL="https://global.synologydownload.com/download/DSM"
-
-if [ -z "$URL" ]; then
-
-  if [ "$ARCH" == "amd64" ]; then
-    URL="$DL/release/7.2/64570-1/DSM_VirtualDSM_64570.pat"
-  else
-    URL="$DL/release/7.0.1/42218/DSM_VirtualDSM_42218.pat"
-  fi
-
-fi
-
-# Check if output is to interactive TTY
-if [ -t 1 ]; then
-  PROGRESS="--progress=bar:noscroll"
-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
-
-TMP="$STORAGE/tmp"
-RDC="$STORAGE/dsm.rd"
-
-rm -rf "$TMP" && mkdir -p "$TMP"
-
-[[ "${DEBUG}" == [Yy1]* ]] && set -x
-
-if [ ! -f "${RDC}" ]; then
-
-  info "Install: Downloading installer..."
-
-  RD="$TMP/rd.gz"
-  POS="65627648-71021835"
-  VERIFY="b4215a4b213ff5154db0488f92c87864"
-  LOC="$DL/release/7.0.1/42218/DSM_VirtualDSM_42218.pat"
-
-  { curl -r "$POS" -sfk -o "$RD" "$LOC"; rc=$?; } || :
-  (( rc != 0 )) && error "Failed to download $LOC, reason: $rc" && exit 60
-
-  SUM=$(md5sum "$RD" | cut -f 1 -d " ")
-
-  if [ "$SUM" != "$VERIFY" ]; then
-
-    PAT="/install.pat"
-    rm "$RD"
-    rm -f "$PAT"
-
-    { 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}")"
-    rm "$PAT"
-
-  fi
-
-  cp "$RD" "$RDC"
-
-fi
-
-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
-
-  mkdir -p /run/extract
-  for file in $TMP/usr/lib/libcurl.so.4 \
-              $TMP/usr/lib/libmbedcrypto.so.5 \
-              $TMP/usr/lib/libmbedtls.so.13 \
-              $TMP/usr/lib/libmbedx509.so.1 \
-              $TMP/usr/lib/libmsgpackc.so.2 \
-              $TMP/usr/lib/libsodium.so \
-              $TMP/usr/lib/libsynocodesign-ng-virtual-junior-wins.so.7 \
-              $TMP/usr/syno/bin/scemd; do
-    cp "$file" /run/extract/
-  done
-
-  if [ "$ARCH" != "amd64" ]; then
-    mkdir -p /lib64/
-    cp "$TMP/usr/lib/libc.so.6" /lib64/
-    cp "$TMP/usr/lib/libpthread.so.0" /lib64/
-    cp "$TMP/usr/lib/ld-linux-x86-64.so.2" /lib64/
-  fi  
-
-  mv /run/extract/scemd /run/extract/syno_extract_system_patch
-  chmod +x /run/extract/syno_extract_system_patch
-
-fi
-
-rm -rf "$TMP" && mkdir -p "$TMP"
-
-info "Install: Downloading $(basename "$URL")..."
-
-PAT="/$BASE.pat"
-rm -f "$PAT"
-
-{ wget "$URL" -O "$PAT" -q --no-check-certificate --show-progress "$PROGRESS"; rc=$?; } || :
-
-(( 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")
-
-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
-
-  tar xpf "$PAT" -C "$TMP/."
-
-else
-
-  if [ "$ARCH" != "amd64" ]; then
-
-    export DEBCONF_NOWARNINGS="yes"
-    export DEBIAN_FRONTEND="noninteractive"
-
-    apt-get -qq update
-    apt-get -qq -y upgrade
-    apt-get -qq --no-install-recommends -y install qemu-user > /dev/null
-
-    export DEBIAN_FRONTEND=""
-    export DEBCONF_NOWARNINGS=""
-
-  fi
-
-  export LD_LIBRARY_PATH="/run/extract"
-
-  if [ "$ARCH" == "amd64" ]; then
-    { /run/extract/syno_extract_system_patch "$PAT" "$TMP/."; rc=$?; } || :
-  else
-    { qemu-x86_64 /run/extract/syno_extract_system_patch "$PAT" "$TMP/."; rc=$?; } || :
-  fi
-
-  export LD_LIBRARY_PATH=""
-
-  (( rc != 0 )) && error "Failed to extract PAT file, reason $rc" && exit 63
-
-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
-
-BOOT=$(find "$TMP" -name "*.bin.zip")
-[ ! -f "$BOOT" ] && error "The PAT file contains no boot image." && exit 67
-
-BOOT=$(echo "$BOOT" | head -c -5)
-unzip -q -o "$BOOT".zip -d "$TMP"
-
-[[ "${ALLOCATE}" == [Zz]* ]] && info "Install: Allocating diskspace..."
-
-SYSTEM="$TMP/sys.img"
-SYSTEM_SIZE=4954537983
-
-# 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
-
-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
-  fi
-fi
-
-if [[ "${ALLOCATE}" == [Zz]* ]]; then
-  info "Install: Preallocating 4 GB of diskspace..."
-  dd if=/dev/urandom of="${SYSTEM}" count="${SYSTEM_SIZE}" bs=1M iflag=count_bytes status=none
-fi
-
-# Check if file exists
-[ ! -f "${SYSTEM}" ] && error "System disk does not exist ($SYSTEM)" && exit 89
-
-# 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
-
-PART="$TMP/partition.fdisk"
-
-{	echo "label: dos"
-	echo "label-id: 0x6f9ee2e9"
-	echo "device: ${SYSTEM}"
-	echo "unit: sectors"
-	echo "sector-size: 512"
-	echo ""
-	echo "${SYSTEM}1 : start=        2048, size=     4980480, type=83"
-	echo "${SYSTEM}2 : start=     4982528, size=     4194304, type=82"
-} > "$PART"
-
-sfdisk -q "$SYSTEM" < "$PART"
-
-info "Install: Extracting system partition..."
-
-MOUNT="$TMP/system"
-rm -rf "$MOUNT" && mkdir -p "$MOUNT"
-
-mv "$HDA.tgz" "$HDA.txz"
-tar xpfJ "$HDA.txz" --absolute-names -C "$MOUNT/"
-
-[ -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/"
-
-# Install Agent
-
-LOC="$MOUNT/usr/local/bin"
-mkdir -p "$LOC"
-cp /agent/agent.sh "$LOC/agent.sh"
-chmod 755 "$LOC/agent.sh"
-
-LOC="$MOUNT/usr/local/etc/rc.d"
-mkdir -p "$LOC"
-cp /agent/service.sh "$LOC/agent.sh"
-chmod 755 "$LOC/agent.sh"
-
-# Store agent version
-echo "7" > "$STORAGE"/"$BASE".agent
-
-info "Install: Installing system partition..."
-
-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"
-
-rm -rf "$MOUNT"
-
-echo "$BASE" > "$STORAGE"/dsm.ver
-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
-
-return 0
--- a/run/power.sh
+++ b/run/power.sh
@@ -1,91 +0,0 @@
-#!/usr/bin/env bash
-set -Eeuo pipefail
-
-# Configure QEMU for graceful shutdown
-
-QEMU_MONPORT=7100
-QEMU_POWERDOWN_TIMEOUT=50
-
-_QEMU_PID=/run/qemu.pid
-_QEMU_SHUTDOWN_COUNTER=/run/qemu.counter
-
-rm -f "${_QEMU_PID}"
-rm -f "${_QEMU_SHUTDOWN_COUNTER}"
-
-_trap(){
-    func="$1" ; shift
-    for sig ; do
-        trap "$func $sig" "$sig"
-    done
-}
-
-_graceful_shutdown() {
-
-  set +e
-
-  [ ! -f "${_QEMU_PID}" ] && return
-  [ -f "${_QEMU_SHUTDOWN_COUNTER}" ] && return
-
-  echo && info "Received $1 signal, shutting down..."
-  echo 0 > "${_QEMU_SHUTDOWN_COUNTER}"
-
-  # Don't send the powerdown signal because vDSM ignores ACPI signals
-  # echo 'system_powerdown' | nc -q 1 -w 1 localhost "${QEMU_MONPORT}" > /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)
-
-  if [[ ! "${RESPONSE}" =~ "\"success\"" ]] ; then
-
-    echo && error "Could not send shutdown command to the guest ($RESPONSE)"
-
-    # If we cannot shutdown the usual way, fallback to the NMI method
-
-    AGENT="${STORAGE}/${BASE}.agent"
-    [ -f "$AGENT" ] && AGENT_VERSION=$(cat "${AGENT}") || AGENT_VERSION=1
-
-    if ((AGENT_VERSION > 1)); then
-
-      # Send a NMI interrupt which will be detected by the kernel
-      if ! echo 'nmi' | nc -q 1 -w 1 localhost "${QEMU_MONPORT}" > /dev/null ; then
-        AGENT_VERSION=0
-      fi
-
-    fi
-
-    if ((AGENT_VERSION < 2)); then
-
-      echo && info "Please update the VirtualDSM Agent to allow for gracefull shutdowns..."
-
-      kill -15 "$(cat "${_QEMU_PID}")"
-      pkill -f qemu-system-x86_64 || true
-
-    fi
-  fi
-
-  while [ "$(cat ${_QEMU_SHUTDOWN_COUNTER})" -lt "${QEMU_POWERDOWN_TIMEOUT}" ]; do
-
-    # Increase the counter
-    echo $(($(cat ${_QEMU_SHUTDOWN_COUNTER})+1)) > ${_QEMU_SHUTDOWN_COUNTER}
-
-    # Try to connect to qemu
-    if echo 'info version'| nc -q 1 -w 1 localhost "${QEMU_MONPORT}" >/dev/null 2>&1 ; then
-
-      sleep 1
-      #info "Shutting down, waiting... ($(cat ${_QEMU_SHUTDOWN_COUNTER})/${QEMU_POWERDOWN_TIMEOUT})"
-
-    fi
-
-  done
-
-  echo && echo "❯ Quitting..."
-  echo 'quit' | nc -q 1 -w 1 localhost "${QEMU_MONPORT}" >/dev/null 2>&1 || true
-
-  closeNetwork
-
-  return
-}
-
-_trap _graceful_shutdown SIGTERM SIGHUP SIGINT SIGABRT SIGQUIT
-
-MON_OPTS="-monitor telnet:localhost:${QEMU_MONPORT},server,nowait,nodelay"
--- a/run/run.sh
+++ b/run/run.sh
@@ -1,100 +0,0 @@
-#!/usr/bin/env bash
-set -Eeuo pipefail
-
-# Docker environment variables
-
-: ${URL:=''}            # URL of the PAT file
-: ${DEBUG:='N'}         # Enable debug mode
-: ${ALLOCATE:='Y'}      # Preallocate diskspace
-: ${CPU_CORES:='1'}     # Amount of CPU cores
-: ${DISK_SIZE:='16G'}   # Initial data disk size
-: ${RAM_SIZE:='512M'}   # Maximum RAM amount
-
-echo "❯ Starting Virtual DSM for Docker v${VERSION}..."
-
-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
-
-[ ! -f "/run/run.sh" ] && error "Script must run inside Docker container!" && exit 11
-[ "$(id -u)" -ne "0" ] && error "Script must be executed with root privileges." && exit 12
-
-STORAGE="/storage"
-KERNEL=$(uname -r | cut -b 1)
-MINOR=$(uname -r | cut -d '.' -f2)
-ARCH=$(dpkg --print-architecture)
-VERS=$(qemu-system-x86_64 --version | head -n 1 | cut -d '(' -f 1)
-
-[ ! -d "$STORAGE" ] && error "Storage folder (${STORAGE}) not found!" && exit 13
-
-if [ -f "$STORAGE"/dsm.ver ]; then
-  BASE=$(cat "${STORAGE}/dsm.ver")
-else
-  # Fallback for old installs
-  BASE="DSM_VirtualDSM_42962"
-fi
-
-[ -n "$URL" ] && BASE=$(basename "$URL" .pat)
-
-if [[ ! -f "$STORAGE/$BASE.boot.img" ]] || [[ ! -f "$STORAGE/$BASE.system.img" ]]; then
-  . /run/install.sh
-fi
-
-# Initialize disks
-. /run/disk.sh
-
-# Initialize network
-. /run/network.sh
-
-# Initialize serialport
-. /run/serial.sh
-
-# Configure shutdown
-. /run/power.sh
-
-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"
-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"
-
-ARGS="${DEF_OPTS} ${CPU_OPTS} ${RAM_OPTS} ${MAC_OPTS} ${MON_OPTS} ${SERIAL_OPTS} ${NET_OPTS} ${DISK_OPTS} ${EXTRA_OPTS}"
-ARGS=$(echo "$ARGS" | sed 's/\t/ /g' | tr -s ' ')
-
-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 (( KERNEL > 5 )) || ( (( KERNEL == 5 )) && (( MINOR > 10 )) ); then
-  pidwait -F "${_QEMU_PID}" & wait $!
-else
-  tail --pid "$(cat "${_QEMU_PID}")" --follow /dev/null & wait $!
-fi
--- a/run/serial.sh
+++ b/run/serial.sh
@@ -1,59 +0,0 @@
-#!/bin/bash
-set -Eeuo pipefail
-
-# Docker environment variables
-
-: ${HOST_CPU:=''}
-: ${HOST_MAC:=''}
-: ${HOST_BUILD:=''}
-: ${HOST_DEBUG:=''}
-: ${HOST_SERIAL:=''}
-: ${GUEST_SERIAL:=''}
-: ${HOST_MODEL:=''}
-: ${HOST_VERSION:=''}
-: ${HOST_TIMESTAMP:=''}
-
-if [ -z "$HOST_CPU" ]; then
-  HOST_CPU=$(lscpu | grep 'Model name' | cut -f 2 -d ":" | awk '{$1=$1}1' | sed 's# @.*##g' | sed s/"(R)"//g | sed 's/[^[:alnum:] ]\+/ /g' | sed 's/  */ /g')
-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}")
-
-[ -n "$HOST_MAC" ] && HOST_ARGS+=("-mac=${HOST_MAC}")
-[ -n "$HOST_BUILD" ] && HOST_ARGS+=("-build=${HOST_BUILD}")
-[ -n "$HOST_MODEL" ] && HOST_ARGS+=("-model=${HOST_MODEL}")
-[ -n "$HOST_SERIAL" ] && HOST_ARGS+=("-hostsn=${HOST_SERIAL}")
-[ -n "$GUEST_SERIAL" ] && HOST_ARGS+=("-guestsn=${GUEST_SERIAL}")
-[ -n "$HOST_VERSION" ] && HOST_ARGS+=("-version=${HOST_VERSION}")
-[ -n "$HOST_TIMESTAMP" ] && HOST_ARGS+=("-ts=${HOST_TIMESTAMP}")
-
-if [[ "${HOST_DEBUG}" == [Yy1]* ]]; then
-  set -x
-  ./run/host.bin "${HOST_ARGS[@]}" &
-  { set +x; } 2>/dev/null
-  echo
-else
-  ./run/host.bin "${HOST_ARGS[@]}" 2> /dev/null &
-fi
-
-# Configure serial ports
-
-SERIAL_OPTS="\
-	-serial mon:stdio \
-	-device virtio-serial-pci,id=virtio-serial0,bus=pcie.0,addr=0x3 \
-	-chardev pty,id=charserial0 \
-	-device isa-serial,chardev=charserial0,id=serial0 \
-	-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/check.sh
+++ b/src/check.sh
@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+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
+
+file="/run/dsm.url"
+[ ! -f  "$file" ] && echo "DSM has not enabled networking yet.." && exit 1
+
+location=$(cat "$file")
+
+if ! curl -m 20 -ILfSs "http://$location/" > /dev/null; then
+  echo "Failed to reach page at http://$location" && exit 1
+fi
+
+echo "Healthcheck OK"
+exit 0
--- a/src/config.sh
+++ b/src/config.sh
@@ -0,0 +1,20 @@
+#!/usr/bin/env bash
+set -Eeuo pipefail
+
+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="-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
+  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"
+fi
+
+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,61 @@
+#!/usr/bin/env bash
+set -Eeuo pipefail
+
+# Docker environment variables
+
+: ${HOST_CPU:=''}
+: ${CPU_MODEL:='host'}
+: ${CPU_FEATURES:='+ssse3,+sse4.1,+sse4.2'}
+
+KVM_ERR=""
+KVM_OPTS=""
+
+if [[ "$ARCH" == "amd64" && "$KVM" != [Nn]* ]]; then
+
+  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
+    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 skip this error by setting KVM=N (not recommended)."
+    [[ "$DEBUG" != [Yy1]* ]] && exit 88
+    [[ "$CPU_MODEL" == "host"* ]] && CPU_MODEL="max,$CPU_FEATURES"
+  else
+    KVM_OPTS=",accel=kvm -enable-kvm"
+  fi
+
+  if [ -n "$KVM_OPTS" ]; then
+    if ! grep -qE '^flags.* (sse4_2)' /proc/cpuinfo; then
+      error "Your host CPU does not has 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
+  fi
+
+else
+
+  [[ "$CPU_MODEL" == "host"* ]] && CPU_MODEL="max,$CPU_FEATURES"
+
+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
@@ -0,0 +1,360 @@
+#!/usr/bin/env bash
+set -Eeuo pipefail
+
+# Docker environment variables
+
+: ${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
+
+BOOT="$STORAGE/$BASE.boot.img"
+SYSTEM="$STORAGE/$BASE.system.img"
+
+[ ! -f "$BOOT" ] && error "Virtual DSM boot-image does not exist ($BOOT)" && exit 81
+[ ! -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"
+
+fmt2ext() {
+  local DISK_FMT=$1
+
+  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
+}
+
+resizeDisk() {
+  local DISK_FILE=$1
+  local CUR_SIZE=$2
+  local DATA_SIZE=$3
+  local DISK_SPACE=$4
+  local DISK_DESC=$5
+  local DISK_FMT=$6
+  local GB REQ FAIL SPACE SPACE_GB
+
+  GB=$(( (CUR_SIZE + 1073741823)/1073741824 ))
+  info "Resizing $DISK_DESC from ${GB}G to $DISK_SPACE .."
+  FAIL="Could not resize $DISK_FMT file of $DISK_DESC ($DISK_FILE) from ${GB}G to $DISK_SPACE .."
+
+  REQ=$((DATA_SIZE-CUR_SIZE))
+  (( REQ < 1 )) && error "Shrinking disks is not supported!" && exit 71
+
+  case "${DISK_FMT,,}" in
+    raw)
+      if [[ "$ALLOCATE" == [Nn]* ]]; then
+
+        # Resize file by changing its length
+        if ! truncate -s "$DISK_SPACE" "$DISK_FILE"; then
+          error "$FAIL" && exit 75
+        fi
+
+      else
+
+        # Check free diskspace
+        SPACE=$(df --output=avail -B 1 "$DIR" | tail -n 1)
+        SPACE_GB=$(( (SPACE + 1073741823)/1073741824 ))
+
+        if (( REQ > SPACE )); then
+          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 DISK_FMT to \"qcow2\"." && exit 74
+        fi
+
+        # Resize file by allocating more space
+        if ! fallocate -l "$DISK_SPACE" "$DISK_FILE"; then
+          if ! truncate -s "$DISK_SPACE" "$DISK_FILE"; then
+            error "$FAIL" && exit 75
+          fi
+        fi
+
+      fi
+      ;;
+    qcow2)
+      if ! qemu-img resize -f "$DISK_FMT" "$DISK_FILE" "$DISK_SPACE" ; then
+        error "$FAIL" && exit 72
+      fi
+      ;;
+  esac
+}
+
+convertDisk() {
+  local CONV_FLAGS="-p"
+  local SOURCE_FILE=$1
+  local SOURCE_FMT=$2
+  local DST_FILE=$3
+  local DST_FMT=$4
+
+  case "$DST_FMT" in
+    qcow2)
+      CONV_FLAGS="$CONV_FLAGS -c"
+      ;;
+  esac
+
+  # shellcheck disable=SC2086
+  qemu-img convert $CONV_FLAGS -f "$SOURCE_FMT" -O "$DST_FMT" -- "$SOURCE_FILE" "$DST_FILE"
+}
+
+createDisk() {
+  local DISK_FILE=$1
+  local DISK_SPACE=$2
+  local DISK_DESC=$3
+  local DISK_FMT=$4
+  local GB FAIL SPACE SPACE_GB
+
+  FAIL="Could not create a $DISK_SPACE $DISK_FMT file for $DISK_DESC ($DISK_FILE)"
+
+  case "${DISK_FMT,,}" in
+    raw)
+      if [[ "$ALLOCATE" == [Nn]* ]]; then
+
+        # Create an empty file
+        if ! truncate -s "$DISK_SPACE" "$DISK_FILE"; then
+          rm -f "$DISK_FILE"
+          error "$FAIL" && exit 77
+        fi
+
+      else
+
+        # Check free diskspace
+        SPACE=$(df --output=avail -B 1 "$DIR" | tail -n 1)
+        SPACE_GB=$(( (SPACE + 1073741823)/1073741824 ))
+
+        if (( DATA_SIZE > SPACE )); then
+          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 DISK_FMT to \"qcow2\"." && exit 76
+        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 "$FAIL" && exit 77
+          fi
+        fi
+
+      fi
+      ;;
+    qcow2)
+      if ! qemu-img create -f "$DISK_FMT" -- "$DISK_FILE" "$DISK_SPACE" ; then
+        rm -f "$DISK_FILE"
+        error "$FAIL" && exit 70
+      fi
+      ;;
+  esac
+}
+
+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 FS DIR CUR_SIZE DATA_SIZE DISK_FILE
+
+  DISK_FILE="$DISK_BASE.$DISK_EXT"
+  DIR=$(dirname "$DISK_FILE")
+  [ ! -d "$DIR" ] && return 0
+
+  FS=$(stat -f -c %T "$DIR")
+  if [[ "$FS" == "overlay"* ]]; then
+    info "Warning: the filesystem of $DIR is OverlayFS, this usually means it was binded to an invalid path!"
+  fi
+
+  [ -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
+    error "Please increase ${DISK_DESC^^}_SIZE to at least 6 GB." && exit 73
+  fi
+
+  if ! [ -f "$DISK_FILE" ] ; then
+    local PREV_EXT PREV_FMT PREV_FILE TMP_FILE
+
+    if [[ "${DISK_FMT,,}" != "raw" ]]; then
+      PREV_FMT="raw"
+    else
+      PREV_FMT="qcow2"
+    fi
+    PREV_EXT="$(fmt2ext "$PREV_FMT")"
+    PREV_FILE="$DISK_BASE.$PREV_EXT"
+
+    if [ -f "$PREV_FILE" ] ; then
+
+      info "Detected that ${DISK_DESC^^}_FMT changed from \"$PREV_FMT\" to \"$DISK_FMT\"."
+      info "Starting conversion of $DISK_DESC to this new format, please wait until completed..."
+
+      TMP_FILE="$DISK_BASE.tmp"
+      rm -f "$TMP_FILE"
+
+      if ! convertDisk "$PREV_FILE" "$PREV_FMT" "$TMP_FILE" "$DISK_FMT" ; then
+        rm -f "$TMP_FILE"
+        error "Failed to convert $DISK_DESC to $DISK_FMT format." && exit 79
+      fi
+
+      mv "$TMP_FILE" "$DISK_FILE"
+      rm -f "$PREV_FILE"
+      info "Conversion of $DISK_DESC completed succesfully!"
+    fi
+  fi
+
+  if [ -f "$DISK_FILE" ]; then
+
+    CUR_SIZE=$(getSize "$DISK_FILE")
+
+    if [ "$DATA_SIZE" -gt "$CUR_SIZE" ]; then
+      resizeDisk "$DISK_FILE" "$CUR_SIZE" "$DATA_SIZE" "$DISK_SPACE" "$DISK_DESC" "$DISK_FMT" || exit $?
+    fi
+
+  else
+
+    createDisk "$DISK_FILE" "$DISK_SPACE" "$DISK_DESC" "$DISK_FMT" || exit $?
+
+  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=$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 $?
+
+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
+
+DISK2_FILE="/storage2/data2"
+if [ ! -f "$DISK2_FILE.img" ]; then
+  # Fallback for legacy installs
+  FALLBACK="/storage2/data.img"
+  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.img"
+    fi
+  fi
+fi
+
+DISK3_FILE="/storage3/data3"
+if [ ! -f "$DISK3_FILE.img" ]; then
+  # Fallback for legacy installs
+  FALLBACK="/storage3/data.img"
+  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.img"
+    fi
+  fi
+fi
+
+DISK4_FILE="/storage4/data4"
+DISK5_FILE="/storage5/data5"
+DISK6_FILE="/storage6/data6"
+
+: ${DISK2_SIZE:=''}
+: ${DISK3_SIZE:=''}
+: ${DISK4_SIZE:=''}
+: ${DISK5_SIZE:=''}
+: ${DISK6_SIZE:=''}
+
+addDisk "userdata" "$DISK1_FILE" "$DISK_EXT" "disk" "$DISK_SIZE" "3" "0xc" "$DISK_FMT" || exit $?
+addDisk "userdata2" "$DISK2_FILE" "$DISK_EXT" "disk2" "$DISK2_SIZE" "4" "0xd" "$DISK_FMT" || exit $?
+addDisk "userdata3" "$DISK3_FILE" "$DISK_EXT" "disk3" "$DISK3_SIZE" "5" "0xe" "$DISK_FMT" || exit $?
+addDisk "userdata4" "$DISK4_FILE" "$DISK_EXT" "disk4" "$DISK4_SIZE" "9" "0x7" "$DISK_FMT" || exit $?
+addDisk "userdata5" "$DISK5_FILE" "$DISK_EXT" "disk5" "$DISK5_SIZE" "10" "0x8" "$DISK_FMT" || exit $?
+addDisk "userdata6" "$DISK6_FILE" "$DISK_EXT" "disk6" "$DISK6_SIZE" "11" "0x9" "$DISK_FMT" || exit $?
+
+addDevice () {
+
+  local DISK_ID=$1
+  local DISK_DEV=$2
+  local DISK_INDEX=$3
+  local DISK_ADDRESS=$4
+
+  [ -z "$DISK_DEV" ] && return 0
+  [ ! -b "$DISK_DEV" ] && error "Device $DISK_DEV cannot be found! Please add it to the 'devices' section of your compose file." && exit 55
+
+  DISK_OPTS="$DISK_OPTS \
+    -device virtio-scsi-pci,id=hw-$DISK_ID,bus=pcie.0,addr=$DISK_ADDRESS \
+    -drive file=$DISK_DEV,if=none,id=drive-$DISK_ID,format=raw,cache=$DISK_CACHE,aio=$DISK_IO,discard=$DISK_DISCARD,detect-zeroes=on \
+    -device scsi-hd,bus=hw-$DISK_ID.0,channel=0,scsi-id=0,lun=0,drive=drive-$DISK_ID,id=$DISK_ID,rotation_rate=$DISK_ROTATION,bootindex=$DISK_INDEX"
+
+  return 0
+}
+
+: ${DEVICE:=''}        # Docker variable to passthrough a block device, like /dev/vdc1.
+: ${DEVICE2:=''}
+: ${DEVICE3:=''}
+: ${DEVICE4:=''}
+: ${DEVICE5:=''}
+: ${DEVICE6:=''}
+
+addDevice "userdata7" "$DEVICE" "6" "0xf" || exit $?
+addDevice "userdata8" "$DEVICE2" "7" "0x5" || exit $?
+addDevice "userdata9" "$DEVICE3" "8" "0x6" || exit $?
+addDevice "userdata4" "$DEVICE4" "9" "0x7" || exit $?
+addDevice "userdata5" "$DEVICE5" "10" "0x8" || exit $?
+addDevice "userdata6" "$DEVICE6" "11" "0x9" || exit $?
+
+return 0
--- a/src/entry.sh
+++ b/src/entry.sh
@@ -0,0 +1,34 @@
+#!/usr/bin/env bash
+set -Eeuo pipefail
+
+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
+. cpu.sh        # Initialize processor
+. serial.sh     # Initialize serialport
+. power.sh      # Configure shutdown
+. config.sh     # Configure arguments
+
+trap - ERR
+
+if [[ "$CONSOLE" == [Yy]* ]]; then
+  exec qemu-system-x86_64 -pidfile "$QEMU_PID" ${ARGS:+ $ARGS}
+  exit $?
+fi
+
+set -m
+(
+  [[ "$DEBUG" == [Yy1]* ]] && info "$VERS" && set -x
+  qemu-system-x86_64 ${ARGS:+ $ARGS} & echo $! > "$QEMU_PID"
+  { set +x; } 2>/dev/null
+)
+set +m
+
+tail --pid "$(cat "$QEMU_PID")" --follow /dev/null & wait $!
--- a/src/gpu.sh
+++ b/src/gpu.sh
@@ -0,0 +1,24 @@
+#!/usr/bin/env bash
+set -Eeuo pipefail
+
+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
+fi
+
+if [ ! -c /dev/dri/renderD128 ]; then
+  mknod /dev/dri/renderD128 c 226 128
+fi
+
+chmod 666 /dev/dri/card0
+chmod 666 /dev/dri/renderD128
+
+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
@@ -0,0 +1,312 @@
+#!/usr/bin/env bash
+set -Eeuo pipefail
+
+: ${URL:=''}    # URL of the PAT file to be downloaded.
+: ${DEV:='Y'}   # Controls whether device nodes are created.
+
+if [ -f "$STORAGE"/dsm.ver ]; then
+  BASE=$(cat "$STORAGE/dsm.ver")
+else
+  # Fallback for old installs
+  BASE="DSM_VirtualDSM_42962"
+fi
+
+[ -n "$URL" ] && BASE=$(basename "$URL" .pat)
+
+if [[ -f "$STORAGE/$BASE.boot.img" ]] && [[ -f "$STORAGE/$BASE.system.img" ]]; then
+  return 0  # Previous installation found
+fi
+
+# Display wait message
+/run/server.sh 5000 install &
+
+DL=""
+DL_CHINA="https://cndl.synology.cn/download/DSM"
+DL_GLOBAL="https://global.synologydownload.com/download/DSM"
+
+[[ "${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
+    TMP="$STORAGE/tmp"
+    info "Warning: the $FS filesystem of $STORAGE does not support UNIX permissions.."
+  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 "$TMP" | 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 95
+
+if [[ "$TMP" != "$STORAGE/tmp" ]]; then
+  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
+fi
+
+# Check if output is to interactive TTY
+if [ -t 1 ]; then
+  PROGRESS="--progress=bar:noscroll"
+else
+  PROGRESS="--progress=dot:giga"
+fi
+
+# Download the required files from the Synology website
+
+RDC="$STORAGE/dsm.rd"
+
+if [ ! -f "$RDC" ]; then
+
+  info "Install: Downloading installer..."
+
+  RD="$TMP/rd.gz"
+  POS="65627648-71021835"
+  VERIFY="b4215a4b213ff5154db0488f92c87864"
+  LOC="$DL/release/7.0.1/42218/DSM_VirtualDSM_42218.pat"
+
+  { 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 " ")
+
+  if [ "$SUM" != "$VERIFY" ]; then
+
+    PAT="/install.pat"
+    rm "$RD"
+    rm -f "$PAT"
+
+    { 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")"
+    rm "$PAT"
+
+  fi
+
+  cp "$RD" "$RDC"
+
+fi
+
+if [ -f "$RDC" ]; then
+
+  { xz -dc <"$RDC" >"$TMP/rd" 2>/dev/null; rc=$?; } || :
+  (( rc != 1 )) && error "Failed to unxz $RDC, reason $rc" && exit 91
+
+  if [[ "$DEV" == [Nn]* ]]; then
+    # Exclude dev/ from cpio extract
+    { (cd "$TMP" && cpio -it < "$TMP/rd" | grep -Ev 'dev/' | while read -r entry; do cpio -idm "$entry" < "$TMP/rd" 2>/dev/null; done); rc=$?; } || :
+    (( rc != 0 )) && error "Failed to extract $RDC, reason $rc" && exit 92
+  else
+    { (cd "$TMP" && cpio -idm <"$TMP/rd" 2>/dev/null); rc=$?; } || :
+    (( rc != 0 )) && error "Failed to extract $RDC, reason $rc"
+    (( rc != 0 )) && error "If the container runs unprivileged, please set DEV=N to exclude device nodes." && exit 92
+  fi
+
+  mkdir -p /run/extract
+  for file in $TMP/usr/lib/libcurl.so.4 \
+              $TMP/usr/lib/libmbedcrypto.so.5 \
+              $TMP/usr/lib/libmbedtls.so.13 \
+              $TMP/usr/lib/libmbedx509.so.1 \
+              $TMP/usr/lib/libmsgpackc.so.2 \
+              $TMP/usr/lib/libsodium.so \
+              $TMP/usr/lib/libsynocodesign-ng-virtual-junior-wins.so.7 \
+              $TMP/usr/syno/bin/scemd; do
+    cp "$file" /run/extract/
+  done
+
+  if [ "$ARCH" != "amd64" ]; then
+    mkdir -p /lib64/
+    cp "$TMP/usr/lib/libc.so.6" /lib64/
+    cp "$TMP/usr/lib/libpthread.so.0" /lib64/
+    cp "$TMP/usr/lib/ld-linux-x86-64.so.2" /lib64/
+  fi
+
+  mv /run/extract/scemd /run/extract/syno_extract_system_patch
+  chmod +x /run/extract/syno_extract_system_patch
+
+fi
+
+rm -rf "$TMP" && mkdir -p "$TMP"
+
+info "Install: Downloading $(basename "$URL")..."
+
+PAT="/$BASE.pat"
+rm -f "$PAT"
+
+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
+
+[ ! -f "$PAT" ] && error "Failed to download $URL" && exit 69
+
+SIZE=$(stat -c%s "$PAT")
+
+if ((SIZE<250000000)); then
+  error "The specified PAT file is probably an update pack as it's too small." && exit 62
+fi
+
+if { tar tf "$PAT"; } >/dev/null 2>&1; then
+
+  info "Install: Extracting downloaded image..."
+  tar xpf "$PAT" -C "$TMP/."
+
+else
+
+  info "Install: Extracting downloaded image..."
+
+  export LD_LIBRARY_PATH="/run/extract"
+
+  if [ "$ARCH" == "amd64" ]; then
+    { /run/extract/syno_extract_system_patch "$PAT" "$TMP/."; rc=$?; } || :
+  else
+    { qemu-x86_64 /run/extract/syno_extract_system_patch "$PAT" "$TMP/."; rc=$?; } || :
+  fi
+
+  export LD_LIBRARY_PATH=""
+
+  (( rc != 0 )) && error "Failed to extract PAT file, reason $rc" && exit 63
+
+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
+
+BOOT=$(find "$TMP" -name "*.bin.zip")
+[ ! -f "$BOOT" ] && error "The PAT file contains no boot image." && exit 67
+
+BOOT=$(echo "$BOOT" | head -c -5)
+unzip -q -o "$BOOT".zip -d "$TMP"
+
+SYSTEM="$TMP/sys.img"
+SYSTEM_SIZE=4954537983
+
+# Check free diskspace
+SPACE=$(df --output=avail -B 1 "$TMP" | tail -n 1)
+SPACE_GB=$(( (SPACE + 1073741823)/1073741824 ))
+(( SYSTEM_SIZE > SPACE )) && error "Not enough free space to create a 4 GB system disk, have only $SPACE_GB GB available." && exit 97
+
+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 98
+  fi
+fi
+
+# Check if file exists
+[ ! -f "$SYSTEM" ] && error "System disk does not exist ($SYSTEM)" && exit 99
+
+# Check the filesize
+SIZE=$(stat -c%s "$SYSTEM")
+[[ SIZE -ne SYSTEM_SIZE ]] && rm -f "$SYSTEM" && error "System disk has the wrong size: $SIZE" && exit 90
+
+PART="$TMP/partition.fdisk"
+
+{       echo "label: dos"
+        echo "label-id: 0x6f9ee2e9"
+        echo "device: $SYSTEM"
+        echo "unit: sectors"
+        echo "sector-size: 512"
+        echo ""
+        echo "${SYSTEM}1 : start=        2048, size=     4980480, type=83"
+        echo "${SYSTEM}2 : start=     4982528, size=     4194304, type=82"
+} > "$PART"
+
+sfdisk -q "$SYSTEM" < "$PART"
+
+info "Install: Extracting system partition..."
+
+MOUNT="$TMP/system"
+rm -rf "$MOUNT" && mkdir -p "$MOUNT"
+
+mv "$HDA.tgz" "$HDA.txz"
+
+if [[ "$DEV" == [Nn]* ]]; then
+  # Exclude dev/ from tar extract
+  tar xpfJ "$HDA.txz" --absolute-names --exclude="dev" -C "$MOUNT/"
+else
+  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..."
+
+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"
+
+rm -rf "$MOUNT"
+
+echo "$BASE" > "$STORAGE"/dsm.ver
+
+if [[ "$URL" == "file://$STORAGE/$BASE.pat" ]]; then
+  rm -f "$PAT"
+else
+  mv -f "$PAT" "$STORAGE"/"$BASE".pat
+fi
+
+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
+
+return 0
--- a/src/network.sh
+++ b/src/network.sh
@@ -11,7 +11,6 @@ set -Eeuo pipefail
 : ${VM_NET_MAC:="$MAC"}
 : ${VM_NET_HOST:='VirtualDSM'}

-: ${DNS_SERVERS:=''}
 : ${DNSMASQ_OPTS:=''}
 : ${DNSMASQ:='/usr/sbin/dnsmasq'}
 : ${DNSMASQ_CONF_DIR:='/etc/dnsmasq.d'}
@@ -24,37 +23,38 @@ 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
  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 "container: --device-cgroup-rule='c $MAJOR:* rwm' --device=/dev/vhost-net" && exit 21
  fi

  { exec 40>>/dev/vhost-net; rc=$?; } 2>/dev/null || :
@@ -75,42 +75,17 @@ configureDNS () {
  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
 }
@@ -120,7 +95,7 @@ configureNAT () {
  # 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=$?; } || :

@@ -137,19 +112,19 @@ 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
-  iptables -t nat -A POSTROUTING -o "${VM_NET_DEV}" -j MASQUERADE
-  iptables -t nat -A PREROUTING -i "${VM_NET_DEV}" -p tcp  -j DNAT --to $VM_NET_IP
-  iptables -t nat -A PREROUTING -i "${VM_NET_DEV}" -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"
@@ -157,7 +132,7 @@ 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
@@ -167,7 +142,7 @@ configureNAT () {
    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,15 +154,19 @@ configureNAT () {

 closeNetwork () {

-  if [[ "${DHCP}" == [Yy1]* ]]; then
+  if [[ "$DHCP" == [Yy1]* ]]; then

-    ip link set "${VM_NET_TAP}" down || true
-    ip link delete "${VM_NET_TAP}" || true
+    { pkill -f server.sh || true; } 2>/dev/null
+
+    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
+    { pkill -f dnsmasq || true; } 2>/dev/null
+
+    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
@@ -208,7 +187,7 @@ if [ ! -c /dev/net/tun ]; then
  chmod 666 /dev/net/tun
 fi

-[ ! -c /dev/net/tun ] && error "TUN network interface not available..." && exit 85
+[ ! -c /dev/net/tun ] && error "TUN network interface not available..." && exit 25

 # Create the necessary file structure for /dev/vhost-net
 if [ ! -c /dev/vhost-net ]; then
@@ -221,18 +200,20 @@ update-alternatives --set ip6tables /usr/sbin/ip6tables-legacy > /dev/null

 VM_NET_MAC="${VM_NET_MAC//-/:}"
 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/)

-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
-
+if [[ "$DEBUG" == [Yy1]* ]]; then
+  info "Container IP is $IP with gateway $GATEWAY" && echo
 fi

-if [[ "${DHCP}" == [Yy1]* ]]; then
+if [[ "$DHCP" == [Yy1]* ]]; then

  if [[ "$GATEWAY" == "172."* ]]; then
-    error "You can only enable DHCP while the container is on a macvlan network!" && exit 86
+    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 26
+    fi
  fi

  # Configuration for DHCP IP
@@ -248,6 +229,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
@@ -0,0 +1,84 @@
+#!/usr/bin/env bash
+set -Eeuo pipefail
+
+# Configure QEMU for graceful shutdown
+
+QEMU_PORT=7100
+QEMU_TIMEOUT=50
+QEMU_PID=/run/qemu.pid
+QEMU_COUNT=/run/qemu.count
+
+rm -f "$QEMU_PID"
+rm -f "$QEMU_COUNT"
+
+_trap(){
+    func="$1" ; shift
+    for sig ; do
+        trap "$func $sig" "$sig"
+    done
+}
+
+_graceful_shutdown() {
+
+  set +e
+  local cnt response
+
+  [ ! -f "$QEMU_PID" ] && exit 130
+  [ -f "$QEMU_COUNT" ] && return
+
+  echo 0 > "$QEMU_COUNT"
+  echo && info "Received $1 signal, sending shutdown command..."
+
+  # 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
+  url="http://127.0.0.1:2210/read?command=6&timeout=50"
+  response=$(curl -sk -m 52 -S "$url" 2>&1)
+
+  if [[ "$response" =~ "\"success\"" ]]; then
+
+    echo && info "Virtual DSM is now ready to shutdown..."
+
+  else
+
+    response="${response#*message\"\: \"}"
+    echo && error "Failed to send shutdown command: ${response%%\"*}"
+
+    kill -15 "$(cat "$QEMU_PID")"
+    pkill -f qemu-system-x86_64 || true
+
+  fi
+
+  while [ "$(cat $QEMU_COUNT)" -lt "$QEMU_TIMEOUT" ]; do
+
+    # Increase the counter
+    echo $(($(cat $QEMU_COUNT)+1)) > "$QEMU_COUNT"
+
+    # 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="$(cat $QEMU_COUNT)/$QEMU_TIMEOUT"
+      [[ "$DEBUG" == [Yy1]* ]] && info "Shutting down, waiting... ($cnt)"
+
+    fi
+
+  done
+
+  echo && echo "❯ Quitting..."
+  echo 'quit' | nc -q 1 -w 1 localhost "$QEMU_PORT" >/dev/null 2>&1 || true
+
+  { pkill -f print.sh || true; } 2>/dev/null
+  { pkill -f host.bin || true; } 2>/dev/null
+
+  closeNetwork
+  sleep 1
+
+  return
+}
+
+_trap _graceful_shutdown SIGTERM SIGHUP SIGINT SIGABRT SIGQUIT
+
+MON_OPTS="-monitor telnet:localhost:$QEMU_PORT,server,nowait,nodelay"
--- a/src/print.sh
+++ b/src/print.sh
@@ -0,0 +1,80 @@
+#!/usr/bin/env bash
+set -Eeuo pipefail
+
+info () { printf "%b%s%b" "\E[1;34m❯ \E[1;36m" "$1" "\E[0m\n" >&2; }
+error () { printf "%b%s%b" "\E[1;31m❯ " "ERROR: $1" "\E[0m\n" >&2; }
+
+file="/run/dsm.url"
+shutdown="/run/qemu.count"
+url="http://127.0.0.1:2210/read?command=10"
+resp_err="Guest returned an invalid response:"
+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 "$shutdown" ] && exit 1
+
+  # Healthcheck may have intervened
+  [ -f "$file" ] && break
+
+  # Retrieve IP from guest VM
+  { json=$(curl -m 20 -sk "$url"); rc=$?; } || :
+
+  [ -f "$shutdown" ] && exit 1
+  (( rc != 0 )) && error "Failed to connect to guest: curl error $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
+
+  { 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
+  [ -z "$ip" ] && continue
+
+  echo "$ip:$port" > $file
+
+done
+
+[ -f "$shutdown" ] && exit 1
+
+location=$(cat "$file")
+
+if [[ "$location" != "20.20"* ]]; then
+
+  msg="http://$location"
+
+else
+
+  ip=$(ip address show dev eth0 | grep inet | awk '/inet / { print $2 }' | cut -f1 -d/)
+  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 "-----------------------------------------------------------"
+echo "" >&2
--- a/src/reset.sh
+++ b/src/reset.sh
@@ -0,0 +1,106 @@
+#!/usr/bin/env bash
+set -Eeuo pipefail
+
+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'}           # 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
+
+# Helper variables
+
+KERNEL=$(uname -r | cut -b 1)
+MINOR=$(uname -r | cut -d '.' -f2)
+ARCH=$(dpkg --print-architecture)
+VERS=$(qemu-system-x86_64 --version | head -n 1 | cut -d '(' -f 1)
+
+# Check folder
+
+STORAGE="/storage"
+[ ! -d "$STORAGE" ] && error "Storage folder ($STORAGE) not found!" && exit 13
+
+# Cleanup files
+
+rm -f /run/dsm.url
+rm -f /run/qemu.pid
+rm -f /run/qemu.count
+
+# Cleanup dirs
+
+rm -rf /tmp/dsm
+rm -rf "$STORAGE/tmp"
+
+# Helper functions
+
+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 () {
+
+  [ -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
@@ -0,0 +1,57 @@
+#!/usr/bin/env bash
+set -Eeuo pipefail
+
+# Docker environment variables
+
+: ${HOST_MAC:=''}
+: ${HOST_DEBUG:=''}
+: ${HOST_SERIAL:=''}
+: ${HOST_MODEL:=''}
+: ${GUEST_SERIAL:=''}
+
+HOST_ARGS=()
+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")
+
+if [[ "$HOST_DEBUG" == [Yy1]* ]]; then
+  set -x
+  ./host.bin "${HOST_ARGS[@]}" &
+  { set +x; } 2>/dev/null
+  echo
+else
+  ./host.bin "${HOST_ARGS[@]}" >/dev/null &
+fi
+
+cnt=0
+sleep 0.2
+
+while ! nc -z -w2 127.0.0.1 2210 > /dev/null 2>&1; do
+  sleep 0.1
+  cnt=$((cnt + 1))
+  (( cnt > 50 )) && error "Failed to connect to qemu-host.." && exit 58
+done
+
+cnt=0
+
+while ! nc -z -w2 127.0.0.1 12345 > /dev/null 2>&1; do
+  sleep 0.1
+  cnt=$((cnt + 1))
+  (( 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 \
+        -chardev pty,id=charserial0 \
+        -device isa-serial,chardev=charserial0,id=serial0 \
+        -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"
+
+return 0
--- 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,17 +46,15 @@ if [[ "$2" != "/run/ip.sh" ]]; then

 else

-  BODY="The location of DSM is <a href='http://\${IP}:\${PORT}'>http://\${IP}:\${PORT}</a><script>"
-  BODY="${BODY}setTimeout(function(){ window.location.assign('http://\${IP}:\${PORT}'); }, 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 "INFO=\$(curl -s -m 2 -S http://127.0.0.1:2210/read?command=10 2>/dev/null)"
-    echo "rest=\${INFO#*http_port}; rest=\${rest#*:}; rest=\${rest%%,*}; PORT=\${rest%%\\\"*}"
-    echo "rest=\${INFO#*eth0}; rest=\${rest#*ip}; rest=\${rest#*:}; rest=\${rest#*\\\"}; IP=\${rest%%\\\"*}"
-    echo "HTML=\"$HTML\"; [ -z \"\${IP}\" ] && BODY=\"$WAIT\" || BODY=\"$BODY\"; HTML=\${HTML/xxx/\$BODY}"
+    echo "[ -f \"/run/dsm.url\" ] && LOCATION=\$(cat \"/run/dsm.url\")"
+    echo "HTML=\"$HTML\"; [ -z \"\$LOCATION\" ] && BODY=\"$WAIT\" || BODY=\"$BODY\"; HTML=\${HTML/xxx/\$BODY}"
    echo "printf '%b' \"HTTP/1.1 200 OK\\nContent-Length: \${#HTML}\\nConnection: close\\n\\n\$HTML\""
  } > "$TMP_FILE"
Author	SHA1	Message	Date
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
Kroese	c9e6e65991	Fix for issue #381 (#383 ) * feat: Refactor multi-disk code	2023-11-16 20:36:30 +01:00
Kroese	04bd8a1639	feat: Check host connection	2023-11-15 21:52:03 +01:00
Kroese	a024294e19	fix: Folder structure (#379 ) * Moved to src * Moved to src * Moved to src * Moved to src * Moved to src * Moved to src * Moved to src * Moved to src * Moved to src * Moved to src * Moved to src * Moved to src * fix: Check entrypoint * Moved to src * Moved to src * fix: Relative paths * fix: Relative paths * fix: Shellcheck * fix: Relative paths * Test shellcheck * Test shellcheck	2023-11-15 20:54:51 +01:00
Kroese	0cd1ddf0a1	feat: Cache DSM info (#378 ) * feat: Cache location * feat: Cache location * feat: Add support URL * feat: Cache location * fix: Remove files * feat: Reset filesystem * fix: Exit when PID is missing * fix: Counter file * fix: Check flags * docs: Readme * feat: Cleanup files * fix: Check flags * fix: Check flags * fix: Initialization * fix: Initalization * fix: Initialization * fix: Cleanup temp * fix: Initialize system * feat: Config system * feat: Configure system * fix: Variables * fix: Variables * fix: Error handling * style: Comments * fix: Returnvalue * fix: Returnvalue * fix: Returnvalue * fix: Returnvalue * fix: Returnvalue * docs: Multi-disk support * feat: Use cached location * fix: Swap order	2023-11-15 19:58:51 +01:00
Kroese	98245a1efe	Fix for issue #373 Fix for issue #373	2023-11-12 02:10:18 +01:00
Kroese	f425c869c6	Fix for issue https://github.com/vdsm/virtual-dsm/issues/373	2023-11-12 02:05:34 +01:00
Kroese	f5b8c2a2ef	feat: Configure sizes for multiple disks feat: Configure sizes for multiple disks	2023-11-11 17:22:08 +01:00
Kroese	f44584261e	fix: Increase delay	2023-11-11 17:06:56 +01:00
Kroese	4134d9e3d3	fix: Display shutdown counter	2023-11-11 17:05:58 +01:00
Kroese	db47f561d3	feat: Configure sizes for multiple disks	2023-11-11 16:51:58 +01:00
Kroese	895bc04a57	feat: Configure sizes for multiple disks	2023-11-11 16:50:08 +01:00
Kroese	d9e882fce4	fix: Remove flags	2023-11-11 15:56:34 +01:00
Kroese	478b6af755	fix: Skip healthcheck during shutdown fix: Skip healthcheck during shutdown	2023-11-09 16:17:30 +01:00
Kroese	fecd4052fc	fix: Skip healtcheck during shutdow	2023-11-09 16:16:51 +01:00
Kroese	0b8306d827	fix: Skip healthcheck during shutdown fix: Skip healthcheck during shutdown	2023-11-09 16:15:08 +01:00
Kroese	c9d0688424	fix: Skip healthcheck during shutdown	2023-11-09 15:55:35 +01:00
Kroese	413a089e02	build: Shellcheck build: Shellcheck	2023-11-09 01:12:17 +01:00
Kroese	01e23f22fb	build: Shellcheck	2023-11-09 01:12:01 +01:00
Kroese	308a764bb0	fix: Prepare agent for removal fix: Prepare for removal	2023-11-09 01:09:55 +01:00
Kroese	5ad5f8a8ef	fix: Prepare for removal	2023-11-09 01:08:46 +01:00
Kroese	3c342a05aa	Remove agent Remove agent	2023-11-08 12:19:18 +01:00
Kroese	d793921bcf	fix: Print to stderr	2023-11-08 12:07:38 +01:00
Kroese	5365a9ed4e	fix: Do not send NMI	2023-11-08 04:32:50 +01:00
Kroese	7a55c650d0	fix: Do not install agent	2023-11-08 04:26:00 +01:00
Kroese	ede42b3647	fix: Do not install agent	2023-11-08 04:22:08 +01:00
Kroese	8e41b4e567	fix: Increase sleep	2023-11-08 04:21:07 +01:00
Kroese	899687d3f2	fix: Retry if needed	2023-11-08 04:12:09 +01:00
Kroese	2d97bc1cef	feat: Retrieve IP address	2023-11-08 03:44:12 +01:00
Kroese	538d7f0195	fix: Display stderr output	2023-11-08 03:36:13 +01:00
Kroese	dcf95a8591	feat: Display info message	2023-11-08 03:31:19 +01:00
Kroese	7f7272b7c8	feat: Update to DSM 7.2.1 feat: Update to DSM 7.2.1	2023-11-01 01:43:18 +01:00
Kroese	c30248f93e	docs: Version	2023-11-01 01:40:34 +01:00
Kroese	cf90c9da1f	feat: Update to DSM 7.2.1 (69057)	2023-11-01 01:06:41 +01:00
Kroese	461b5598a9	feat: Passthrough multiple devices feat: Passthrough multiple devices	2023-10-31 16:58:30 +01:00
Kroese	47ed2e8bac	build: Changelog	2023-10-31 16:57:43 +01:00
Kroese	1c78e3c8b1	feat: Passthrough multiple devices	2023-10-31 16:53:44 +01:00
Kroese	9f17dfa949	Update Dockerhub description Update Dockerhub description	2023-10-26 00:56:46 +02:00
Kroese	3de29b6c00	Update Dockerhub description	2023-10-26 00:56:02 +02:00
Kroese	037d52957a	build: Push to mirror build: Push to mirror	2023-10-19 16:03:16 +02:00
Kroese	c7ccc912b5	build: Push to mirror	2023-10-19 16:02:56 +02:00
Kroese	72cbf87986	docs: Update location docs: Update location	2023-10-19 15:37:33 +02:00
Kroese	317024d327	fix: Update location	2023-10-19 15:33:12 +02:00
Kroese	121c487383	fix: Update location	2023-10-19 15:31:58 +02:00
Kroese	fd92b60218	docs: Update location	2023-10-19 15:31:23 +02:00
Kroese	771429c5d3	build: Push to mirror	2023-10-19 15:27:23 +02:00
Kroese	674b6e5bda	build: Update mirror	2023-10-19 15:23:20 +02:00
Kroese	7c65e2740f	docs: Update location docs: Update location	2023-10-19 15:11:45 +02:00
Kroese	d462c6d7a2	fix: Update location	2023-10-19 15:09:37 +02:00
Kroese	d5637e8da0	fix: Update location	2023-10-19 15:08:40 +02:00
Kroese	1b75bd3c44	docs: Update location	2023-10-19 15:05:20 +02:00
Kroese	2551413040	docs: Update location	2023-10-19 15:03:10 +02:00
Kroese	44d3e23545	feat: Update to QEMU 8.1 feat: Update to QEMU 8.1	2023-10-17 19:44:54 +02:00
Kroese	d340361320	fix: Skip gateway check in debug mode	2023-10-17 19:37:39 +02:00
Kroese	f8f8c16200	fix: Don't store agent version	2023-10-17 19:32:34 +02:00
Kroese	47fd7931eb	style: Shutdown counter	2023-10-17 19:28:37 +02:00
Kroese	7ac9c242da	fix: Remove agent check	2023-10-17 19:24:42 +02:00
Kroese	78d330055f	fix: Remove agent check	2023-10-17 19:12:06 +02:00
Kroese	06cf0a4edc	build: Update to QEMU 8.1 (Debian 13)	2023-10-17 19:05:22 +02:00
Kroese	e26c208cc7	feat: OpenGL module	2023-10-17 19:01:08 +02:00
Kroese	c2f4823d8b	build: Dockerfile build: Dockerfile	2023-10-17 01:40:00 +02:00
Kroese	ca01bf8cb9	build: Dockerfile	2023-10-17 01:39:44 +02:00
Kroese	a5b2b655dd	build: Dockerfile build: Dockerfile	2023-10-16 17:44:51 +02:00
Kroese	0f2f3b2ea8	build: Dockerfile	2023-10-16 17:44:36 +02:00
Kroese	0705c1c21b	build: Dockerfile build: Dockerfile	2023-10-16 16:51:55 +02:00
Kroese	e4de05ce88	build: Dockerfile	2023-10-16 16:51:23 +02:00
Kroese	a24b62ae67	docs: Readme docs: Readme	2023-10-16 01:10:41 +02:00
Kroese	b5a9361b68	docs: Readme	2023-10-16 01:10:23 +02:00
Kroese	0e35e4a6d9	docs: Readme docs: Readme	2023-10-16 00:41:53 +02:00
Kroese	208a6e6636	docs: Readme	2023-10-16 00:41:14 +02:00
Kroese	3fec9bf5ef	docs: Readme docs: Readme	2023-10-10 07:35:32 +02:00
Kroese	8d8efeb341	docs: Readme	2023-10-10 07:34:44 +02:00
Kroese	e9f27899a6	fix: Shutdown counter	2023-10-10 07:00:43 +02:00
Kroese	0c1c422758	feat: Mount block device feat: Mount block device	2023-10-10 06:42:36 +02:00
Kroese	f56c523627	feat: Mount block device	2023-10-10 06:39:59 +02:00
Kroese	66879b5a6a	feat: Mount block device	2023-10-10 06:29:03 +02:00
Kroese	b4eef6161b	feat: Disk passthrough feat: Disk passthrough	2023-10-10 05:32:22 +02:00
Kroese	cf38b1f237	fix: Intel GPU drivers	2023-10-10 05:29:50 +02:00
Kroese	2c09811365	feat: Disk passthrough	2023-10-10 05:26:37 +02:00
Kroese	761f5babfc	docs: GPU passthrough docs: GPU passthrough	2023-10-10 05:01:12 +02:00
Kroese	26be942a74	docs: GPU passthrough	2023-10-10 05:00:54 +02:00
Kroese	9c6aeca709	feat: Multiple disk support feat: Multiple disk support	2023-10-09 19:47:05 +02:00
Kroese	81b0bba667	Shellcheck SC2153	2023-10-09 19:46:26 +02:00
Kroese	e2c00a2e44	docs: GPU passthrough support	2023-10-09 19:41:07 +02:00
Kroese	7bb33f26cd	feat: GPU passthrough support	2023-10-09 19:34:49 +02:00
Kroese	63b2d703a4	build: Debian Bookworm	2023-10-09 19:30:57 +02:00
Kroese	a97dfbfdf2	feat: GPU passthrough support	2023-10-09 18:48:47 +02:00
Kroese	b255cb03e8	feat: GPU passthrough support	2023-10-09 18:45:39 +02:00
Kroese	7a79ff1d2d	style: Indentations	2023-10-09 18:35:04 +02:00
Kroese	06fda133ed	fix: Remove GPU drivers	2023-10-09 18:32:52 +02:00
Kroese	acedd1cdcf	feat: Multiple disk support	2023-10-09 18:30:13 +02:00
Kroese	96083fddb3	build: Update to QEMU v8.1.1 (Debian 13)	2023-10-09 18:28:56 +02:00
Kroese	5d7604a205	feat: Multiple disk support	2023-10-09 14:10:31 +02:00
Kroese	24d44924fe	docs: GPU support docs: GPU support	2023-10-09 11:20:32 +02:00
Kroese	db840db76f	docs: GPU support	2023-10-09 11:19:57 +02:00
Kroese	38148641c0	feat: Install GPU drivers feat: Install GPU drivers	2023-10-09 03:33:37 +02:00
Kroese	5941eae237	style: Empty line	2023-10-09 03:27:45 +02:00
Kroese	5fa117c4d8	fix: Remove platform dependant packages	2023-10-09 03:23:54 +02:00
Kroese	28fc911f00	feat: Install GPU drivers	2023-10-09 03:21:06 +02:00
Kroese	c8eb659c3c	feat: Install GPU drivers	2023-10-09 03:14:41 +02:00
Kroese	16ce7c07cf	fix: Install platform dependant packages	2023-10-09 02:50:59 +02:00
Kroese	f745e5e09d	build: Dockerfile	2023-10-09 02:42:20 +02:00
Kroese	16b823f69b	fix: add GPU drivers only on amd64 fix: add GPU drivers only on amd64	2023-10-09 02:27:46 +02:00
Kroese	d69cceba8d	fix: add GPU drivers only on amd64	2023-10-09 02:24:52 +02:00
Kroese	c2cd9f52f4	feat: GPU passthrough support feat: GPU passthrough support	2023-10-09 02:03:05 +02:00
Kroese	0d2a222af0	docs: GPU passthrough support	2023-10-09 02:00:03 +02:00
Kroese	868c7d1661	feat: GPU passthrough support	2023-10-09 01:54:25 +02:00
Kroese	b6ca62da34	feat: GPU passthrough support	2023-10-09 01:42:01 +02:00
Kroese	da4555925b	Merge pull request #330 from amintong/master dnat rule add dst restrictions	2023-10-08 15:08:25 +02:00
tong min	8c6f7e49ef	network in NAT mode, processing packets only with the destination (dst) set to the container IP can prevent packets coming out of the QEMU virtual machine through eth0 from being incorrectly DNAT	2023-10-08 19:48:00 +08:00
Kroese	06829aac67	refactor: Filesystem detection refactor: Filesystem detection	2023-10-07 12:09:11 +02:00
Kroese	e5b7ade0d0	refactor: Filesystem detection	2023-10-07 12:06:22 +02:00
Kroese	c1de32eff6	feat: Check filesystem during installation feat: Check filesystem during installation	2023-10-05 16:53:56 +02:00
Kroese	c2dc0cd3b6	feat: Check filesystem during installation	2023-10-05 16:49:00 +02:00
Kroese	e2a4ab7515	feat: Check filesystem during installation	2023-10-05 16:45:12 +02:00
Kroese	d94a9d0966	fix: Extract files inside container fix: Extract files inside container	2023-10-05 15:55:49 +02:00
Kroese	6d9c281add	build: Use DockerHub mirror	2023-10-05 15:51:42 +02:00
Kroese	da51c1df1f	fix: Extract files inside container	2023-10-05 15:47:17 +02:00
Kroese	97918abdb0	build: Remove btrfs-progs	2023-10-05 15:35:24 +02:00
Kroese	6a8093a3f4	fix: Do not format image as btrfs	2023-10-05 15:31:42 +02:00
Kroese	0bd0806ceb	Merge pull request #321 from kroese/renovate/docker-setup-buildx-action-3.x chore(deps): update docker/setup-buildx-action action to v3	2023-09-12 10:41:06 +02:00
Kroese	386c2ccc45	Merge pull request #320 from kroese/renovate/docker-login-action-3.x chore(deps): update docker/login-action action to v3	2023-09-12 10:40:51 +02:00
renovate[bot]	ff6a3b8776	chore(deps): update docker/setup-buildx-action action to v3	2023-09-12 08:10:13 +00:00
renovate[bot]	f290fb7031	chore(deps): update docker/login-action action to v3	2023-09-12 08:10:09 +00:00
Kroese	b4e19ccc23	Update readme.md Update readme.md	2023-09-05 03:45:48 +02:00
Kroese	e3c514f8dc	Update readme.md	2023-09-05 03:45:32 +02:00
Kroese	101b509f81	Merge pull request #316 from kroese/renovate/actions-checkout-4.x chore(deps): update actions/checkout action to v4	2023-09-04 16:07:12 +02:00
renovate[bot]	6a5301b3f2	chore(deps): update actions/checkout action to v4	2023-09-04 14:04:19 +00:00
Kroese	cad5e5d5c2	Readme Readme	2023-07-27 01:41:09 +02:00
Kroese	024170d190	docs: Readme	2023-07-27 01:40:31 +02:00
Kroese	0ce14f6c2d	fix: Disable pidwait fix: Disable pidwait	2023-07-18 20:17:19 +02:00
Kroese	272e491281	fix: Disable pidwait	2023-07-18 20:16:47 +02:00
Kroese	0518e1100b	Add ARGUMENTS variable Add ARGUMENTS variable	2023-07-18 19:47:56 +02:00
Kroese	8aa797b557	feat: Add ARGUMENTS variable	2023-07-18 19:44:09 +02:00
Kroese	4356e5ebf9	Fix for issue https://github.com/kroese/virtual-dsm/issues/292 Fix for issue https://github.com/kroese/virtual-dsm/issues/292	2023-07-18 19:37:12 +02:00
Kroese	502c068d30	fix: Fix for issue https://github.com/kroese/virtual-dsm/issues/292	2023-07-18 19:35:56 +02:00
Kroese	d5e3ed8907	fix: Fix for issue https://github.com/kroese/virtual-dsm/issues/292	2023-07-18 19:34:49 +02:00