fix: Simplify healthcheck

fix: Simplify healthcheck

.github/renovate.json

@@ -1,6 +1,4 @@
 {
-  "extends": [
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
-    "config:base",
+  "extends": ["config:recommended", ":disableDependencyDashboard"]
-    ":disableDependencyDashboard"
-  ]
 }

.github/workflows/build.yml

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

Dockerfile

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

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'
@@ -19,4 +20,4 @@ services:
         volumes:
             - /opt/dsm:/storage
         restart: on-failure
-        stop_grace_period: 1m
+        stop_grace_period: 2m

readme.md

@@ -10,11 +10,12 @@
 [![Pulls]][hub_url]
 
 </div></h1>
+
 Virtual DSM in a docker container.
 
 ## Features
 
- - Multi-platform
+ - Multiple disks
  - KVM acceleration
  - GPU passthrough
  - Upgrades supported
@@ -33,7 +34,6 @@ services:
       DISK_SIZE: "16G"
     devices:
       - /dev/kvm
-      - /dev/vhost-net
     cap_add:
       - NET_ADMIN
     ports:
@@ -41,7 +41,7 @@ services:
     volumes:
       - /opt/dsm:/storage
     restart: on-failure
-    stop_grace_period: 1m
+    stop_grace_period: 2m
 ```
 
 Via `docker run`
@@ -58,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. 
@@ -74,51 +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? 
-
-    By default, the entire disk space is reserved in advance. To create a growable disk that only reserves the space that is actually used, add the following environment variable:
-
-    ```yaml
-    environment:
-      ALLOCATE: "N"
-    ```
-
-    Keep in mind that this will not affect any of your existing disks, it only applies to newly created disks.
-    
   * ### How do I add multiple disks?
 
-    To mount extra volumes, modify your compose file like this:
+    To create additional disks, modify your compose file like this:
     
     ```yaml
     environment:
       DISK2_SIZE: "32G"
       DISK3_SIZE: "64G"
     volumes:
-      - /home/example2:/storage2
+      - /home/example:/storage2
-      - /home/example3:/storage3
+      - /mnt/data/example:/storage3
     ```
 
-    Additionally, it's also possible to passthrough raw disk devices like this:
+  * ### How do I create a growable disk?
+
+    By default, the entire capacity of the disk is reserved in advance. To create a growable disk that only allocates space that is actually used, add the following environment variable:
 
     ```yaml
     environment:
-      DEVICE2: "/dev/vdc1"
+      DISK_FMT: "qcow2"
-      DEVICE3: "/dev/vdc2"
+    ```
-    devices:
-      - /dev/vdc1
-      - /dev/vdc2
-    ```    
 
-    Please beware that any pre-existing partitions and data on those devices will be wiped.
+    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?
@@ -185,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?
+  * ### How do I passthrough the GPU?
-
-    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?
 
     To passthrough your Intel GPU, add the following lines to your compose file:
 
@@ -208,7 +184,18 @@ 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.

src/check.sh

@@ -1,61 +1,17 @@
 #!/usr/bin/env bash
-set -u
+set -Eeuo pipefail
 
 [ ! -f "/run/qemu.pid" ] && echo "QEMU not running yet.." && exit 0
 [ -f "/run/qemu.count" ] && echo "QEMU is shutting down.." && exit 1
 
 file="/run/dsm.url"
+[ ! -f  "$file" ] && echo "DSM has not enabled networking yet.." && exit 1
 
-if [ ! -f  "$file" ]; then
+location=$(cat "$file")
-
-  # 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
 
+if ! curl -m 20 -ILfSs "http://$location/" > /dev/null; then
+  echo "Failed to reach page at http://$location" && exit 1
 fi
 
-LOCATION=$(cat "$file")
+echo "Healthcheck OK"
-
-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

@@ -12,29 +12,29 @@ else
   [ -e /dev/kvm ] && KVM_ERR="(no write access)" || KVM_ERR="(device file missing)"
 fi
 
-if [ -n "${KVM_ERR}" ]; then
+if [ -n "$KVM_ERR" ]; then
   if [ "$ARCH" == "amd64" ]; then
-    error "KVM acceleration not detected ${KVM_ERR}, see the FAQ about this."
+    error "KVM acceleration not detected $KVM_ERR, see the FAQ about this."
-    [[ "${DEBUG}" != [Yy1]* ]] && exit 88
+    [[ "$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')
+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"
+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
+if [[ "$GPU" == [Yy1]* ]] && [[ "$ARCH" == "amd64" ]]; then
   DEF_OPTS="-nodefaults -boot strict=on -display egl-headless,rendernode=/dev/dri/renderD128"
-  DEF_OPTS="${DEF_OPTS} -device virtio-vga,id=video0,max_outputs=1,bus=pcie.0,addr=0x1"
+  DEF_OPTS="$DEF_OPTS -device virtio-vga,id=video0,max_outputs=1,bus=pcie.0,addr=0x1"
 fi
 
-ARGS="${DEF_OPTS} ${CPU_OPTS} ${RAM_OPTS} ${MAC_OPTS} ${MON_OPTS} ${SERIAL_OPTS} ${NET_OPTS} ${DISK_OPTS} ${EXTRA_OPTS} ${ARGUMENTS}"
+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

@@ -4,6 +4,7 @@ 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
@@ -14,228 +15,346 @@ 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"
+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"
 
-if [[ ! -f "${DATA}" ]] && [[ -f "$STORAGE/data$DISK_SIZE.img" ]]; then
+fmt2ext() {
-  # Fallback for legacy installs
+  local DISK_FMT=$1
-  DATA="$STORAGE/data$DISK_SIZE.img"
-fi
 
-MIN_SIZE=6442450944
+  case "${DISK_FMT,,}" in
-DISK_SIZE=$(echo "${DISK_SIZE}" | sed 's/MB/M/g;s/GB/G/g;s/TB/T/g')
+    qcow2)
-DATA_SIZE=$(numfmt --from=iec "${DISK_SIZE}")
+      echo "qcow2"
+      ;;
+    raw)
+      echo "img"
+      ;;
+    *)
+      error "Unrecognized disk format: $DISK_FMT" && exit 88
+      ;;
+  esac
+}
 
