feat: Country detection

* feat: Country detection

.github/workflows/build.yml

@@ -13,6 +13,10 @@ on:
       - '.github/**'
       - '.github/workflows/**'
 
+concurrency:
+  group: build
+  cancel-in-progress: false
+
 jobs:
   shellcheck:
     name: Check
@@ -22,37 +26,34 @@ jobs:
     needs: shellcheck
     runs-on: ubuntu-latest
     permissions:
+      actions: write
       packages: write
       contents: read
     steps:
-      - 
-        name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
       -
         name: Checkout
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
       -
-        name: Prepare Docker build
-        id: prepare
-        run: |
-        
-          PLATFORMS="linux/amd64,linux/arm64"
-          VERSION="${{ vars.MAJOR }}.${{ vars.MINOR }}"
-          
-          TAGS=()
-          TAGS=("${{ github.repository }}:latest")
-          TAGS+=("${{ github.repository }}:${VERSION}")
-          #TAGS+=("${{ secrets.DOCKERHUB_MIRROR }}:latest")
-          #TAGS+=("${{ secrets.DOCKERHUB_MIRROR }}:${VERSION}")
-          TAGS+=("ghcr.io/${{ github.repository }}:latest")
-          TAGS+=("ghcr.io/${{ github.repository }}:${VERSION}")
-          
-          echo "tags=${TAGS[@]}" >> $GITHUB_OUTPUT
-          echo "version=${VERSION}" >> $GITHUB_OUTPUT
-          echo "docker_platforms=${PLATFORMS}" >> $GITHUB_OUTPUT
-          echo "build_date=$(date -u +'%Y-%m-%dT%H:%M:%SZ')" >> $GITHUB_OUTPUT
+        name: Docker metadata
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          context: git
+          images: |
+            ${{ secrets.DOCKERHUB_REPO }}
+            ghcr.io/${{ github.repository }}
+          tags: |
+            type=raw,value=latest,priority=100
+            type=raw,value=${{ vars.MAJOR }}.${{ vars.MINOR }}
+          labels: |
+            org.opencontainers.image.title=${{ vars.NAME }}
+        env:
+          DOCKER_METADATA_ANNOTATIONS_LEVELS: manifest,index            
+      - 
+        name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
       -
         name: Login into Docker Hub
         uses: docker/login-action@v3
@@ -68,34 +69,26 @@ jobs:
           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
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          push: true
+          provenance: false
+          platforms: linux/amd64,linux/arm64
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          annotations: ${{ steps.meta.outputs.annotations }}
+          build-args: |
+            VCS_REF=${GITHUB_SHA::8}
+            VERSION_ARG=${{ steps.meta.outputs.version }}
       -
         name: Create a release
         uses: action-pack/github-release@v2
         env:
           GITHUB_TOKEN: ${{ secrets.REPO_ACCESS_TOKEN }}
         with:
-          tag: "v${{ steps.prepare.outputs.version }}"
-          title: "v${{ steps.prepare.outputs.version }}"
+          tag: "v${{ steps.meta.outputs.version }}"
+          title: "v${{ steps.meta.outputs.version }}"
       -
         name: Increment version variable
         uses: action-pack/bump@v2

.github/workflows/check.yml

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

Dockerfile

@@ -14,6 +14,7 @@ ARG DEBIAN_FRONTEND noninteractive
 
 RUN apt-get update && apt-get -y upgrade && \
     apt-get --no-install-recommends -y install \
+        jq \
         tini \
         curl \
         cpio \