-if (( DATA_SIZE < MIN_SIZE )); then
+ext2fmt() {
-  error "Please increase DISK_SIZE to at least 6 GB." && exit 83
+  local DISK_EXT=$1
-fi
 
-if [ -f "${DATA}" ]; then
+  case "${DISK_EXT,,}" in
+    qcow2)
+      echo "qcow2"
+      ;;
+    img)
+      echo "raw"
+      ;;
+    *)
+      error "Unrecognized file extension: .$DISK_EXT" && exit 88
+      ;;
+  esac
+}
 
-  OLD_SIZE=$(stat -c%s "${DATA}")
+getSize() {
+  local DISK_FILE=$1
+  local DISK_EXT DISK_FMT
 
-  if [ "$DATA_SIZE" -gt "$OLD_SIZE" ]; then
+  DISK_EXT="$(echo "${DISK_FILE//*./}" | sed 's/^.*\.//')"
+  DISK_FMT="$(ext2fmt "$DISK_EXT")"
 
-    info "Resizing data disk from $OLD_SIZE to $DATA_SIZE bytes.."
+  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 88
+      ;;
+  esac
+}
 
-    if [[ "${ALLOCATE}" == [Nn]* ]]; then
+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
 
-      # Resize file by changing its length
+  GB=$(( (CUR_SIZE + 1073741823)/1073741824 ))
-      if ! truncate -s "${DATA_SIZE}" "${DATA}"; then
+  info "Resizing $DISK_DESC from ${GB}G to $DISK_SPACE .."
-        error "Could not resize the file for the virtual disk." && exit 85
+  FAIL="Could not resize $DISK_FMT file of $DISK_DESC ($DISK_FILE) from ${GB}G to $DISK_SPACE .."
-      fi
 
-    else
+  REQ=$((DATA_SIZE-CUR_SIZE))
+  (( REQ < 1 )) && error "Shrinking disks is not supported!" && exit 84
 
-      REQ=$((DATA_SIZE-OLD_SIZE))
+  case "${DISK_FMT,,}" in
+    raw)
+      if [[ "$ALLOCATE" == [Nn]* ]]; then
 
-      # Check free diskspace
+        # Resize file by changing its length
-      SPACE=$(df --output=avail -B 1 "${STORAGE}" | tail -n 1)
+        if ! truncate -s "$DISK_SPACE" "$DISK_FILE"; then
-
+          error "$FAIL" && exit 85
-      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
+      else
 
-        GB=$(( (REQ + 1073741823)/1073741824 ))
+        # Check free diskspace
+        SPACE=$(df --output=avail -B 1 "$DIR" | tail -n 1)
+        SPACE_GB=$(( (SPACE + 1073741823)/1073741824 ))
 
-        info "Preallocating ${GB} GB of diskspace, please wait..."
+        if (( REQ > SPACE )); then
-        dd if=/dev/urandom of="${DATA}" seek="${OLD_SIZE}" count="${REQ}" bs=1M iflag=count_bytes oflag=seek_bytes status=none
+          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 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 "$FAIL" && exit 85
+          fi
+        fi
 
       fi
+      ;;
+    qcow2)
+      if ! qemu-img resize -f "$DISK_FMT" "$DISK_FILE" "$DISK_SPACE" ; then
+        error "$FAIL" && exit 85
+      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 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 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 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 "$FAIL" && exit 87
+          fi
+        fi
+
+      fi
+      ;;
+    qcow2)
+      if ! qemu-img create -f "$DISK_FMT" -- "$DISK_FILE" "$DISK_SPACE" ; then
+        rm -f "$DISK_FILE"
+        error "$FAIL" && exit 89
+      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 83
+  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 89
+      fi
+
+      mv "$TMP_FILE" "$DISK_FILE"
+      rm -f "$PREV_FILE"
+      info "Conversion of $DISK_DESC completed succesfully!"
     fi
   fi
 
-  if [ "$DATA_SIZE" -lt "$OLD_SIZE" ]; then
+  if [ -f "$DISK_FILE" ]; then
 
-    info "Shrinking existing disks is not supported yet!"
+    CUR_SIZE=$(getSize "$DISK_FILE")
-    info "Creating backup of old drive in storage folder..."
 
-    mv -f "${DATA}" "${DATA}.bak"
+    if [ "$DATA_SIZE" -gt "$CUR_SIZE" ]; then
-
+      resizeDisk "$DISK_FILE" "$CUR_SIZE" "$DATA_SIZE" "$DISK_SPACE" "$DISK_DESC" "$DISK_FMT" || exit $?
-  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
+    createDisk "$DISK_FILE" "$DISK_SPACE" "$DISK_DESC" "$DISK_FMT" || exit $?
-    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
+  DISK_OPTS="$DISK_OPTS \
-  if [ ! -f "${DATA}" ]; then
+    -device virtio-scsi-pci,id=hw-$DISK_ID,bus=pcie.0,addr=$DISK_ADDRESS \
-    error "Virtual disk does not exist ($DATA)" && exit 88
+    -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
 
-# Check the filesize
+DISK3_FILE="/storage3/data3"
-SIZE=$(stat -c%s "${DATA}")
+if [ ! -f "$DISK3_FILE.img" ]; then
-
+  # Fallback for legacy installs
-if [[ SIZE -ne DATA_SIZE ]]; then
+  FALLBACK="/storage3/data.img"
-  error "Virtual disk has the wrong size: ${SIZE}" && exit 89
+  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
 
-DISK_OPTS="\
+DISK4_FILE="/storage4/data4"
-    -device virtio-scsi-pci,id=hw-synoboot,bus=pcie.0,addr=0xa \
+DISK5_FILE="/storage5/data5"
-    -drive file=${BOOT},if=none,id=drive-synoboot,format=raw,cache=${DISK_CACHE},aio=${DISK_IO},discard=${DISK_DISCARD},detect-zeroes=on \
+DISK6_FILE="/storage6/data6"
-    -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"
 
 : ${DISK2_SIZE:=''}
-EXTRA_SIZE=DISK2_SIZE
-EXTRA_DISK="/storage2/data.img"
-
-if [ -d "$(dirname "${EXTRA_DISK}")" ]; then
-
-  if [ ! -f "${EXTRA_DISK}" ]; then
-    [ -z "$EXTRA_SIZE" ] && EXTRA_SIZE="16G"
-    if ! truncate -s "${EXTRA_SIZE}" "${EXTRA_DISK}"; then
-      error "Could not create the file for the second disk." && exit 53
-    fi
-  fi
-
-  if [ -n "$EXTRA_SIZE" ]; then
-    CUR_SIZE=$(stat -c%s "${EXTRA_DISK}")
-    DATA_SIZE=$(numfmt --from=iec "${EXTRA_SIZE}")
-    if [ "$DATA_SIZE" -gt "$CUR_SIZE" ]; then
-      truncate -s "${EXTRA_SIZE}" "${EXTRA_DISK}"
-    fi
-  fi
-  
-  DISK_OPTS="${DISK_OPTS} \
-    -device virtio-scsi-pci,id=hw-userdata2,bus=pcie.0,addr=0xd \
-    -drive file=${EXTRA_DISK},if=none,id=drive-userdata2,format=raw,cache=${DISK_CACHE},aio=${DISK_IO},discard=${DISK_DISCARD},detect-zeroes=on \
-    -device scsi-hd,bus=hw-userdata2.0,channel=0,scsi-id=0,lun=0,drive=drive-userdata2,id=userdata2,rotation_rate=${DISK_ROTATION},bootindex=4"
-
-fi
-
 : ${DISK3_SIZE:=''}
-EXTRA_SIZE=DISK3_SIZE
+: ${DISK4_SIZE:=''}
-EXTRA_DISK="/storage3/data.img"
+: ${DISK5_SIZE:=''}
+: ${DISK6_SIZE:=''}
 
-if [ -d "$(dirname "${EXTRA_DISK}")" ]; then
+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 $?
 
-  if [ ! -f "${EXTRA_DISK}" ]; then
+addDevice () {
-    [ -z "$EXTRA_SIZE" ] && EXTRA_SIZE="16G"
-    if ! truncate -s "${EXTRA_SIZE}" "${EXTRA_DISK}"; then
-      error "Could not create the file for the third disk." && exit 54
-    fi
-  fi
 
-  if [ -n "$EXTRA_SIZE" ]; then
+  local DISK_ID=$1
-    CUR_SIZE=$(stat -c%s "${EXTRA_DISK}")
+  local DISK_DEV=$2
-    DATA_SIZE=$(numfmt --from=iec "${EXTRA_SIZE}")
+  local DISK_INDEX=$3
-    if [ "$DATA_SIZE" -gt "$CUR_SIZE" ]; then
+  local DISK_ADDRESS=$4
-      truncate -s "${EXTRA_SIZE}" "${EXTRA_DISK}"
-    fi
-  fi
 
-  DISK_OPTS="${DISK_OPTS} \
+  [ -z "$DISK_DEV" ] && return 0
-    -device virtio-scsi-pci,id=hw-userdata3,bus=pcie.0,addr=0xe \
+  [ ! -b "$DISK_DEV" ] && error "Device $DISK_DEV cannot be found! Please add it to the 'devices' section of your compose file." && exit 55
-    -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"
 
-fi
+  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:=''}
 