@@ -33,9 +34,8 @@ RUN apt-get update && apt-get -y upgrade && \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
-COPY run/*.sh /run/
+COPY ./src /run/
 COPY --from=builder /qemu-host.bin /run/host.bin
-
 RUN chmod +x /run/*.sh && chmod +x /run/*.bin
 
 VOLUME /storage
@@ -46,24 +46,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.licenses="MIT"
-LABEL org.opencontainers.image.title="Virtual DSM"
-LABEL org.opencontainers.image.created=${DATE_ARG}
-LABEL org.opencontainers.image.revision=${BUILD_ARG}
-LABEL org.opencontainers.image.version=${VERSION_ARG}
-LABEL org.opencontainers.image.source="https://github.com/vdsm/virtual-dsm/"
-LABEL org.opencontainers.image.url="https://hub.docker.com/r/vdsm/virtual-dsm/"
-LABEL org.opencontainers.image.description="Virtual DSM in a docker container"
+HEALTHCHECK --interval=60s --start-period=45s --retries=2 CMD /run/check.sh
 
-HEALTHCHECK --interval=60s --retries=2 CMD /run/check.sh
-
-ENTRYPOINT ["/usr/bin/tini", "-s", "/run/run.sh"]
+ENTRYPOINT ["/usr/bin/tini", "-s", "/run/entry.sh"]

agent/agent.sh

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

docker-compose.yml

@@ -4,11 +4,12 @@ services:
         container_name: dsm
         image: vdsm/virtual-dsm:latest
         environment:
-            CPU_CORES: "1"
             DISK_SIZE: "16G"
-            RAM_SIZE: "512M"
+            RAM_SIZE: "1G"
+            CPU_CORES: "1"
         devices:
             - /dev/kvm
+            - /dev/net/tun
             - /dev/vhost-net
         device_cgroup_rules:
             - 'c *:* rwm'

readme.md

@@ -10,14 +10,14 @@
 [![Pulls]][hub_url]
 
 </div></h1>
+
 Virtual DSM in a docker container.
 
 ## Features
 
- - Multi-platform
+ - Multiple disks
  - KVM acceleration
  - GPU passthrough
- - Graceful shutdowns
  - Upgrades supported
  
 ## Usage
@@ -34,7 +34,6 @@ services:
       DISK_SIZE: "16G"
     devices:
       - /dev/kvm
-      - /dev/vhost-net
     cap_add:
       - NET_ADMIN
     ports:
@@ -59,7 +58,7 @@ docker run -it --rm -p 5000:5000 --device=/dev/kvm --cap-add NET_ADMIN --stop-ti
 
     ```yaml
     environment:
-      DISK_SIZE: "256G"
+      DISK_SIZE: "128G"
     ```
     
     This can also be used to resize the existing disk to a larger capacity without any data loss. 
@@ -75,6 +74,19 @@ 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 add multiple disks?
+
+    To create additional disks, modify your compose file like this:
+    
+    ```yaml
+    environment:
+      DISK2_SIZE: "32G"
+      DISK3_SIZE: "64G"
+    volumes:
+      - /home/example:/storage2
+      - /mnt/data/example:/storage3
+    ```
+
   * ### How do I change the space reserved by the virtual disk? 
 
     By default, the entire disk space is reserved in advance. To create a growable disk that only reserves the space that is actually used, add the following environment variable:
@@ -88,12 +100,12 @@ docker run -it --rm -p 5000:5000 --device=/dev/kvm --cap-add NET_ADMIN --stop-ti
 
   * ### 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?
@@ -160,18 +172,7 @@ 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 install a specific version of vDSM?
-
-    By default, version 7.2.1 will be installed, but if you prefer an older version, you can add its download URL to your compose file as follows:
-
-    ```yaml
-    environment:
-      URL: "https://global.synologydownload.com/download/DSM/release/7.0.1/42218/DSM_VirtualDSM_42218.pat"
-    ```
-
-    With this method, it is even possible to switch between different versions while keeping all your file data intact.
-
-  * ### How do I passthrough my GPU?
+  * ### How do I passthrough the GPU?
 
     To passthrough your Intel GPU, add the following lines to your compose file:
 
@@ -184,6 +185,17 @@ docker run -it --rm -p 5000:5000 --device=/dev/kvm --cap-add NET_ADMIN --stop-ti
 
     This can be used to enable the facial recognition function in Synology Photos for example.
 
+  * ### How do I install a specific version of vDSM?
+
+    By default, version 7.2.1 will be installed, but if you prefer an older version, you can add its download URL to your compose file as follows:
+
+    ```yaml
+    environment:
+      URL: "https://global.synologydownload.com/download/DSM/release/7.0.1/42218/DSM_VirtualDSM_42218.pat"
+    ```
+
+    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 available, and Surveillance Station will not include any free licenses.

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

run/disk.sh

@@ -1,215 +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
-
-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"
-
-EXTRA_DISK="/storage2/data.img"
-
-if [ -f "${EXTRA_DISK}" ]; then
-
-  DISK_OPTS="${DISK_OPTS} \
-    -device virtio-scsi-pci,id=hw-userdata2,bus=pcie.0,addr=0xd \
-    -drive file=${EXTRA_DISK},if=none,id=drive-userdata2,format=raw,cache=${DISK_CACHE},aio=${DISK_IO},discard=${DISK_DISCARD},detect-zeroes=on \
-    -device scsi-hd,bus=hw-userdata2.0,channel=0,scsi-id=0,lun=0,drive=drive-userdata2,id=userdata2,rotation_rate=${DISK_ROTATION},bootindex=4"
-
-else
-
-  [ -d "$(dirname "${EXTRA_DISK}")" ] && error "Disk image ${EXTRA_DISK} does not exist! Please supply an empty file of at least 6 GB." && exit 53
-
-fi
-
-EXTRA_DISK="/storage3/data.img"
-
-if [ -f "${EXTRA_DISK}" ]; then
-
-  DISK_OPTS="${DISK_OPTS} \
-    -device virtio-scsi-pci,id=hw-userdata3,bus=pcie.0,addr=0xe \
-    -drive file=${EXTRA_DISK},if=none,id=drive-userdata3,format=raw,cache=${DISK_CACHE},aio=${DISK_IO},discard=${DISK_DISCARD},detect-zeroes=on \
-    -device scsi-hd,bus=hw-userdata3.0,channel=0,scsi-id=0,lun=0,drive=drive-userdata3,id=userdata3,rotation_rate=${DISK_ROTATION},bootindex=5"
-
-else
-
-  [ -d "$(dirname "${EXTRA_DISK}")" ] && error "Disk image ${EXTRA_DISK} does not exist! Please supply an empty file of at least 6 GB." && exit 54
-
-fi
-
-: ${DEVICE:=''}        # Docker variable to passthrough a block device, like /dev/vdc1.
-: ${DEVICE2:=''}
-: ${DEVICE3:=''}
-
-if [ -n "${DEVICE}" ]; then
-
-  [ ! -b "${DEVICE}" ] && error "Device ${DEVICE} 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-userdata4,bus=pcie.0,addr=0xf \
-    -drive file=${DEVICE},if=none,id=drive-userdata4,format=raw,cache=${DISK_CACHE},aio=${DISK_IO},discard=${DISK_DISCARD},detect-zeroes=on \
-    -device scsi-hd,bus=hw-userdata4.0,channel=0,scsi-id=0,lun=0,drive=drive-userdata4,id=userdata4,rotation_rate=${DISK_ROTATION},bootindex=6"
-
-fi
-
-if [ -n "${DEVICE2}" ]; then
-
-  [ ! -b "${DEVICE2}" ] && error "Device ${DEVICE2} cannot be found! Please add it to the 'devices' section of your compose file." && exit 56
-
-  DISK_OPTS="${DISK_OPTS} \
-    -device virtio-scsi-pci,id=hw-userdata5,bus=pcie.0,addr=0x5 \
-    -drive file=${DEVICE2},if=none,id=drive-userdata5,format=raw,cache=${DISK_CACHE},aio=${DISK_IO},discard=${DISK_DISCARD},detect-zeroes=on \
-    -device scsi-hd,bus=hw-userdata5.0,channel=0,scsi-id=0,lun=0,drive=drive-userdata5,id=userdata5,rotation_rate=${DISK_ROTATION},bootindex=7"
-
-fi
-
-if [ -n "${DEVICE3}" ]; then
-
-  [ ! -b "${DEVICE3}" ] && error "Device ${DEVICE3} cannot be found! Please add it to the 'devices' section of your compose file." && exit 57
-
-  DISK_OPTS="${DISK_OPTS} \
-    -device virtio-scsi-pci,id=hw-userdata6,bus=pcie.0,addr=0x6 \
-    -drive file=${DEVICE3},if=none,id=drive-userdata6,format=raw,cache=${DISK_CACHE},aio=${DISK_IO},discard=${DISK_DISCARD},detect-zeroes=on \
-    -device scsi-hd,bus=hw-userdata6.0,channel=0,scsi-id=0,lun=0,drive=drive-userdata6,id=userdata6,rotation_rate=${DISK_ROTATION},bootindex=8"
-
-fi

run/power.sh

@@ -1,74 +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)"
-
-    kill -15 "$(cat "${_QEMU_PID}")"
-    pkill -f qemu-system-x86_64 || true
-
-  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
-
-      #CNT="$(cat ${_QEMU_SHUTDOWN_COUNTER})/${QEMU_POWERDOWN_TIMEOUT}"
-      #[[ "${DEBUG}" == [Yy1]* ]] && info "Shutting down, waiting... (${CNT})"
-
-    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"

run/run.sh

@@ -1,97 +0,0 @@
-#!/usr/bin/env bash
-set -Eeuo pipefail
-
-# Docker environment variables
-
-: ${URL:=''}            # URL of the PAT file
-: ${GPU:='N'}           # Enable GPU passthrough
-: ${DEBUG:='N'}         # Enable debugging mode
-: ${ALLOCATE:='Y'}      # Preallocate diskspace
-: ${ARGUMENTS:=''}      # Extra QEMU parameters
-: ${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
-
-. /run/disk.sh     # Initialize disks
-. /run/network.sh  # Initialize network
-. /run/serial.sh   # Initialize serialport
-. /run/power.sh    # Configure shutdown
-
-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"
-
-[[ "${GPU}" == [Yy1]* ]] && [[ "$ARCH" == "amd64" ]] && . /run/gpu.sh
-
-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 ' ')
-
-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 > 2 )) ); then
-#  pidwait -F "${_QEMU_PID}" & wait $!
-#else
-
-tail --pid "$(cat "${_QEMU_PID}")" --follow /dev/null & wait $!

src/check.sh

@@ -0,0 +1,61 @@
+#!/usr/bin/env bash
+set -u
+
+[ ! -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"
+
+if [ ! -f  "$file" ]; then
+
+  # 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
+
+  echo "${IP}:${PORT}" > $file
+
+fi
+
+LOCATION=$(cat "$file")
+
+if ! curl -m 20 -ILfSs "http://${LOCATION}/" > /dev/null; then
+  rm -f $file
+  echo "Failed to reach http://${LOCATION}"
+  exit 1
+fi
+
+if [[ "$LOCATION" == "20.20"* ]]; then
+  echo "Healthcheck OK"
+else
+  echo "Healthcheck OK ( ${LOCATION%:*} )"
+fi
+
+exit 0

src/config.sh

@@ -0,0 +1,40 @@
+#!/bin/bash
+set -Eeuo pipefail
+
+KVM_ERR=""
+KVM_OPTS=""
+
+if [ -e /dev/kvm ] && sh -c 'echo -n > /dev/kvm' &> /dev/null; then
+  if ! grep -q -e vmx -e svm /proc/cpuinfo; then
+    KVM_ERR="(vmx/svm disabled)"
+  fi
+else
+  [ -e /dev/kvm ] && KVM_ERR="(no write access)" || KVM_ERR="(device file missing)"
+fi
+
+if [ -n "${KVM_ERR}" ]; then
+  if [ "$ARCH" == "amd64" ]; then
+    error "KVM acceleration not detected ${KVM_ERR}, see the FAQ about this."
+    [[ "${DEBUG}" != [Yy1]* ]] && exit 88
+  fi
+else
+  KVM_OPTS=",accel=kvm -enable-kvm -cpu host"
+fi
+
+DEF_OPTS="-nographic -nodefaults -boot strict=on -display none"
+RAM_OPTS=$(echo "-m ${RAM_SIZE}" | sed 's/MB/M/g;s/GB/G/g;s/TB/T/g')
+CPU_OPTS="-smp ${CPU_CORES},sockets=1,dies=1,cores=${CPU_CORES},threads=1"
+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

src/disk.sh

@@ -0,0 +1,222 @@
+#!/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
+
+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"
+
+addDisk () {
+
+  local FS
+  local GB
+  local DIR
+  local REQ
+  local SPACE
+  local CUR_SIZE
+  local DATA_SIZE
+  local DISK_ID=$1
+  local DISK_FILE=$2
+  local DISK_DESC=$3
+  local DISK_SPACE=$4
+  local DISK_INDEX=$5
+  local DISK_ADDRESS=$6
+
+  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 83
+  fi
+
+  if [ -f "${DISK_FILE}" ]; then
+
+    CUR_SIZE=$(stat -c%s "${DISK_FILE}")
+
+    if [ "$DATA_SIZE" -gt "$CUR_SIZE" ]; then
+
+      GB=$(( (CUR_SIZE + 1073741823)/1073741824 ))
+      info "Resizing ${DISK_DESC} from ${GB}G to ${DISK_SPACE} .."
+
+      if [[ "${ALLOCATE}" == [Nn]* ]]; then
+
+        # Resize file by changing its length
+        if ! truncate -s "${DISK_SPACE}" "${DISK_FILE}"; then
+          error "Could not resize ${DISK_DESC} file (${DISK_FILE}) to ${DISK_SPACE} .." && exit 85
+        fi
+
+      else
+
+        REQ=$((DATA_SIZE-CUR_SIZE))
+
+        # 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 "Specify a smaller ${DISK_DESC^^}_SIZE or disable preallocation with ALLOCATE=N." && exit 84
+        fi
+
+        # Resize file by allocating more space
+        if ! fallocate -l "${DISK_SPACE}" "${DISK_FILE}"; then
+          if ! truncate -s "${DISK_SPACE}" "${DISK_FILE}"; then
+            error "Could not resize ${DISK_DESC} file (${DISK_FILE}) to ${DISK_SPACE}" && exit 85
+          fi
+        fi
+
+      fi
+    fi
+  fi
+
+  if [ ! -f "${DISK_FILE}" ]; then
+
+    if [[ "${ALLOCATE}" == [Nn]* ]]; then
+
+      # Create an empty file
+      if ! truncate -s "${DISK_SPACE}" "${DISK_FILE}"; then
+        rm -f "${DISK_FILE}"
+        error "Could not create a ${DISK_SPACE} file for ${DISK_DESC} (${DISK_FILE})" && exit 87
+      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 ${DISK_DESC} of ${DISK_SPACE} in ${DIR}, it has only ${SPACE_GB} GB available.."
+        error "Specify a smaller ${DISK_DESC^^}_SIZE or disable preallocation with ALLOCATE=N." && exit 86
+      fi
+
+      # Create an empty file
+      if ! fallocate -l "${DISK_SPACE}" "${DISK_FILE}"; then
+        if ! truncate -s "${DISK_SPACE}" "${DISK_FILE}"; then
+          rm -f "${DISK_FILE}"
+          error "Could not create a ${DISK_SPACE} file for ${DISK_DESC} (${DISK_FILE})" && exit 87
+        fi
+      fi
+
+    fi
+  fi
+
+  DISK_OPTS="${DISK_OPTS} \
+    -device virtio-scsi-pci,id=hw-${DISK_ID},bus=pcie.0,addr=${DISK_ADDRESS} \
+    -drive file=${DISK_FILE},if=none,id=drive-${DISK_ID},format=raw,cache=${DISK_CACHE},aio=${DISK_IO},discard=${DISK_DISCARD},detect-zeroes=on \
+    -device scsi-hd,bus=hw-${DISK_ID}.0,channel=0,scsi-id=0,lun=0,drive=drive-${DISK_ID},id=${DISK_ID},rotation_rate=${DISK_ROTATION},bootindex=${DISK_INDEX}"
+
+  return 0
+}
+
+DISK1_FILE="${STORAGE}/data.img"
+
+if [[ ! -f "${DISK1_FILE}" ]] && [[ -f "${STORAGE}/data${DISK_SIZE}.img" ]]; then
+  # Fallback for legacy installs
+  mv "${STORAGE}/data${DISK_SIZE}.img" "${DISK1_FILE}"
+fi
+
+DISK2_FILE="/storage2/data2.img"
+
+if [ ! -f "${DISK2_FILE}" ]; then
+  # Fallback for legacy installs
+  FALLBACK="/storage2/data.img"
+  if [[ -f "${DISK1_FILE}" ]] && [[ -f "${FALLBACK}" ]]; then
+    SIZE1=$(stat -c%s "${FALLBACK}")
+    SIZE2=$(stat -c%s "${DISK1_FILE}")
+    if [[ SIZE1 -ne SIZE2 ]]; then
+      mv "${FALLBACK}" "${DISK2_FILE}"
+    fi
+  fi
+fi
+
+DISK3_FILE="/storage3/data3.img"
+
+if [ ! -f "${DISK3_FILE}" ]; then
+  # Fallback for legacy installs
+  FALLBACK="/storage3/data.img"
+  if [[ -f "${DISK1_FILE}" ]] && [[ -f "${FALLBACK}" ]]; then
+    SIZE1=$(stat -c%s "${FALLBACK}")
+    SIZE2=$(stat -c%s "${DISK1_FILE}")
+    if [[ SIZE1 -ne SIZE2 ]]; then
+      mv "${FALLBACK}" "${DISK3_FILE}"
+    fi
+  fi
+fi
+
+DISK4_FILE="/storage4/data4.img"
+DISK5_FILE="/storage5/data5.img"
+DISK6_FILE="/storage6/data6.img"
+
+: ${DISK2_SIZE:=''}
+: ${DISK3_SIZE:=''}
+: ${DISK4_SIZE:=''}
+: ${DISK5_SIZE:=''}
+: ${DISK6_SIZE:=''}
+
+addDisk "userdata" "${DISK1_FILE}" "disk" "${DISK_SIZE}" "3" "0xc"
+addDisk "userdata2" "${DISK2_FILE}" "disk2" "${DISK2_SIZE}" "4" "0xd"
+addDisk "userdata3" "${DISK3_FILE}" "disk3" "${DISK3_SIZE}" "5" "0xe"
+addDisk "userdata4" "${DISK4_FILE}" "disk4" "${DISK4_SIZE}" "9" "0x7"
+addDisk "userdata5" "${DISK5_FILE}" "disk5" "${DISK5_SIZE}" "10" "0x8"
+addDisk "userdata6" "${DISK6_FILE}" "disk6" "${DISK6_SIZE}" "11" "0x9"
+
+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"
+addDevice "userdata8" "${DEVICE2}" "7" "0x5"
+addDevice "userdata9" "${DEVICE3}" "8" "0x6"
+addDevice "userdata4" "${DEVICE4}" "9" "0x7"
+addDevice "userdata5" "${DEVICE5}" "10" "0x8"
+addDevice "userdata6" "${DEVICE6}" "11" "0x9"
+
+return 0

src/entry.sh

@@ -0,0 +1,33 @@
+#!/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
+. 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 $!

src/gpu.sh

@@ -1,6 +1,10 @@
 #!/bin/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
@@ -14,9 +18,6 @@ fi
 chmod 666 /dev/dri/card0
 chmod 666 /dev/dri/renderD128
 
-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"
-
 if ! apt-mark showinstall | grep -q "xserver-xorg-video-intel"; then
 
   info "Installing Intel GPU drivers..."
@@ -40,3 +41,5 @@ if ! apt-mark showinstall | grep -q "qemu-system-modules-opengl"; then
   apt-get -qq --no-install-recommends -y install qemu-system-modules-opengl > /dev/null
 
 fi
+
+return 0

src/install.sh

@@ -1,20 +1,57 @@
 #!/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
+  # Previous installation found
+  return 0
+fi
+
 # Display wait message
 /run/server.sh 5000 install &
 
-# Download the required files from the Synology website
-DL="https://global.synologydownload.com/download/DSM"
+# Detect country
+COUNTRY=""
+{ JSON=$(curl -sfk https://ipinfo.io); rc=$?; } || :
 
+if (( rc == 0 )); then
+  { COUNTRY=$(echo "$JSON" | jq -r '.country' 2> /dev/null); rc=$?; } || :
+  (( rc != 0 )) || [[ "$COUNTRY" == "null" ]] && COUNTRY=""
+fi
+
+if [[ -z "$COUNTRY" ]]; then
+  { JSON=$(curl -sfk https://api.ipapi.is); rc=$?; } || :
+  if (( rc == 0 )); then
+    { COUNTRY=$(echo "$JSON" | jq -r '.location.country_code' 2> /dev/null); rc=$?; } || :
+    (( rc != 0 )) || [[ "$COUNTRY" == "null" ]] && COUNTRY=""
+  fi
+fi
+
+# Select download mirror based on country
+if [ "$COUNTRY" == "CN" ]; then
+  DL="https://cndl.synology.cn/download/DSM"
+else
+  DL="https://global.synologydownload.com/download/DSM"
+fi
+
+# Select default version based on architecture
 if [ -z "$URL" ]; then
-
   if [ "$ARCH" == "amd64" ]; then
     URL="$DL/release/7.2.1/69057-1/DSM_VirtualDSM_69057.pat"
   else
     URL="$DL/release/7.0.1/42218/DSM_VirtualDSM_42218.pat"
   fi
-
 fi
 
 # Check if output is to interactive TTY
@@ -31,17 +68,42 @@ rm -f "$STORAGE"/"$BASE".agent
 rm -f "$STORAGE"/"$BASE".boot.img
 rm -f "$STORAGE"/"$BASE".system.img
 
-TMP="/tmp/dsm"
+[[ "${DEBUG}" == [Yy1]* ]] && set -x
+
+# Check filesystem
+MIN_SPACE=6442450944
 FS=$(stat -f -c %T "$STORAGE")
-[[ "$FS" == "ext"* ]] && TMP="$STORAGE/tmp"
+
+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
-MIN_SPACE=5842450944
 SPACE=$(df --output=avail -B 1 "$TMP" | tail -n 1)
-(( MIN_SPACE > SPACE )) && error "Not enough free space for installation." && exit 95
+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
 
-[[ "${DEBUG}" == [Yy1]* ]] && set -x
+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
+
+# Download the required files from the Synology website
 
 RDC="$STORAGE/dsm.rd"
 
@@ -82,8 +144,14 @@ 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=$?; } || :
+  else
     { (cd "$TMP" && cpio -idm <"$TMP/rd" 2>/dev/null); rc=$?; } || :
-  (( rc != 0 )) && error "Failed to cpio $RDC, reason $rc" && exit 92
+  fi
+
+  (( rc != 0 )) && error "Failed to extract $RDC, reason $rc" && exit 92
 
   mkdir -p /run/extract
   for file in $TMP/usr/lib/libcurl.so.4 \
@@ -175,14 +243,13 @@ BOOT=$(find "$TMP" -name "*.bin.zip")
 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
+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 87
 
 if ! fallocate -l "${SYSTEM_SIZE}" "${SYSTEM}"; then
   if ! truncate -s "${SYSTEM_SIZE}" "${SYSTEM}"; then
@@ -190,11 +257,6 @@ if ! fallocate -l "${SYSTEM_SIZE}" "${SYSTEM}"; then
   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
 
@@ -222,7 +284,13 @@ MOUNT="$TMP/system"
 rm -rf "$MOUNT" && mkdir -p "$MOUNT"
 
 mv "$HDA.tgz" "$HDA.txz"
-tar xpfJ "$HDA.txz" --absolute-names -C "$MOUNT/"
+
+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-"*
@@ -242,10 +310,6 @@ rm -rf "$MOUNT"
 
 echo "$BASE" > "$STORAGE"/dsm.ver
 
-# Check free diskspace
-SPACE=$(df --output=avail -B 1 "$STORAGE" | tail -n 1)
-(( MIN_SPACE > SPACE )) && error "Not enough free space in storage folder." && exit 94
-
 mv -f "$PAT" "$STORAGE"/"$BASE".pat
 mv -f "$BOOT" "$STORAGE"/"$BASE".boot.img
 mv -f "$SYSTEM" "$STORAGE"/"$BASE".system.img

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'}
@@ -78,33 +77,8 @@ configureDNS () {
   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
@@ -147,8 +121,6 @@ configureNAT () {
   ip link set dev "${VM_NET_TAP}" master dockerbridge
 
   # Add internet connection to the VM
-  IP=$(ip address show dev "${VM_NET_DEV}" | grep inet | awk '/inet / { print $2 }' | cut -f1 -d/)
-
   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
@@ -223,12 +195,10 @@ 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
-
 fi
 
 if [[ "${DHCP}" == [Yy1]* ]]; then

src/power.sh

@@ -0,0 +1,74 @@
+#!/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
+
+  [ ! -f "${QEMU_PID}" ] && exit 130
+  [ -f "${QEMU_COUNT}" ] && return
+
+  echo && info "Received $1 signal, shutting down..."
+  echo 0 > "${QEMU_COUNT}"
+
+  # Don't send the powerdown signal because vDSM ignores ACPI signals
+  # echo 'system_powerdown' | nc -q 1 -w 1 localhost "${QEMU_PORT}" > /dev/null
+
+  # Send shutdown command to guest agent via serial port
+  RESPONSE=$(curl -s -m 5 -S http://127.0.0.1:2210/read?command=6 2>&1)
+
+  if [[ ! "${RESPONSE}" =~ "\"success\"" ]] ; then
+
+    echo && error "Could not send shutdown command to the guest ($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
+
+  closeNetwork
+
+  return
+}
+
+_trap _graceful_shutdown SIGTERM SIGHUP SIGINT SIGABRT SIGQUIT
+
+MON_OPTS="-monitor telnet:localhost:${QEMU_PORT},server,nowait,nodelay"

src/print.sh

@@ -4,12 +4,13 @@ set -Eeuo pipefail
 info () { echo -e >&2 "\E[1;34m❯\E[1;36m $1\E[0m" ; }
 error () { echo -e >&2 "\E[1;31m❯ ERROR: $1\E[0m" ; }
 
-retry=true
+file="/run/dsm.url"
 
-while [ "$retry" = true ]
+while [ ! -f  "$file" ]
 do
 
-  sleep 2
+  sleep 3
+  [ -f "$file" ] && continue
 
   # Retrieve IP from guest VM
 
@@ -46,14 +47,16 @@ do
 
   [ -z "${IP}" ] && continue
 
-  retry=false
+  echo "${IP}:${PORT}" > $file
 
 done
 
-if [[ "$IP" == "20.20"* ]]; then
-  MSG="port ${PORT}"
+LOCATION=$(cat "$file")
+
+if [[ "$LOCATION" == "20.20"* ]]; then
+  MSG="port ${LOCATION##*:}"
 else
-  MSG="http://${IP}:${PORT}"
+  MSG="http://${LOCATION}"
 fi
 
 echo "" >&2

src/reset.sh

@@ -0,0 +1,45 @@
+#!/usr/bin/env bash
+set -Eeuo pipefail
+
+info () { echo -e "\E[1;34m❯ \E[1;36m$1\E[0m" ; }
+error () { echo -e >&2 "\E[1;31m❯ ERROR: $1\E[0m" ; }
+trap 'error "Status $? while: ${BASH_COMMAND} (line $LINENO/$BASH_LINENO)"' ERR
+
+[ ! -f "/run/entry.sh" ] && error "Script must run inside Docker container!" && exit 11
+[ "$(id -u)" -ne "0" ] && error "Script must be executed with root privileges." && exit 12
+
+# Docker environment variables
+
+: ${GPU:='N'}           # Enable GPU passthrough
+: ${DEBUG:='N'}         # Enable debugging mode
+: ${CONSOLE:='N'}       # Start in 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"
+
+return 0

src/serial.sh

@@ -5,13 +5,10 @@ set -Eeuo pipefail
 
 : ${HOST_CPU:=''}
 : ${HOST_MAC:=''}
-: ${HOST_BUILD:=''}
 : ${HOST_DEBUG:=''}
 : ${HOST_SERIAL:=''}
-: ${GUEST_SERIAL:=''}
 : ${HOST_MODEL:=''}
-: ${HOST_VERSION:=''}
-: ${HOST_TIMESTAMP:=''}
+: ${GUEST_SERIAL:=''}
 
 if [ -z "$HOST_CPU" ]; then
   HOST_CPU=$(lscpu | grep 'Model name' | cut -f 2 -d ":" | awk '{$1=$1}1' | sed 's# @.*##g' | sed s/"(R)"//g | sed 's/[^[:alnum:] ]\+/ /g' | sed 's/  */ /g')
@@ -32,22 +29,36 @@ 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[@]}" &
+  ./host.bin "${HOST_ARGS[@]}" &
   { set +x; } 2>/dev/null
   echo
 else
-  ./run/host.bin "${HOST_ARGS[@]}" >/dev/null &
+  ./host.bin "${HOST_ARGS[@]}" >/dev/null &
 fi
 
+cnt=0
+sleep 0.2
+
+while ! nc -z -w1 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 -w1 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="\
@@ -57,3 +68,5 @@ SERIAL_OPTS="\
         -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

src/server.sh

@@ -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"