-if [ -n "${DEVICE}" ]; then
+addDevice "userdata7" "$DEVICE" "6" "0xf" || exit $?
-
+addDevice "userdata8" "$DEVICE2" "7" "0x5" || exit $?
-  [ ! -b "${DEVICE}" ] && error "Device ${DEVICE} cannot be found! Please add it to the 'devices' section of your compose file." && exit 55
+addDevice "userdata9" "$DEVICE3" "8" "0x6" || exit $?
-
+addDevice "userdata4" "$DEVICE4" "9" "0x7" || exit $?
-  DISK_OPTS="${DISK_OPTS} \
+addDevice "userdata5" "$DEVICE5" "10" "0x8" || exit $?
-    -device virtio-scsi-pci,id=hw-userdata4,bus=pcie.0,addr=0xf \
+addDevice "userdata6" "$DEVICE6" "11" "0x9" || exit $?
-    -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
 
 return 0

src/entry.sh

@@ -1,28 +1,33 @@
 #!/usr/bin/env bash
 set -Eeuo pipefail
 
-echo "❯ Starting Virtual DSM for Docker v${VERSION}..."
+echo "❯ Starting Virtual DSM for Docker v$(</run/version)..."
 echo "❯ For support visit https://github.com/vdsm/virtual-dsm/"
 
 cd /run
 
-. reset.sh   # Initialize system
+. reset.sh      # Initialize system
-. install.sh   # Run installation
+. install.sh    # Run installation
-. disk.sh     # Initialize disks
+. disk.sh       # Initialize disks
-. network.sh  # Initialize network
+. network.sh    # Initialize network
-. gpu.sh     # Initialize graphics
+. gpu.sh        # Initialize graphics
-. serial.sh   # Initialize serialport
+. serial.sh     # Initialize serialport
-. power.sh    # Configure shutdown
+. power.sh      # Configure shutdown
-. config.sh    # Configure arguments
+. 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
+  [[ "$DEBUG" == [Yy1]* ]] && info "$VERS" && set -x
-  qemu-system-x86_64 ${ARGS:+ $ARGS} & echo $! > "${QEMU_PID}"
+  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 $!
+tail --pid "$(cat "$QEMU_PID")" --follow /dev/null & wait $!

src/gpu.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 set -Eeuo pipefail
 
-if [[ "${GPU}" != [Yy1]* ]] || [[ "$ARCH" != "amd64" ]]; then
+if [[ "$GPU" != [Yy1]* ]] || [[ "$ARCH" != "amd64" ]]; then
   return 0
 fi
 
@@ -18,28 +18,7 @@ fi
 chmod 666 /dev/dri/card0
 chmod 666 /dev/dri/renderD128
 
-if ! apt-mark showinstall | grep -q "xserver-xorg-video-intel"; then
+addPackage "xserver-xorg-video-intel" "Intel GPU drivers"
-
+addPackage "qemu-system-modules-opengl" "OpenGL module"
-  info "Installing Intel GPU drivers..."
-
-  export DEBCONF_NOWARNINGS="yes"
-  export DEBIAN_FRONTEND="noninteractive"
-
-  apt-get -qq update
-  apt-get -qq --no-install-recommends -y install xserver-xorg-video-intel > /dev/null
-
-fi
-
-if ! apt-mark showinstall | grep -q "qemu-system-modules-opengl"; then
-
-  info "Installing OpenGL module..."
-
-  export DEBCONF_NOWARNINGS="yes"
-  export DEBIAN_FRONTEND="noninteractive"
-
-  apt-get -qq update
-  apt-get -qq --no-install-recommends -y install qemu-system-modules-opengl > /dev/null
-
-fi
 
 return 0

src/install.sh

@@ -1,11 +1,11 @@
 #!/usr/bin/env bash
 set -Eeuo pipefail
 
-STORAGE="/storage"
+: ${URL:=''}    # URL of the PAT file to be downloaded.
-[ ! -d "$STORAGE" ] && error "Storage folder (${STORAGE}) not found!" && exit 13
+: ${DEV:='Y'}   # Controls whether device nodes are created.
 
 if [ -f "$STORAGE"/dsm.ver ]; then
-  BASE=$(cat "${STORAGE}/dsm.ver")
+  BASE=$(cat "$STORAGE/dsm.ver")
 else
   # Fallback for old installs
   BASE="DSM_VirtualDSM_42962"
@@ -14,24 +14,80 @@ fi
 [ -n "$URL" ] && BASE=$(basename "$URL" .pat)
 
 if [[ -f "$STORAGE/$BASE.boot.img" ]] && [[ -f "$STORAGE/$BASE.system.img" ]]; then
-  # Previous installation found
+  return 0  # Previous installation found
-  return 0
 fi
 
 # Display wait message
 /run/server.sh 5000 install &
 
-# Download the required files from the Synology website
+DL=""
-DL="https://global.synologydownload.com/download/DSM"
+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
 
 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
 
+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
@@ -41,38 +97,11 @@ else
   PROGRESS="--progress=dot:giga"
 fi
 
-BASE=$(basename "$URL" .pat)
+# Download the required files from the Synology website
-
-rm -f "$STORAGE"/"$BASE".pat
-rm -f "$STORAGE"/"$BASE".agent
-rm -f "$STORAGE"/"$BASE".boot.img
-rm -f "$STORAGE"/"$BASE".system.img
-
-MIN_SPACE=6442450944
-FS=$(stat -f -c %T "$STORAGE")
-
-if [[ "$FS" != "fat"* && "$FS" != "vfat"* && "$FS" != "exfat"* && \
-        "$FS" != "ntfs"* && "$FS" != "fuse"* && "$FS" != "msdos"* ]]; then
-  TMP="$STORAGE/tmp"
-else
-  TMP="/tmp/dsm"
-  SPACE=$(df --output=avail -B 1 /tmp | tail -n 1)
-  (( MIN_SPACE > SPACE )) && TMP="$STORAGE/tmp"
-fi
-
-rm -rf /tmp/dsm
-rm -rf "$STORAGE/tmp"
-rm -rf "$TMP" && mkdir -p "$TMP"
-
-# Check free diskspace
-SPACE=$(df --output=avail -B 1 "$TMP" | tail -n 1)
-(( MIN_SPACE > SPACE )) && error "Not enough free space for installation, need at least 6 GB." && exit 95
-
-[[ "${DEBUG}" == [Yy1]* ]] && set -x
 
 RDC="$STORAGE/dsm.rd"
 
-if [ ! -f "${RDC}" ]; then
+if [ ! -f "$RDC" ]; then
 
   info "Install: Downloading installer..."
 
@@ -81,7 +110,7 @@ if [ ! -f "${RDC}" ]; then
   VERIFY="b4215a4b213ff5154db0488f92c87864"
   LOC="$DL/release/7.0.1/42218/DSM_VirtualDSM_42218.pat"
 
-  { curl -r "$POS" -sfk -o "$RD" "$LOC"; rc=$?; } || :
+  { curl -r "$POS" -sfk -S -o "$RD" "$LOC"; rc=$?; } || :
   (( rc != 0 )) && error "Failed to download $LOC, reason: $rc" && exit 60
 
   SUM=$(md5sum "$RD" | cut -f 1 -d " ")
@@ -95,7 +124,7 @@ if [ ! -f "${RDC}" ]; then
     { wget "$LOC" -O "$PAT" -q --no-check-certificate --show-progress "$PROGRESS"; rc=$?; } || :
     (( rc != 0 )) && error "Failed to download $LOC, reason: $rc" && exit 60
 
-    tar --extract --file="$PAT" --directory="$(dirname "${RD}")"/. "$(basename "${RD}")"
+    tar --extract --file="$PAT" --directory="$(dirname "$RD")"/. "$(basename "$RD")"
     rm "$PAT"
 
   fi
@@ -104,13 +133,20 @@ if [ ! -f "${RDC}" ]; then
 
 fi
 
-if [ -f "${RDC}" ]; then
+if [ -f "$RDC" ]; then
 
   { xz -dc <"$RDC" >"$TMP/rd" 2>/dev/null; rc=$?; } || :
   (( rc != 1 )) && error "Failed to unxz $RDC, reason $rc" && exit 91
 
-  { (cd "$TMP" && cpio -idm <"$TMP/rd" 2>/dev/null); rc=$?; } || :
+  if [[ "$DEV" == [Nn]* ]]; then
-  (( rc != 0 )) && error "Failed to cpio $RDC, reason $rc" && exit 92
+    # 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 \
@@ -143,9 +179,17 @@ info "Install: Downloading $(basename "$URL")..."
 PAT="/$BASE.pat"
 rm -f "$PAT"
 
-{ wget "$URL" -O "$PAT" -q --no-check-certificate --show-progress "$PROGRESS"; rc=$?; } || :
+if [[ "$URL" == "file://"* ]]; then
+
+  cp "${URL:7}" "$PAT"
+
+else
+
+  { wget "$URL" -O "$PAT" -q --no-check-certificate --show-progress "$PROGRESS"; rc=$?; } || :
+  (( rc != 0 )) && error "Failed to download $URL, reason: $rc" && exit 69
+
+fi
 
-(( rc != 0 )) && error "Failed to download $URL, reason: $rc" && exit 69
 [ ! -f "$PAT" ] && error "Failed to download $URL" && exit 69
 
 SIZE=$(stat -c%s "$PAT")
@@ -161,17 +205,7 @@ if { tar tf "$PAT"; } >/dev/null 2>&1; then
 
 else
 
-  if [ "$ARCH" != "amd64" ]; then
+  [ "$ARCH" != "amd64" ] && addPackage "qemu-user" "QEMU"
-
-    info "Install: Installing QEMU..."
-
-    export DEBCONF_NOWARNINGS="yes"
-    export DEBIAN_FRONTEND="noninteractive"
-
-    apt-get -qq update
-    apt-get -qq --no-install-recommends -y install qemu-user > /dev/null
-
-  fi
 
   info "Install: Extracting downloaded image..."
 
@@ -202,38 +236,32 @@ 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 ! fallocate -l "$SYSTEM_SIZE" "$SYSTEM"; then
-  if ! truncate -s "${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
+    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
+[ ! -f "$SYSTEM" ] && error "System disk does not exist ($SYSTEM)" && exit 89
 
 # Check the filesize
-SIZE=$(stat -c%s "${SYSTEM}")
+SIZE=$(stat -c%s "$SYSTEM")
-[[ SIZE -ne SYSTEM_SIZE ]] && rm -f "${SYSTEM}" && error "System disk has the wrong size: ${SIZE}" && exit 90
+[[ 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 "device: $SYSTEM"
         echo "unit: sectors"
         echo "sector-size: 512"
         echo ""
@@ -249,7 +277,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-"*
@@ -269,19 +303,18 @@ rm -rf "$MOUNT"
 
 echo "$BASE" > "$STORAGE"/dsm.ver
 
-if [[ "$TMP" != "$STORAGE/tmp" ]]; then
+if [[ "$URL" == "file://$STORAGE/$BASE.pat" ]]; then
-  # Check free diskspace
+  rm -f "$PAT"
-  SPACE=$(df --output=avail -B 1 "$STORAGE" | tail -n 1)
+else
-  (( MIN_SPACE > SPACE )) && error "Not enough free space in storage folder, need at least 6 GB." && exit 94
+  mv -f "$PAT" "$STORAGE"/"$BASE".pat
 fi
 
-mv -f "$PAT" "$STORAGE"/"$BASE".pat
 mv -f "$BOOT" "$STORAGE"/"$BASE".boot.img
 mv -f "$SYSTEM" "$STORAGE"/"$BASE".system.img
 
 rm -rf "$TMP"
 
 { set +x; } 2>/dev/null
-[[ "${DEBUG}" == [Yy1]* ]] && echo
+[[ "$DEBUG" == [Yy1]* ]] && echo
 
 return 0

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)
+  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
+  (( 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
+  if [[ ! -e "$TAP_PATH" ]]; then
-    { mknod "${TAP_PATH}" c "$MAJOR" "$MINOR" ; rc=$?; } || :
+    { mknod "$TAP_PATH" c "$MAJOR" "$MINOR" ; rc=$?; } || :
-    (( rc != 0 )) && error "Cannot mknod: ${TAP_PATH} ($rc)" && exit 20
+    (( 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
+  # 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"
-  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
-
   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,21 +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
-  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 POSTROUTING -o "${VM_NET_DEV}" -j MASQUERADE
+  iptables -t nat -A PREROUTING -i "$VM_NET_DEV" -d "$IP" -p udp  -j DNAT --to "$VM_NET_IP"
-  iptables -t nat -A PREROUTING -i "${VM_NET_DEV}" -d "${IP}" -p tcp  -j DNAT --to $VM_NET_IP
-  iptables -t nat -A PREROUTING -i "${VM_NET_DEV}" -d "${IP}" -p udp  -j DNAT --to $VM_NET_IP
 
   if (( KERNEL > 4 )); then
     # Hack for guest VMs complaining about "bad udp checksums in 5 packets"
@@ -159,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
@@ -169,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"
@@ -181,15 +154,19 @@ configureNAT () {
 
 closeNetwork () {
 
-  if [[ "${DHCP}" == [Yy1]* ]]; then
+  if [[ "$DHCP" == [Yy1]* ]]; then
 
-    ip link set "${VM_NET_TAP}" down || true
+    { pkill -f server.sh || true; } 2>/dev/null
-    ip link delete "${VM_NET_TAP}" || true
+
+    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
+    { pkill -f dnsmasq || true; } 2>/dev/null
-    ip link delete "${VM_NET_TAP}" || true
+
+    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
@@ -223,18 +200,16 @@ 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
+if [[ "$DEBUG" == [Yy1]* ]]; then
-
+  info "Container IP is $IP with gateway $GATEWAY" && echo
-  IP=$(ip address show dev "${VM_NET_DEV}" | grep inet | awk '/inet / { print $2 }' | cut -f1 -d/)
-  info "Container IP is ${IP} with gateway ${GATEWAY}" && echo
-
 fi
 
-if [[ "${DHCP}" == [Yy1]* ]]; then
+if [[ "$DHCP" == [Yy1]* ]]; then
 
   if [[ "$GATEWAY" == "172."* ]]; then
-    if [[ "${DEBUG}" == [Yy1]* ]]; then
+    if [[ "$DEBUG" == [Yy1]* ]]; then
       info "Warning: Are you sure the container is on a macvlan network?"
     else
       error "You can only enable DHCP while the container is on a macvlan network!" && exit 86
@@ -254,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

src/power.sh

@@ -5,12 +5,11 @@ set -Eeuo pipefail
 
 QEMU_PORT=7100
 QEMU_TIMEOUT=50
-
 QEMU_PID=/run/qemu.pid
 QEMU_COUNT=/run/qemu.count
 
-rm -f "${QEMU_PID}"
+rm -f "$QEMU_PID"
-rm -f "${QEMU_COUNT}"
+rm -f "$QEMU_COUNT"
 
 _trap(){
     func="$1" ; shift
@@ -22,53 +21,64 @@ _trap(){
 _graceful_shutdown() {
 
   set +e
+  local cnt response
 
-  [ ! -f "${QEMU_PID}" ] && exit 130
+  [ ! -f "$QEMU_PID" ] && exit 130
-  [ -f "${QEMU_COUNT}" ] && return
+  [ -f "$QEMU_COUNT" ] && return
 
-  echo && info "Received $1 signal, shutting down..."
+  echo 0 > "$QEMU_COUNT"
-  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
-  RESPONSE=$(curl -s -m 5 -S http://127.0.0.1:2210/read?command=6 2>&1)
+  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
+  if [[ "$response" =~ "\"success\"" ]]; then
 
-    echo && error "Could not send shutdown command to the guest ($RESPONSE)"
+    echo && info "Virtual DSM is now ready to shutdown..."
 
-    kill -15 "$(cat "${QEMU_PID}")"
+  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
+  while [ "$(cat $QEMU_COUNT)" -lt "$QEMU_TIMEOUT" ]; do
 
     # Increase the counter
-    echo $(($(cat ${QEMU_COUNT})+1)) > ${QEMU_COUNT}
+    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
+    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}"
+      cnt="$(cat $QEMU_COUNT)/$QEMU_TIMEOUT"
-      [[ "${DEBUG}" == [Yy1]* ]] && info "Shutting down, waiting... (${CNT})"
+      [[ "$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
+  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"
+MON_OPTS="-monitor telnet:localhost:$QEMU_PORT,server,nowait,nodelay"

src/print.sh

@@ -1,66 +1,80 @@
 #!/usr/bin/env bash
 set -Eeuo pipefail
 
-info () { echo -e >&2 "\E[1;34m❯\E[1;36m $1\E[0m" ; }
+info () { printf "%b%s%b" "\E[1;34m❯ \E[1;36m" "$1" "\E[0m\n" >&2; }
-error () { echo -e >&2 "\E[1;31m❯ ERROR: $1\E[0m" ; }
+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 "$file" ] && continue
+
+  [ -f "$shutdown" ] && exit 1
+
+  # Healthcheck may have intervened
+  [ -f "$file" ] && break
 
   # Retrieve IP from guest VM
+  { json=$(curl -m 20 -sk "$url"); rc=$?; } || :
 
-  set +e
+  [ -f "$shutdown" ] && exit 1
-  RESPONSE=$(curl -s -m 16 -S http://127.0.0.1:2210/read?command=10 2>&1)
+  (( rc != 0 )) && error "Failed to connect to guest: curl error $rc" && continue
-  set -e
 
-  if [[ ! "${RESPONSE}" =~ "\"success\"" ]] ; then
+  { result=$(echo "$json" | jq -r '.status'); rc=$?; } || :
-    error "Failed to connect to guest: $RESPONSE" && continue
+  (( rc != 0 )) && error "$jq_err $rc ( $json )" && continue
+  [[ "$result" == "null" ]] && error "$resp_err $json" && continue
+
+  if [[ "$result" != "success" ]] ; then
+    { msg=$(echo "$json" | jq -r '.message'); rc=$?; } || :
+    error "Guest replied $result: $msg" && continue
   fi
 
-  # Retrieve the HTTP port number
+  { port=$(echo "$json" | jq -r '.data.data.dsm_setting.data.http_port'); rc=$?; } || :
-  if [[ ! "${RESPONSE}" =~ "\"http_port\"" ]] ; then
+  (( rc != 0 )) && error "$jq_err $rc ( $json )" && continue
-    error "Failed to parse response from guest: $RESPONSE" && continue
+  [[ "$port" == "null" ]] && error "$resp_err $json" && continue
-  fi
+  [ -z "$port" ] && continue
 
-  rest=${RESPONSE#*http_port}
+  { ip=$(echo "$json" | jq -r '.data.data.ip.data[] | select((.name=="eth0") and has("ip")).ip'); rc=$?; } || :
-  rest=${rest#*:}
+  (( rc != 0 )) && error "$jq_err $rc ( $json )" && continue
-  rest=${rest%%,*}
+  [[ "$ip" == "null" ]] && error "$resp_err $json" && continue
-  PORT=${rest%%\"*}
+  [ -z "$ip" ] && continue
 
-  [ -z "${PORT}" ] && continue
+  echo "$ip:$port" > $file
-
-  # Retrieve the IP address
-  if [[ ! "${RESPONSE}" =~ "eth0" ]] ; then
-    error "Failed to parse response from guest: $RESPONSE" && continue
-  fi
-
-  rest=${RESPONSE#*eth0}
-  rest=${rest#*ip}
-  rest=${rest#*:}
-  rest=${rest#*\"}
-  IP=${rest%%\"*}
-
-  [ -z "${IP}" ] && continue
-
-  echo "${IP}:${PORT}" > $file
 
 done
 
-LOCATION=$(cat "$file")
+[ -f "$shutdown" ] && exit 1
+
+location=$(cat "$file")
+
+if [[ "$location" != "20.20"* ]]; then
+
+  msg="http://$location"
 
-if [[ "$LOCATION" == "20.20"* ]]; then
-  MSG="port ${LOCATION##*:}"
 else
-  MSG="http://${LOCATION}"
+
+  ip=$(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 "-----------------------------------------------------------"
-info " You can now login to DSM at ${MSG}"
+info " You can now login to DSM at $msg"
-info "--------------------------------------------------------"
+info "-----------------------------------------------------------"
 echo "" >&2

src/reset.sh

@@ -1,23 +1,25 @@
 #!/usr/bin/env bash
 set -Eeuo pipefail
 
-info () { echo -e "\E[1;34m❯ \E[1;36m$1\E[0m" ; }
+info () { printf "%b%s%b" "\E[1;34m❯ \E[1;36m" "$1" "\E[0m\n"; }
-error () { echo -e >&2 "\E[1;31m❯ ERROR: $1\E[0m" ; }
+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
+
+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
 
-: ${URL:=''}            # URL of the PAT file
 : ${GPU:='N'}           # Enable GPU passthrough
 : ${DEBUG:='N'}         # Enable debugging mode
+: ${COUNTRY:=''}        # Country code for mirror
+: ${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
-: ${RAM_SIZE:='512M'}   # Maximum RAM amount
 
 # Helper variables
 
@@ -26,10 +28,78 @@ 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

src/serial.sh

@@ -25,15 +25,15 @@ else
 fi
 
 HOST_ARGS=()
-HOST_ARGS+=("-cpu=${CPU_CORES}")
+HOST_ARGS+=("-cpu=$CPU_CORES")
-HOST_ARGS+=("-cpu_arch=${HOST_CPU}")
+HOST_ARGS+=("-cpu_arch=$HOST_CPU")
 
-[ -n "$HOST_MAC" ] && HOST_ARGS+=("-mac=${HOST_MAC}")
+[ -n "$HOST_MAC" ] && HOST_ARGS+=("-mac=$HOST_MAC")
-[ -n "$HOST_MODEL" ] && HOST_ARGS+=("-model=${HOST_MODEL}")
+[ -n "$HOST_MODEL" ] && HOST_ARGS+=("-model=$HOST_MODEL")
-[ -n "$HOST_SERIAL" ] && HOST_ARGS+=("-hostsn=${HOST_SERIAL}")
+[ -n "$HOST_SERIAL" ] && HOST_ARGS+=("-hostsn=$HOST_SERIAL")
-[ -n "$GUEST_SERIAL" ] && HOST_ARGS+=("-guestsn=${GUEST_SERIAL}")
+[ -n "$GUEST_SERIAL" ] && HOST_ARGS+=("-guestsn=$GUEST_SERIAL")
 
-if [[ "${HOST_DEBUG}" == [Yy1]* ]]; then
+if [[ "$HOST_DEBUG" == [Yy1]* ]]; then
   set -x
   ./host.bin "${HOST_ARGS[@]}" &
   { set +x; } 2>/dev/null
@@ -45,18 +45,18 @@ fi
 cnt=0
 sleep 0.2
 
-while ! nc -z -w1 127.0.0.1 2210 > /dev/null 2>&1; do
+while ! nc -z -w2 127.0.0.1 2210 > /dev/null 2>&1; do
   sleep 0.1
   cnt=$((cnt + 1))
-  (( cnt > 20 )) && error "Failed to connect to qemu-host.." && exit 58
+  (( cnt > 50 )) && error "Failed to connect to qemu-host.." && exit 58
 done
 
 cnt=0
 
-while ! nc -z -w1 127.0.0.1 12345 > /dev/null 2>&1; do
+while ! nc -z -w2 127.0.0.1 12345 > /dev/null 2>&1; do
   sleep 0.1
   cnt=$((cnt + 1))
-  (( cnt > 20 )) && error "Failed to connect to qemu-host.." && exit 59
+  (( cnt > 50 )) && error "Failed to connect to qemu-host.." && exit 59
 done
 
 # Configure serial ports

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<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 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<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: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:"${1:-5000}",reuseaddr,fork,crlf SYSTEM:"cat $TMP_FILE" 2> /dev/null & wait $!
   
   exit
   
@@ -46,15 +46,15 @@ if [[ "$2" != "/run/ip.sh" ]]; then
 
 else
 
-  BODY="The location of DSM is <a href='http://\${LOCATION}'>http://\${LOCATION}</a><script>"
+  BODY="The location of DSM is <a href='http://\$LOCATION'>http://\$LOCATION</a><script>"
-  BODY="${BODY}setTimeout(function(){ window.location.assign('http://\${LOCATION}'); }, 3000);</script>"
+  BODY="$BODY setTimeout(function(){ window.location.assign('http://\$LOCATION'); }, 3000);</script>"
   WAIT="Please wait while discovering IP...<script>setTimeout(() => { document.location.reload(); }, 4999);</script>"
 
   HTML=$(html "xxx")
 
   { echo "#!/bin/bash"
     echo "[ -f \"/run/dsm.url\" ] && LOCATION=\$(cat \"/run/dsm.url\")"
-    echo "HTML=\"$HTML\"; [ -z \"\${LOCATION}\" ] && BODY=\"$WAIT\" || BODY=\"$BODY\"; HTML=\${HTML/xxx/\$BODY}"
+    echo "HTML=\"$HTML\"; [ -z \"\$LOCATION\" ] && BODY=\"$WAIT\" || BODY=\"$BODY\"; HTML=\${HTML/xxx/\$BODY}"
     echo "printf '%b' \"HTTP/1.1 200 OK\\nContent-Length: \${#HTML}\\nConnection: close\\n\\n\$HTML\""
   } > "$TMP_FILE"