2025-06-10 02:23:53 +08:00
22 changed files with 556 additions and 776 deletions
--- a/.devcontainer.json
+++ b/.devcontainer.json
@ -1,6 +0,0 @@
 {
  "name": "dsm",
  "service": "dsm",
  "forwardPorts": [5000],
  "dockerComposeFile": "compose.yml"
 }
--- a/.github/ISSUE_TEMPLATE/1-issue.yml
+++ b/.github/ISSUE_TEMPLATE/1-issue.yml
@ -21,7 +21,6 @@ body:
    attributes:
      label: Docker compose
      description: The compose file (or otherwise the `docker run` command used).
      render: yaml
    validations:
      required: true
  - type: textarea
@ -29,7 +28,6 @@ body:
    attributes:
      label: Docker log
      description: The logfile of the container (as shown by `docker logs dsm`).
      render: shell
    validations:
      required: true
  - type: textarea
--- a/.github/ISSUE_TEMPLATE/3-bug.yml
+++ b/.github/ISSUE_TEMPLATE/3-bug.yml
@ -23,7 +23,6 @@ body:
    attributes:
      label: Docker compose
      description: The compose file (or otherwise the `docker run` command used).
      render: yaml
    validations:
      required: true
  - type: textarea
@ -31,7 +30,6 @@ body:
    attributes:
      label: Docker log
      description: The logfile of the container (as shown by `docker logs dsm`).
      render: shell
    validations:
      required: true
  - type: textarea
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@ -20,5 +20,5 @@ jobs:
        uses: hadolint/hadolint-action@v3.1.0
        with:
          dockerfile: Dockerfile
-          ignore: DL3008,DL3003,DL3006,DL3013
+          ignore: DL3008,DL3003,DL3006
          failure-threshold: warning
--- a/25
+++ b/25
@ -1,4 +1,4 @@
-FROM qemux/qemu-host:2.05 AS builder
+FROM qemux/qemu-host:2.05 as builder
 #  FROM golang as builder
 #  WORKDIR /
@ -15,21 +15,19 @@ ARG DEBCONF_NOWARNINGS="yes"
 ARG DEBIAN_FRONTEND="noninteractive"
 ARG DEBCONF_NONINTERACTIVE_SEEN="true"
-RUN set -eu && \
+RUN set -eu && extra="" && \
    if [ "$TARGETPLATFORM" != "linux/amd64" ]; then extra="qemu-user"; fi && \
    apt-get update && \
    apt-get --no-install-recommends -y install \
        jq \
        tini \
        curl \
        cpio \
        wget \
        fdisk \
        unzip \
        nginx \
        procps \
        python3 \
        python3-pip \
        python3-msgpack \
        python3-pysodium \
        xz-utils \
        iptables \
        iproute2 \
@ -37,16 +35,12 @@ RUN set -eu && \
        dnsmasq \
        fakeroot \
        net-tools \
        e2fsprogs \
        qemu-utils \
        iputils-ping \
        ca-certificates \
        netcat-openbsd \
-        qemu-system-x86 && \
+        qemu-system-x86 \
        "$extra" && \
    apt-get clean && \
    pip3 install --no-cache-dir --break-system-packages --root-user-action=ignore dissect.cstruct && \
    mkdir -p /etc/qemu && \
    echo "allow br0" > /etc/qemu/bridge.conf && \
    unlink /etc/nginx/sites-enabled/default && \
    sed -i 's/^worker_processes.*/worker_processes 1;/' /etc/nginx/nginx.conf && \
    echo "$VERSION_ARG" > /run/version && \
@ -55,15 +49,14 @@ RUN set -eu && \
 COPY --chmod=755 ./src /run/
 COPY --chmod=755 ./web /var/www/
 COPY --chmod=755 --from=builder /qemu-host.bin /run/host.bin
-COPY --chmod=744 ./web/conf/nginx.conf /etc/nginx/sites-enabled/web.conf
+COPY --chmod=744 ./web/nginx.conf /etc/nginx/sites-enabled/web.conf
 ADD --chmod=775 https://raw.githubusercontent.com/sud0woodo/patology/refs/heads/main/patology.py /run/extract.py
 VOLUME /storage
 EXPOSE 22 139 445 5000
-ENV RAM_SIZE="2G"
+ENV RAM_SIZE="1G"
 ENV CPU_CORES="2"
 ENV DISK_SIZE="16G"
 ENV CPU_CORES="1"
 HEALTHCHECK --interval=60s --start-period=45s --retries=2 CMD /run/check.sh
--- a/compose.yml
+++ b/compose.yml
@ -1,17 +1,15 @@
 services:
    dsm:
        container_name: dsm
-    image: vdsm/virtual-dsm
+        image: vdsm/virtual-dsm:latest
        environment:
            DISK_SIZE: "16G"
        devices:
            - /dev/kvm
      - /dev/net/tun
        cap_add:
            - NET_ADMIN
        ports:
            - 5000:5000
        volumes:
-      - ./dsm:/storage
+            - /var/dsm:/storage
    restart: always
        stop_grace_period: 2m
--- a/kubernetes.yml
+++ b/kubernetes.yml
@ -1,4 +1,3 @@
 ---
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
@ -10,68 +9,51 @@ spec:
    requests:
      storage: 16Gi
 ---
-apiVersion: apps/v1
+apiVersion: v1
-kind: Deployment
+kind: Pod
 metadata:
  name: dsm
  labels:
    name: dsm
 spec:
-  replicas: 1
+  terminationGracePeriodSeconds: 120 # the Kubernetes default is 30 seconds and it may be not enough
  selector:
    matchLabels:
      app: dsm
  template:
    metadata:
      labels:
        app: dsm
    spec:
  containers:
    - name: dsm
      image: vdsm/virtual-dsm
        env:
        - name: DISK_SIZE
          value: "16G"
      ports:
        - containerPort: 5000
            name: http
          protocol: TCP
      securityContext:
          capabilities:
            add:
            - NET_ADMIN
        privileged: true
      env:
        - name: RAM_SIZE
          value: 1G
        - name: CPU_CORES
          value: "1"
        - name: DISK_SIZE
          value: "16G"  # Kubernetes uses Gi, but DSM uses GB
      volumeMounts:
        - mountPath: /storage
          name: storage
        - mountPath: /dev/kvm
          name: dev-kvm
        - mountPath: /dev/net/tun
          name: dev-tun
      terminationGracePeriodSeconds: 120
  volumes:
    - name: storage
      persistentVolumeClaim:
        claimName: dsm-pvc
-      - hostPath:
+    - name: dev-kvm
      hostPath:
        path: /dev/kvm
        name: dev-kvm
      - hostPath:
          path: /dev/net/tun
          type: CharDevice
        name: dev-tun
 ---
 apiVersion: v1
 kind: Service
 metadata:
  name: dsm
 spec:
-  internalTrafficPolicy: Cluster
+  type: NodePort
  ports:
    - name: http
      port: 5000
      protocol: TCP
      targetPort: 5000
  selector:
-    app: dsm
+    name: dsm
-  type: ClusterIP
+  ports:
    - name: tcp-5000
      port: 5000
      targetPort: 5000
--- a/readme.md
+++ b/readme.md
@ -22,7 +22,7 @@ Virtual DSM in a Docker container.
 ## Usage  🐳
-##### Via Docker Compose:
+Via Docker Compose:
 ```yaml
 services:
@ -33,46 +33,38 @@ services:
      DISK_SIZE: "16G"
    devices:
      - /dev/kvm
      - /dev/net/tun
    cap_add:
      - NET_ADMIN
    ports:
      - 5000:5000
    volumes:
-      - ./dsm:/storage
+      - /var/dsm:/storage
    restart: always
    stop_grace_period: 2m
 ```
-##### Via Docker CLI:
+Via Docker CLI:
 ```bash
-docker run -it --rm --name dsm -p 5000:5000 --device=/dev/kvm --device=/dev/net/tun --cap-add NET_ADMIN -v "${PWD:-.}/dsm:/storage" --stop-timeout 120 vdsm/virtual-dsm
+docker run -it --rm -p 5000:5000 --device=/dev/kvm --cap-add NET_ADMIN --stop-timeout 120 vdsm/virtual-dsm
 ```
-##### Via Kubernetes:
+Via Kubernetes:
 ```shell
-kubectl apply -f https://raw.githubusercontent.com/vdsm/virtual-dsm/refs/heads/master/kubernetes.yml
+kubectl apply -f kubernetes.yml
 ```
 ##### Via Github Codespaces:
 [![Open in GitHub Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/vdsm/virtual-dsm)
 ## FAQ 💬
 ### How do I use it?
  Very simple! These are the steps:
-  - Start the container and connect to [port 5000](http://127.0.0.1:5000/) using your web browser.
+  - Start the container and connect to [port 5000](http://localhost:5000) using your web browser.
-  - Wait until DSM finishes its installation
+  - Wait until DSM is ready, choose an username and password, and you will be taken to the desktop.
-  - Choose an username and password, and you will be taken to the desktop.
+  Enjoy your brand new machine, and don't forget to star this repo!
  Enjoy your brand new NAS, and don't forget to star this repo!
 ### How do I change the storage location?
@ -80,10 +72,10 @@ kubectl apply -f https://raw.githubusercontent.com/vdsm/virtual-dsm/refs/heads/m
  ```yaml
  volumes:
-    - ./dsm:/storage
+    - /var/dsm:/storage
  ```
-  Replace the example path `./dsm` with the desired storage folder or named volume.
+  Replace the example path `/var/dsm` with the desired storage folder.
 ### How do I change the size of the disk?
@ -99,7 +91,7 @@ kubectl apply -f https://raw.githubusercontent.com/vdsm/virtual-dsm/refs/heads/m
 ### How do I create a growable disk?
-  By default, the entire capacity of the disk will be reserved in advance.
+  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:
@ -108,6 +100,9 @@ kubectl apply -f https://raw.githubusercontent.com/vdsm/virtual-dsm/refs/heads/m
    DISK_FMT: "qcow2"
  ```
 > [!NOTE]
 > This may reduce the write performance of the disk.
 ### How do I add multiple disks?
  To create additional disks, modify your compose file like this:
@ -117,25 +112,30 @@ kubectl apply -f https://raw.githubusercontent.com/vdsm/virtual-dsm/refs/heads/m
    DISK2_SIZE: "32G"
    DISK3_SIZE: "64G"
  volumes:
-    - ./example2:/storage2
+    - /home/example:/storage2
-    - ./example3:/storage3
+    - /mnt/data/example:/storage3
  ```
 ### How do I pass-through a disk?
-   It is possible to pass-through disk devices or partitions directly by adding them to your compose file in this way:
+   It is possible to pass-through a disk device directly, by adding it to your compose file in this way:
  ```yaml
  devices:
-    - /dev/sdb:/disk1
+    - /dev/disk/by-uuid/12345-12345-12345-12345-12345:/disk2
    - /dev/sdc1:/disk2
  ```
-  Make sure it is totally empty (without any filesystem), otherwise DSM may not format it as a volume.
+  Make sure to bind the disk via its UUID (obtainable via `lsblk -o name,uuid`) instead of its name (`/dev/sdc`), to prevent ever binding the wrong disk when the drive letters happen to change. 
 > [!IMPORTANT]
 > The device needs to be totally empty (without any partition table) otherwise DSM does not always format it into a volume.
 > [!CAUTION]
 > Do NOT use this feature with the goal of sharing files from the host, they will all be lost without warning when DSM creates the volume.
 ### How do I change the amount of CPU or RAM?
-  By default, the container will be allowed to use a maximum of 2 CPU cores and 2 GB of RAM.
+  By default, the container will be allowed to use a maximum of 1 CPU core and 1 GB of RAM.
  If you want to adjust this, you can specify the desired amount using the following environment variables:
@ -147,31 +147,24 @@ kubectl apply -f https://raw.githubusercontent.com/vdsm/virtual-dsm/refs/heads/m
 ### How do I verify if my system supports KVM?
-  First check if your software is compatible using this chart:
+  To verify that your system supports KVM, run the following commands:
  | **Product**  | **Linux** | **Win11** | **Win10** | **macOS** |
  |---|---|---|---|---|
  | Docker CLI        | ✅   | ✅       | ❌        | ❌ |
  | Docker Desktop    | ❌   | ✅       | ❌        | ❌ | 
  | Podman CLI        | ✅   | ✅       | ❌        | ❌ | 
  | Podman Desktop    | ✅   | ✅       | ❌        | ❌ | 
  After that you can run the following commands in Linux to check your system:
  ```bash
  sudo apt install cpu-checker
  sudo kvm-ok
  ```
-  If you receive an error from `kvm-ok` indicating that KVM cannot be used, please check whether:
+  If you receive an error from `kvm-ok` indicating that KVM acceleration can't be used, please check whether:
  - the virtualization extensions (`Intel VT-x` or `AMD SVM`) are enabled in your BIOS.
  - you are running an operating system that supports them, like Linux or Windows 11 (macOS and Windows 10 do not unfortunately).
  - you enabled "nested virtualization" if you are running the container inside a virtual machine.
  - you are not using a cloud provider, as most of them do not allow nested virtualization for their VPS's.
-  If you did not receive any error from `kvm-ok` but the container still complains about a missing KVM device, it could help to add `privileged: true` to your compose file (or `sudo` to your `docker` command) to rule out any permission issue.
+  If you didn't receive any error from `kvm-ok` at all, but the container still complains that `/dev/kvm` is missing, it might help to add `privileged: true` to your compose file (or `--privileged` to your `run` command), to rule out any permission issue.
 ### How do I assign an individual IP address to the container?
@ -214,7 +207,7 @@ kubectl apply -f https://raw.githubusercontent.com/vdsm/virtual-dsm/refs/heads/m
  After configuring the container for [macvlan](#how-do-i-assign-an-individual-ip-address-to-the-container), it is possible for DSM to become part of your home network by requesting an IP from your router, just like your other devices.
-  To enable this mode, in which the container and DSM will have separate IP addresses, add the following lines to your compose file:
+  To enable this mode, add the following lines to your compose file:
  ```yaml
  environment:
@ -225,6 +218,9 @@ kubectl apply -f https://raw.githubusercontent.com/vdsm/virtual-dsm/refs/heads/m
    - 'c *:* rwm'
  ```
 > [!NOTE]
 > In this mode, the container and DSM will each have their own separate IPs.
 ### How do I pass-through the GPU?
  To pass-through your Intel GPU, add the following lines to your compose file:
@ -236,41 +232,33 @@ kubectl apply -f https://raw.githubusercontent.com/vdsm/virtual-dsm/refs/heads/m
    - /dev/dri
  ```
-> [!NOTE]
+> [!TIP]
-> This can be used to enable the facial recognition function in Synology Photos, but does not provide hardware transcoding for video.
+> This can be used to enable the facial recognition function in Synology Photos for example.
 ### How do I install a specific version of vDSM?
-  By default, version 7.2 will be installed, but if you prefer an older version, you can add the download URL of the `.pat` file to your compose file as follows:
+  By default, version 7.2 will be installed, but if you prefer an older version, you can add its download URL to your compose file as follows:
  ```yaml
  environment:
    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 back and forth between versions while keeping your file data intact.
+  With this method, it is even possible to switch between different versions while keeping all your file data intact.
-  Alternatively, you can also skip the download and use a local file instead, by binding it in your compose file in this way:
+  If you don't have internet access, it's also possible to skip the download by setting URL to:
  ```yaml
-  volumes:
+  environment:
-    - ./DSM_VirtualDSM_42218.pat:/boot.pat
+    URL: "DSM_VirtualDSM_42218.pat"
  ```
-  Replace the example path `./DSM_VirtualDSM_42218.pat` with the filename of your desired `.pat` file. The value of `URL` will be ignored in this case.
+  after placing a file called `DSM_VirtualDSM_42218.pat` in your `/storage` folder.
 ### 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.
 ### How do I run Windows in a container?
  You can use [dockur/windows](https://github.com/dockur/windows) for that. It shares many of the same features, and even has completely automatic installation.
 ### How do I run a Linux desktop in a container?
  You can use [qemus/qemu](https://github.com/qemus/qemu) in that case.
 ### Is this project legal?
  Yes, this project contains only open-source code and does not distribute any copyrighted material. Neither does it try to circumvent any copyright protection measures. So under all applicable laws, this project will be considered legal. 
--- a/src/config.sh
+++ b/src/config.sh
@ -17,27 +17,21 @@ ARGS=$(echo "$ARGS" | sed 's/\t/ /g' | tr -s ' ')
 if [[ "$RAM_CHECK" != [Nn]* ]]; then
  RAM_AVAIL=$(free -b | grep -m 1 Mem: | awk '{print $7}')
-  AVAIL_MEM=$(formatBytes "$RAM_AVAIL")
+  AVAIL_GB=$(( RAM_AVAIL/1073741824 ))
  if (( (RAM_WANTED + RAM_SPARE) > RAM_AVAIL )); then
-    msg="Your configured RAM_SIZE of ${RAM_SIZE/G/ GB} is too high for the $AVAIL_MEM of memory available, please set a lower value."
+    error "Your configured RAM_SIZE of $WANTED_GB GB is too high for the $AVAIL_GB GB of memory available, please set a lower value."
-    [[ "${FS,,}" != "zfs" ]] && error "$msg" && exit 17
+    exit 17
-    info "$msg"
+  fi
-  else
+
  if (( (RAM_WANTED + (RAM_SPARE * 3)) > RAM_AVAIL )); then
-      msg="your configured RAM_SIZE of ${RAM_SIZE/G/ GB} is very close to the $AVAIL_MEM of memory available, please consider a lower value."
+    warn "your configured RAM_SIZE of $WANTED_GB GB is very close to the $AVAIL_GB GB of memory available, please consider a lower value."
      if [[ "${FS,,}" != "zfs" ]]; then
        warn "$msg"
      else
        info "$msg"
      fi
    fi
  fi
 fi
 if [[ "$DEBUG" == [Yy1]* ]]; then
-  printf "Arguments:\n\n%s\n\n" "${ARGS// -/$'\n-'}"
+  printf "Arguments:\n\n%s" "${ARGS// -/$'\n-'}" && echo
 fi
 return 0
--- a/src/disk.sh
+++ b/src/disk.sh
@ -3,9 +3,9 @@ set -Eeuo pipefail
 # Docker environment variables
-: "${DISK_IO:="native"}"          # I/O Mode, can be set to 'native', 'threads' or 'io_uring'
+: "${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_TYPE:=""}"              # Device type to be used, "sata", "nvme", "blk" or "scsi"
+: "${DISK_TYPE:=""}"              # Device type to be used, choose "ide", "usb", "blk" or "scsi"
 : "${DISK_FLAGS:=""}"             # Specifies the options for use with the qcow2 disk format
 : "${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.
@ -96,7 +96,7 @@ createDisk() {
  local DISK_DESC=$3
  local DISK_FMT=$4
  local FS=$5
-  local DATA_SIZE DIR SPACE GB FA
+  local DATA_SIZE DIR SPACE FA
  DATA_SIZE=$(numfmt --from=iec "$DISK_SPACE")
@ -109,16 +109,16 @@ createDisk() {
    SPACE=$(df --output=avail -B 1 "$DIR" | tail -n 1)
    if (( DATA_SIZE > SPACE )); then
-      GB=$(formatBytes "$SPACE")
+      local SPACE_GB=$(( (SPACE + 1073741823)/1073741824 ))
-      error "Not enough free space to create a $DISK_DESC of ${DISK_SPACE/G/ GB} in $DIR, it has only $GB available..."
+      error "Not enough free space to create a $DISK_DESC of $DISK_SPACE in $DIR, it has only $SPACE_GB GB available..."
      error "Please specify a smaller ${DISK_DESC^^}_SIZE or disable preallocation by setting ALLOCATE=N." && exit 76
    fi
  fi
  html "Creating a $DISK_DESC image..."
-  info "Creating a ${DISK_SPACE/G/ GB} $DISK_STYLE $DISK_DESC image in $DISK_FMT format..."
+  info "Creating a $DISK_SPACE $DISK_STYLE $DISK_DESC image in $DISK_FMT format..."
-  local FAIL="Could not create a $DISK_STYLE $DISK_FMT $DISK_DESC image of ${DISK_SPACE/G/ GB} ($DISK_FILE)"
+  local FAIL="Could not create a $DISK_STYLE $DISK_FMT $DISK_DESC image of $DISK_SPACE ($DISK_FILE)"
  case "${DISK_FMT,,}" in
    raw)
@ -141,14 +141,12 @@ createDisk() {
      else
        # Create an empty file
-        if ! fallocate -l "$DATA_SIZE" "$DISK_FILE" &>/dev/null; then
+        if ! fallocate -l "$DATA_SIZE" "$DISK_FILE"; then
          if ! fallocate -l -x "$DATA_SIZE" "$DISK_FILE"; then
          if ! truncate -s "$DATA_SIZE" "$DISK_FILE"; then
            rm -f "$DISK_FILE"
            error "$FAIL" && exit 77
          fi
        fi
        fi
      fi
      ;;
@ -182,7 +180,7 @@ resizeDisk() {
  local DISK_DESC=$3
  local DISK_FMT=$4
  local FS=$5
-  local CUR_SIZE DATA_SIZE DIR SPACE GB
+  local CUR_SIZE DATA_SIZE DIR SPACE
  CUR_SIZE=$(getSize "$DISK_FILE")
  DATA_SIZE=$(numfmt --from=iec "$DISK_SPACE")
@ -196,17 +194,17 @@ resizeDisk() {
    SPACE=$(df --output=avail -B 1 "$DIR" | tail -n 1)
    if (( REQ > SPACE )); then
-      GB=$(formatBytes "$SPACE")
+      local SPACE_GB=$(( (SPACE + 1073741823)/1073741824 ))
-      error "Not enough free space to resize $DISK_DESC to ${DISK_SPACE/G/ GB} in $DIR, it has only $GB available.."
+      error "Not enough free space to resize $DISK_DESC to $DISK_SPACE in $DIR, it has only $SPACE_GB GB available.."
      error "Please specify a smaller ${DISK_DESC^^}_SIZE or disable preallocation by setting ALLOCATE=N." && exit 74
    fi
  fi
-  GB=$(formatBytes "$CUR_SIZE")
+  local GB=$(( (CUR_SIZE + 1073741823)/1073741824 ))
-  MSG="Resizing $DISK_DESC from $GB to ${DISK_SPACE/G/ GB}..."
+  MSG="Resizing $DISK_DESC from ${GB}G to $DISK_SPACE..."
  info "$MSG" && html "$MSG"
-  local FAIL="Could not resize the $DISK_STYLE $DISK_FMT $DISK_DESC image from ${GB} to ${DISK_SPACE/G/ GB} ($DISK_FILE)"
+  local FAIL="Could not resize the $DISK_STYLE $DISK_FMT $DISK_DESC image from ${GB}G to $DISK_SPACE ($DISK_FILE)"
  case "${DISK_FMT,,}" in
    raw)
@ -221,13 +219,11 @@ resizeDisk() {
      else
        # Resize file by allocating more space
-        if ! fallocate -l "$DATA_SIZE" "$DISK_FILE" &>/dev/null; then
+        if ! fallocate -l "$DATA_SIZE" "$DISK_FILE"; then
          if ! fallocate -l -x "$DATA_SIZE" "$DISK_FILE"; then
          if ! truncate -s "$DATA_SIZE" "$DISK_FILE"; then
            error "$FAIL" && exit 75
          fi
        fi
        fi
      fi
      ;;
@ -261,7 +257,7 @@ convertDisk() {
  if [[ "$ALLOCATE" != [Nn]* ]]; then
-    local DIR CUR_SIZE SPACE GB
+    local DIR CUR_SIZE SPACE
    # Check free diskspace
    DIR=$(dirname "$TMP_FILE")
@ -269,8 +265,8 @@ convertDisk() {
    SPACE=$(df --output=avail -B 1 "$DIR" | tail -n 1)
    if (( CUR_SIZE > SPACE )); then
-      GB=$(formatBytes "$SPACE")
+      local SPACE_GB=$(( (SPACE + 1073741823)/1073741824 ))
-      error "Not enough free space to convert $DISK_DESC to $DST_FMT in $DIR, it has only $GB available..."
+      error "Not enough free space to convert $DISK_DESC to $DST_FMT in $DIR, it has only $SPACE_GB GB available..."
      error "Please free up some disk space or disable preallocation by setting ALLOCATE=N." && exit 76
    fi
  fi
@ -300,13 +296,11 @@ convertDisk() {
    if [[ "$ALLOCATE" != [Nn]* ]]; then
      # Work around qemu-img bug
      CUR_SIZE=$(stat -c%s "$TMP_FILE")
-      if ! fallocate -l "$CUR_SIZE" "$TMP_FILE" &>/dev/null; then
+      if ! fallocate -l "$CUR_SIZE" "$TMP_FILE"; then
        if ! fallocate -l -x "$CUR_SIZE" "$TMP_FILE"; then
          error "Failed to allocate $CUR_SIZE bytes for $DISK_DESC image $TMP_FILE"
      fi
    fi
  fi
  fi
  rm -f "$SOURCE_FILE"
  mv "$TMP_FILE" "$DST_FILE"
@ -320,7 +314,7 @@ convertDisk() {
  msg="Conversion of $DISK_DESC"
  html "$msg completed..."
-  info "$msg to $DST_FMT completed successfully!"
+  info "$msg to $DST_FMT completed succesfully!"
  return 0
 }
@ -368,8 +362,6 @@ createDevice () {
  local DISK_FMT=$5
  local DISK_IO=$6
  local DISK_CACHE=$7
  local DISK_SERIAL=$8
  local DISK_SECTORS=$9
  local DISK_ID="data$DISK_INDEX"
  local index=""
@ -377,35 +369,29 @@ createDevice () {
  local result=" -drive file=$DISK_FILE,id=$DISK_ID,format=$DISK_FMT,cache=$DISK_CACHE,aio=$DISK_IO,discard=$DISK_DISCARD,detect-zeroes=on"
  case "${DISK_TYPE,,}" in
    "none" ) ;;
    "auto" )
      echo "$result"
      ;;
    "usb" )
      result+=",if=none \
-      -device usb-storage,drive=${DISK_ID}${index}${DISK_SERIAL}${DISK_SECTORS}"
+      -device usb-storage,drive=${DISK_ID}${index}"
      echo "$result"
      ;;
-    "nvme" )
+    "ide" )
      result+=",if=none \
      -device nvme,drive=${DISK_ID}${index},serial=deadbeaf${DISK_INDEX}${DISK_SERIAL}${DISK_SECTORS}"
      echo "$result"
      ;;
    "ide" | "sata" )
      result+=",if=none \
      -device ich9-ahci,id=ahci${DISK_INDEX},addr=$DISK_ADDRESS \
-      -device ide-hd,drive=${DISK_ID},bus=ahci$DISK_INDEX.0,rotation_rate=$DISK_ROTATION${index}${DISK_SERIAL}${DISK_SECTORS}"
+      -device ide-hd,drive=${DISK_ID},bus=ahci$DISK_INDEX.0,rotation_rate=$DISK_ROTATION${index}"
      echo "$result"
      ;;
    "blk" | "virtio-blk" )
      result+=",if=none \
-      -device virtio-blk-pci,drive=${DISK_ID},bus=pcie.0,addr=$DISK_ADDRESS,iothread=io2${index}${DISK_SERIAL}${DISK_SECTORS}"
+      -device virtio-blk-pci,drive=${DISK_ID},scsi=off,bus=pcie.0,addr=$DISK_ADDRESS,iothread=io2${index}"
      echo "$result"
      ;;
    "scsi" | "virtio-scsi" )
      result+=",if=none \
      -device virtio-scsi-pci,id=${DISK_ID}b,bus=pcie.0,addr=$DISK_ADDRESS,iothread=io2 \
-      -device scsi-hd,drive=${DISK_ID},bus=${DISK_ID}b.0,channel=0,scsi-id=0,lun=0,rotation_rate=$DISK_ROTATION${index}${DISK_SERIAL}${DISK_SECTORS}"
+      -device scsi-hd,drive=${DISK_ID},bus=${DISK_ID}b.0,channel=0,scsi-id=0,lun=0,rotation_rate=$DISK_ROTATION${index}"
      echo "$result"
      ;;
  esac
@ -424,7 +410,7 @@ addDisk () {
  local DISK_FMT=$7
  local DISK_IO=$8
  local DISK_CACHE=$9
-  local DISK_EXT DIR SPACE DATA_SIZE FS PREV_FMT PREV_EXT CUR_SIZE
+  local DISK_EXT DIR DATA_SIZE FS PREV_FMT PREV_EXT CUR_SIZE OPTS
  DISK_EXT=$(fmt2ext "$DISK_FMT")
  local DISK_FILE="$DISK_BASE.$DISK_EXT"
@ -432,17 +418,15 @@ addDisk () {
  DIR=$(dirname "$DISK_FILE")
  [ ! -d "$DIR" ] && return 0
-  SPACE="${DISK_SPACE// /}"
+  [ -z "$DISK_SPACE" ] && DISK_SPACE="16G"
-  [ -z "$SPACE" ] && SPACE="16G"
+  DISK_SPACE=$(echo "${DISK_SPACE^^}" | sed 's/MB/M/g;s/GB/G/g;s/TB/T/g')
-  [ -z "${SPACE//[0-9. ]}" ] && SPACE="${SPACE}G"
+  [[ -z "${DISK_SPACE//[0-9]}" ]] && DISK_SPACE="${DISK_SPACE}G"
-  SPACE=$(echo "${SPACE^^}" | sed 's/MB/M/g;s/GB/G/g;s/TB/T/g')
+  DATA_SIZE=$(numfmt --from=iec "$DISK_SPACE")
-  if ! numfmt --from=iec "$SPACE" &>/dev/null; then
+  if (( DATA_SIZE < 1 )); then
      error "Invalid value for ${DISK_DESC^^}_SIZE: $DISK_SPACE" && exit 73
  fi
  DATA_SIZE=$(numfmt --from=iec "$SPACE")
  if (( DATA_SIZE < 6442450944 )); then
      error "Please increase ${DISK_DESC^^}_SIZE to at least 6 GB." && exit 73
  fi
@ -475,16 +459,16 @@ addDisk () {
    CUR_SIZE=$(getSize "$DISK_FILE")
    if (( DATA_SIZE > CUR_SIZE )); then
-      resizeDisk "$DISK_FILE" "$SPACE" "$DISK_DESC" "$DISK_FMT" "$FS" || exit $?
+      resizeDisk "$DISK_FILE" "$DISK_SPACE" "$DISK_DESC" "$DISK_FMT" "$FS" || exit $?
    fi
  else
-    createDisk "$DISK_FILE" "$SPACE" "$DISK_DESC" "$DISK_FMT" "$FS" || exit $?
+    createDisk "$DISK_FILE" "$DISK_SPACE" "$DISK_DESC" "$DISK_FMT" "$FS" || exit $?
  fi
-  DISK_OPTS+=$(createDevice "$DISK_FILE" "$DISK_TYPE" "$DISK_INDEX" "$DISK_ADDRESS" "$DISK_FMT" "$DISK_IO" "$DISK_CACHE" "" "")
+  DISK_OPTS+=$(createDevice "$DISK_FILE" "$DISK_TYPE" "$DISK_INDEX" "$DISK_ADDRESS" "$DISK_FMT" "$DISK_IO" "$DISK_CACHE")
  return 0
 }
@ -499,26 +483,7 @@ addDevice () {
  [ -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
-  local sectors=""
+  DISK_OPTS+=$(createDevice "$DISK_DEV" "$DISK_TYPE" "$DISK_INDEX" "$DISK_ADDRESS" "raw" "$DISK_IO" "$DISK_CACHE")
  local result logical physical
  result=$(fdisk -l "$DISK_DEV" | grep -m 1 -o "(logical/physical): .*" | cut -c 21-)
  logical="${result%% *}"
  physical=$(echo "$result" | grep -m 1 -o "/ .*" | cut -c 3-)
  physical="${physical%% *}"
  if [ -n "$physical" ]; then
    if [[ "$physical" == "512" ]] || [[ "$physical" == "4096" ]]; then
      if [[ "$physical" == "4096" ]]; then
        sectors=",logical_block_size=$logical,physical_block_size=$physical"
      fi
    else
      warn "Unknown physical sector size: $physical for $DISK_DEV"
    fi
  else
    warn "Failed to determine the sector size for $DISK_DEV"
  fi
  DISK_OPTS+=$(createDevice "$DISK_DEV" "$DISK_TYPE" "$DISK_INDEX" "$DISK_ADDRESS" "raw" "$DISK_IO" "$DISK_CACHE" "" "$sectors")
  return 0
 }
@ -530,7 +495,7 @@ html "Initializing disks..."
 [ -z "${DISK_NAME:-}" ] && DISK_NAME="data"
 case "${DISK_TYPE,,}" in
-  "ide" | "sata" | "nvme" | "usb" | "scsi" | "blk" | "auto" | "none" ) ;;
+  "ide" | "usb" | "scsi" | "blk" | "auto" ) ;;
  * ) error "Invalid DISK_TYPE specified, value \"$DISK_TYPE\" is not recognized!" && exit 80 ;;
 esac
@ -550,8 +515,8 @@ else
  DISK_ALLOC="preallocation=falloc"
 fi
-DISK_OPTS+=$(createDevice "$BOOT" "$DISK_TYPE" "1" "0xa" "raw" "$DISK_IO" "$DISK_CACHE" "" "")
+DISK_OPTS+=$(createDevice "$BOOT" "$DISK_TYPE" "1" "0xa" "raw" "$DISK_IO" "$DISK_CACHE")
-DISK_OPTS+=$(createDevice "$SYSTEM" "$DISK_TYPE" "2" "0xb" "raw" "$DISK_IO" "$DISK_CACHE" "" "")
+DISK_OPTS+=$(createDevice "$SYSTEM" "$DISK_TYPE" "2" "0xb" "raw" "$DISK_IO" "$DISK_CACHE")
 DISK1_FILE="$STORAGE/${DISK_NAME}"
 if [[ ! -f "$DISK1_FILE.img" ]] && [[ -f "$STORAGE/data${DISK_SIZE}.img" ]]; then
--- a/src/display.sh
+++ b/src/display.sh
@ -6,11 +6,8 @@ set -Eeuo pipefail
 : "${GPU:="N"}"         # GPU passthrough
 : "${VGA:="virtio"}"    # VGA adaptor
 : "${DISPLAY:="none"}"  # Display type
 : "${RENDERNODE:="/dev/dri/renderD128"}"  # Render node
-CPU_VENDOR=$(lscpu | awk '/Vendor ID/{print $3}')
+if [[ "$GPU" != [Yy1]* ]] || [[ "$ARCH" != "amd64" ]]; then
 if [[ "$GPU" != [Yy1]* ]] || [[ "$CPU_VENDOR" != "GenuineIntel" ]] || [[ "$ARCH" != "amd64" ]]; then
  [[ "${DISPLAY,,}" == "none" ]] && VGA="none"
  DISPLAY_OPTS="-display $DISPLAY -vga $VGA"
@ -18,24 +15,20 @@ if [[ "$GPU" != [Yy1]* ]] || [[ "$CPU_VENDOR" != "GenuineIntel" ]] || [[ "$ARCH"
 fi
-DISPLAY_OPTS="-display egl-headless,rendernode=$RENDERNODE"
+DISPLAY_OPTS="-display egl-headless,rendernode=/dev/dri/renderD128"
 DISPLAY_OPTS+=" -vga $VGA"
 [ ! -d /dev/dri ] && mkdir -m 755 /dev/dri
-# Extract the card number from the render node
+if [ ! -c /dev/dri/card0 ]; then
-CARD_NUMBER=$(echo "$RENDERNODE" | grep -oP '(?<=renderD)\d+')
+  if mknod /dev/dri/card0 c 226 0; then
-CARD_DEVICE="/dev/dri/card$((CARD_NUMBER - 128))"
+    chmod 666 /dev/dri/card0
 if [ ! -c "$CARD_DEVICE" ]; then
  if mknod "$CARD_DEVICE" c 226 $((CARD_NUMBER - 128)); then
    chmod 666 "$CARD_DEVICE"
  fi
 fi
-if [ ! -c "$RENDERNODE" ]; then
+if [ ! -c /dev/dri/renderD128 ]; then
-  if mknod "$RENDERNODE" c 226 "$CARD_NUMBER"; then
+  if mknod /dev/dri/renderD128 c 226 128; then
-    chmod 666 "$RENDERNODE"
+    chmod 666 /dev/dri/renderD128
  fi
 fi
--- a/src/entry.sh
+++ b/src/entry.sh
@ -1,12 +1,11 @@
 #!/usr/bin/env bash
 set -Eeuo pipefail
-: "${APP:="Virtual DSM"}"
+APP="Virtual DSM"
-: "${SUPPORT:="https://github.com/vdsm/virtual-dsm"}"
+SUPPORT="https://github.com/vdsm/virtual-dsm"
 cd /run
 . utils.sh      # Load functions
 . reset.sh      # Initialize system
 . install.sh    # Run installation
 . disk.sh       # Initialize disks
--- a/src/install.sh
+++ b/src/install.sh
@ -5,38 +5,25 @@ set -Eeuo pipefail
 if [ -f "$STORAGE/dsm.ver" ]; then
  BASE=$(<"$STORAGE/dsm.ver")
  BASE="${BASE//[![:print:]]/}"
  [ -z "$BASE" ] && BASE="DSM_VirtualDSM_69057"
 else
  # Fallback for old installs
  BASE="DSM_VirtualDSM_42962"
 fi
-FN="boot.pat"
+if [ -n "$URL" ]; then
 DIR=$(find / -maxdepth 1 -type d -iname "$FN" -print -quit)
 [ ! -d "$DIR" ] && DIR=$(find "$STORAGE" -maxdepth 1 -type d -iname "$FN" -print -quit)
 if [ -d "$DIR" ]; then
  BASE="DSM_VirtualDSM" && URL="file://$DIR" 
  if [[ ! -s "$STORAGE/$BASE.boot.img" ]] || [[ ! -s "$STORAGE/$BASE.system.img" ]]; then
    error "The bind $DIR maps to a file that does not exist!" && exit 65
  fi
 fi
 FILE=$(find / -maxdepth 1 -type f -iname "$FN" -print -quit)
 [ ! -s "$FILE" ] && FILE=$(find "$STORAGE" -maxdepth 1 -type f -iname "$FN" -print -quit)
 [ -s "$FILE" ] && BASE="DSM_VirtualDSM" && URL="file://$FILE" 
 if [ -n "$URL" ] && [ ! -s "$FILE" ] && [ ! -d "$DIR" ]; then
  BASE=$(basename "$URL" .pat)
  if [ ! -s "$STORAGE/$BASE.system.img" ]; then
    BASE=$(basename "${URL%%\?*}" .pat)
    : "${BASE//+/ }"; printf -v BASE '%b' "${_//%/\\x}"
    BASE=$(echo "$BASE" | sed -e 's/[^A-Za-z0-9._-]/_/g')
  fi
-  if [[ "${URL,,}" != "http"* ]] && [[ "${URL,,}" != "file:"* ]] ; then
+  if [[ "${URL,,}" != "http"* ]]; then
-    [ ! -s "$STORAGE/$BASE.pat" ] && error "Invalid URL:  $URL" && exit 65
+    if [ -s "$STORAGE/$BASE.pat" ]; then
      URL="file://$STORAGE/$BASE.pat"
    else
      error "File $STORAGE/$BASE.pat does not exist!" && exit 65
    fi
  fi
 fi
@ -59,15 +46,11 @@ if [ -z "$DL" ]; then
  [[ "${COUNTRY^^}" == "CN" ]] && DL="$DL_CHINA" || DL="$DL_GLOBAL"
 fi
-if [ -z "$URL" ]; then
+[ -z "$URL" ] && URL="$DL/release/7.2.1/69057-1/DSM_VirtualDSM_69057.pat"
  URL="$DL/release/7.2.2/72806/DSM_VirtualDSM_72806.pat"
 fi
 if [ ! -s "$FILE" ]; then
 BASE=$(basename "${URL%%\?*}" .pat)
 : "${BASE//+/ }"; printf -v BASE '%b' "${_//%/\\x}"
 BASE=$(echo "$BASE" | sed -e 's/[^A-Za-z0-9._-]/_/g')
 fi
 if [[ "$URL" != "file://$STORAGE/$BASE.pat" ]]; then
  rm -f "$STORAGE/$BASE.pat"
@ -102,9 +85,9 @@ else
  TMP="/tmp/dsm"
  TMP_SPACE=2147483648
  SPACE=$(df --output=avail -B 1 /tmp | tail -n 1)
-  SPACE_MB=$(formatBytes "$SPACE")
+  SPACE_MB=$(( (SPACE + 1048575)/1048576 ))
  if (( TMP_SPACE > SPACE )); then
-    error "Not enough free space inside the container, have $SPACE_MB available but need at least 2 GB." && exit 93
+    error "Not enough free space inside the container, have $SPACE_MB MB available but need at least 2 GB." && exit 93
  fi
 fi
@ -113,13 +96,13 @@ rm -rf "$TMP" && mkdir -p "$TMP"
 # Check free diskspace
 ROOT_SPACE=536870912
 SPACE=$(df --output=avail -B 1 / | tail -n 1)
-SPACE_MB=$(formatBytes "$SPACE" "down")
+SPACE_MB=$(( (SPACE + 1048575)/1048576 ))
-(( ROOT_SPACE > SPACE )) && error "Not enough free space inside the container, have $SPACE_MB available but need at least 500 MB." && exit 96
+(( ROOT_SPACE > SPACE )) && error "Not enough free space inside the container, have $SPACE_MB MB available but need at least 500 MB." && exit 96
-MIN_SPACE=15032385536
+MIN_SPACE=8589934592
 SPACE=$(df --output=avail -B 1 "$STORAGE" | tail -n 1)
-SPACE_GB=$(formatBytes "$SPACE")
+SPACE_GB=$(( (SPACE + 1073741823)/1073741824 ))
-(( MIN_SPACE > SPACE )) && error "Not enough free space for installation in $STORAGE, have $SPACE_GB available but need at least 14 GB." && exit 94
+(( MIN_SPACE > SPACE )) && error "Not enough free space for installation in $STORAGE, have $SPACE_GB GB available but need at least 8 GB." && exit 94
 # Check if output is to interactive TTY
 if [ -t 1 ]; then
@ -128,15 +111,127 @@ else
  PROGRESS="--progress=dot:giga"
 fi
-if [[ "$URL" == "file://"* ]]; then
+# Download the required files from the Synology website
-  MSG="Copying DSM"
+
-  ERR="Failed to copy ${URL:7}"
+ROOT="Y"
-  info "Install: Copying installation image..."
+RD="$TMP/rd.gz"
 RDC="$STORAGE/dsm.rd"
 if [ ! -s "$RDC" ] && [[ "$URL" == "file://"* ]] && [[ "${URL,,}" == *"_42218.pat" ]]; then
  rm -f "$RD"
  rm -f "$RDC"
  tar --extract --file="${URL:7}" --directory="$(dirname "$RD")"/. "$(basename "$RD")"
  cp "$RD" "$RDC"
 fi
 if [ ! -s "$RDC" ]; then
  rm -f "$RD"
  rm -f "$RDC"
  MSG="Downloading installer"
  info "Install: $MSG..." && html "$MSG..."
  SIZE=5394188
  POS="65627648-71021835"
  VERIFY="b4215a4b213ff5154db0488f92c87864"
  LOC="$DL/release/7.0.1/42218/DSM_VirtualDSM_42218.pat"
  [[ "${URL,,}" == *"_42218.pat" ]] && LOC="$URL"
  /run/progress.sh "$RD" "$SIZE" "$MSG ([P])..." &
  { curl -r "$POS" -sfk --connect-timeout 10 -S -o "$RD" "$LOC"; rc=$?; } || :
  fKill "progress.sh"
  ERR="Failed to download $LOC"
  (( rc == 3 )) && error "$ERR , cannot write file (disk full?)" && exit 60
  (( rc == 4 )) && error "$ERR , network failure!" && exit 60
  (( rc == 8 )) && error "$ERR , server issued an error response!" && exit 60
  if (( rc != 0 )); then
    if (( rc != 22 )) && (( rc != 56 )); then
      error "$ERR , reason: $rc" && exit 60
    fi
    SUM="skip"
  else
    SUM=$(md5sum "$RD" | cut -f 1 -d " ")
  fi
  if [ "$SUM" != "$VERIFY" ]; then
    PAT="/install.pat"
    SIZE=379637760
    rm -f "$RD"
    rm -f "$PAT"
    html "$MSG..."
    /run/progress.sh "$PAT" "$SIZE" "$MSG ([P])..." &
    { wget "$LOC" -O "$PAT" -q --no-check-certificate --timeout=10 --show-progress "$PROGRESS"; rc=$?; } || :
    fKill "progress.sh"
    ERR="Failed to download $LOC"
    (( rc == 3 )) && error "$ERR , cannot write file (disk full?)" && exit 60
    (( rc == 4 )) && error "$ERR , network failure!" && exit 60
    (( rc == 8 )) && error "$ERR , server issued an error response!" && exit 60
    (( rc != 0 )) && error "$ERR , reason: $rc" && exit 60
    tar --extract --file="$PAT" --directory="$(dirname "$RD")"/. "$(basename "$RD")"
    rm "$PAT"
  fi
  cp "$RD" "$RDC"
 fi
 if [ -f "$RDC" ]; then
  { xz -dc <"$RDC" >"$TMP/rd" 2>/dev/null; rc=$?; } || :
  (( rc != 1 )) && error "Failed to unxz $RDC on $FS, reason $rc" && exit 91
  { (cd "$TMP" && cpio -idm <"$TMP/rd" 2>/dev/null); rc=$?; } || :
  if (( rc != 0 )); then
    ROOT="N"
    { (cd "$TMP" && fakeroot cpio -idmu <"$TMP/rd" 2>/dev/null); rc=$?; } || :
    (( rc != 0 )) && error "Failed to extract $RDC on $FS, reason $rc" && exit 92
  fi
  rm -rf /run/extract && mkdir -p /run/extract
  for file in $TMP/usr/lib/libcurl.so.4 \
              $TMP/usr/lib/libmbedcrypto.so.5 \
              $TMP/usr/lib/libmbedtls.so.13 \
              $TMP/usr/lib/libmbedx509.so.1 \
              $TMP/usr/lib/libmsgpackc.so.2 \
              $TMP/usr/lib/libsodium.so \
              $TMP/usr/lib/libsynocodesign-ng-virtual-junior-wins.so.7 \
              $TMP/usr/syno/bin/scemd; do
    cp "$file" /run/extract/
  done
  if [ "$ARCH" != "amd64" ]; then
    mkdir -p /lib64/
    cp "$TMP/usr/lib/libc.so.6" /lib64/
    cp "$TMP/usr/lib/libpthread.so.0" /lib64/
    cp "$TMP/usr/lib/ld-linux-x86-64.so.2" /lib64/
  fi
  mv /run/extract/scemd /run/extract/syno_extract_system_patch
  chmod +x /run/extract/syno_extract_system_patch
 fi
 rm -rf "$TMP" && mkdir -p "$TMP"
 info "Install: Downloading $BASE.pat..."
 MSG="Downloading DSM"
 ERR="Failed to download $URL"
  info "Install: Downloading $BASE.pat..."
 fi
 html "$MSG..."
@ -145,22 +240,17 @@ rm -f "$PAT"
 if [[ "$URL" == "file://"* ]]; then
  if [ ! -f "${URL:7}" ]; then
    error "File '${URL:7}' does not exist!" && exit 65
  fi
  cp "${URL:7}" "$PAT"
 else
  SIZE=0
  [[ "${URL,,}" == *"_72806.pat" ]] && SIZE=361010261
  [[ "${URL,,}" == *"_69057.pat" ]] && SIZE=363837333
  [[ "${URL,,}" == *"_42218.pat" ]] && SIZE=379637760
  /run/progress.sh "$PAT" "$SIZE" "$MSG ([P])..." &
-  { wget "$URL" -O "$PAT" -q --no-check-certificate --timeout=10 --no-http-keep-alive --show-progress "$PROGRESS"; rc=$?; } || :
+  { wget "$URL" -O "$PAT" -q --no-check-certificate --timeout=10 --show-progress "$PROGRESS"; rc=$?; } || :
  fKill "progress.sh"
@ -179,7 +269,7 @@ if ((SIZE<250000000)); then
  error "The specified PAT file is probably an update pack as it's too small." && exit 62
 fi
-MSG="Extracting installation image..."
+MSG="Extracting downloaded image..."
 info "Install: $MSG" && html "$MSG"
 if { tar tf "$PAT"; } >/dev/null 2>&1; then
@ -188,15 +278,22 @@ if { tar tf "$PAT"; } >/dev/null 2>&1; then
 else
-  { (cd "$TMP" && python3 /run/extract.py -i "$PAT" -d 2>/run/extract.log); rc=$?; } || :
+  export LD_LIBRARY_PATH="/run/extract"
-  if (( rc != 0 )); then
+  if [ "$ARCH" == "amd64" ]; then
-    cat /run/extract.log
+    { /run/extract/syno_extract_system_patch "$PAT" "$TMP/."; rc=$?; } || :
-    error "Failed to extract PAT file, reason $rc" && exit 63
+  else
    { qemu-x86_64 /run/extract/syno_extract_system_patch "$PAT" "$TMP/."; rc=$?; } || :
  fi
  export LD_LIBRARY_PATH=""
  (( rc != 0 )) && error "Failed to extract PAT file, reason $rc" && exit 63
 fi
 rm -rf /run/extract
 MSG="Preparing system partition..."
 info "Install: $MSG" && html "$MSG"
@ -210,12 +307,12 @@ SYSTEM="$STORAGE/$BASE.system.img"
 rm -f "$SYSTEM"
 # Check free diskspace
-SYSTEM_SIZE=10738466816
+SYSTEM_SIZE=4954537983
 SPACE=$(df --output=avail -B 1 "$STORAGE" | tail -n 1)
-SPACE_MB=$(formatBytes "$SPACE")
+SPACE_MB=$(( (SPACE + 1048575)/1048576 ))
 if (( SYSTEM_SIZE > SPACE )); then
-  error "Not enough free space in $STORAGE to create a 10 GB system disk, have only $SPACE_MB available." && exit 97
+  error "Not enough free space in $STORAGE to create a 5 GB system disk, have only $SPACE_MB MB available." && exit 97
 fi
 if ! touch "$SYSTEM"; then
@ -230,14 +327,12 @@ if [[ "${FS,,}" == "btrfs" ]]; then
  fi
 fi
-if ! fallocate -l "$SYSTEM_SIZE" "$SYSTEM" &>/dev/null; then
+if ! fallocate -l "$SYSTEM_SIZE" "$SYSTEM"; then
  if ! fallocate -l -x "$SYSTEM_SIZE" "$SYSTEM"; then
  if ! truncate -s "$SYSTEM_SIZE" "$SYSTEM"; then
    rm -f "$SYSTEM"
    error "Could not allocate file $SYSTEM for the system disk." && exit 98
  fi
 fi
 fi
 PART="$TMP/partition.fdisk"
@ -247,8 +342,8 @@ PART="$TMP/partition.fdisk"
        echo "unit: sectors"
        echo "sector-size: 512"
        echo ""
-        echo "${SYSTEM}1 : start=        2048, size=    16777216, type=83"
+        echo "${SYSTEM}1 : start=        2048, size=     4980480, type=83"
-        echo "${SYSTEM}2 : start=    16779264, size=     4194304, type=82"
+        echo "${SYSTEM}2 : start=     4982528, size=     4194304, type=82"
 } > "$PART"
 sfdisk -q "$SYSTEM" < "$PART"
@ -270,23 +365,36 @@ mv "$HDA.tgz" "$HDA.txz"
 [ -d "$PKG" ] && mv "$PKG/" "$MOUNT/.SynoUpgradePackages/"
 rm -f "$MOUNT/.SynoUpgradePackages/ActiveInsight-"*
 [ -s "$HDP.txz" ] && tar xpfJ "$HDP.txz" --absolute-names -C "$MOUNT/"
 if [ -s "$IDB.txz" ]; then
-  INDEX_DB="$MOUNT/usr/syno/synoman/indexdb"
+  INDEX_DB="$MOUNT/usr/syno/synoman/indexdb/"
  mkdir -p "$INDEX_DB"
  tar xpfJ "$IDB.txz" --absolute-names -C "$INDEX_DB"
 fi
 LABEL="1.44.1-42218"
 OFFSET="1048576" # 2048 * 512
-NUMBLOCKS="2097152" # (16777216 * 512) / 4096
+NUMBLOCKS="622560" # (4980480 * 512) / 4096
 MSG="Installing system partition..."
 if [[ "$ROOT" != [Nn]* ]]; then
  tar xpfJ "$HDA.txz" --absolute-names --skip-old-files -C "$MOUNT/"
  info "Install: $MSG" && html "$MSG"
  mke2fs -q -t ext4 -b 4096 -d "$MOUNT/" -L "$LABEL" -F -E "offset=$OFFSET" "$SYSTEM" "$NUMBLOCKS"
 else
  fakeroot -- bash -c "set -Eeu;\
  [ -s $HDP.txz ] && tar xpfJ $HDP.txz --absolute-names -C $MOUNT/;\
  [ -s $IDB.txz ] && tar xpfJ $IDB.txz --absolute-names -C $INDEX_DB/;\
        tar xpfJ $HDA.txz --absolute-names --skip-old-files -C $MOUNT/;\
        printf '%b%s%b' '\E[1;34m❯ \E[1;36m' 'Install: $MSG' '\E[0m\n';\
        mke2fs -q -t ext4 -b 4096 -d $MOUNT/ -L $LABEL -F -E offset=$OFFSET $SYSTEM $NUMBLOCKS"
 fi
 rm -rf "$MOUNT"
 echo "$BASE" > "$STORAGE/dsm.ver"
@ -299,7 +407,5 @@ fi
 mv -f "$BOOT" "$STORAGE/$BASE.boot.img"
 rm -rf "$TMP"
-html "Booting DSM instance..."
+html "Installation finished successfully..."
 sleep 1.2
 return 0
--- a/src/network.sh
+++ b/src/network.sh
@ -4,12 +4,10 @@ set -Eeuo pipefail
 # Docker environment variables
 : "${MAC:=""}"
 : "${MTU:=""}"
 : "${DHCP:="N"}"
 : "${NETWORK:="Y"}"
 : "${USER_PORTS:=""}"
 : "${HOST_PORTS:=""}"
-: "${ADAPTER:="virtio-net-pci"}"
+: "${USER_PORTS:=""}"
 : "${VM_NET_DEV:=""}"
 : "${VM_NET_TAP:="dsm"}"
@ -37,32 +35,11 @@ configureDHCP() {
  fi
  # Create a macvtap network for the VM guest
-  { msg=$(ip link add link "$VM_NET_DEV" name "$VM_NET_TAP" address "$VM_NET_MAC" type macvtap mode bridge 2>&1); rc=$?; } || :
+  { ip link add link "$VM_NET_DEV" name "$VM_NET_TAP" address "$VM_NET_MAC" type macvtap mode bridge ; rc=$?; } || :
  case "$msg" in
    "RTNETLINK answers: File exists"* )
      while ! ip link add link "$VM_NET_DEV" name "$VM_NET_TAP" address "$VM_NET_MAC" type macvtap mode bridge; do
        info "Waiting for macvtap interface to become available.."
        sleep 5
      done  ;;
    "RTNETLINK answers: Invalid argument"* )
      error "Cannot create macvtap interface. Please make sure that the network type of the container is 'macvlan' and not 'ipvlan'."
      return 1 ;;
    "RTNETLINK answers: Operation not permitted"* )
      error "No permission to create macvtap interface. Please make sure that your host kernel supports it and that the NET_ADMIN capability is set."
      return 1 ;;
    *)
      [ -n "$msg" ] && echo "$msg" >&2
  if (( rc != 0 )); then
-        error "Cannot create macvtap interface."
+    error "Cannot create macvtap interface. Please make sure that the network type is 'macvlan' and not 'ipvlan',"
-        return 1
+    error "that your kernel is recent (>4) and supports it, and that the container has the NET_ADMIN capability set." && return 1
      fi ;;
  esac
  if [[ "$MTU" != "0" ]] && [[ "$MTU" != "1500" ]]; then
    if ! ip link set dev "$VM_NET_TAP" mtu "$MTU"; then
      warn "Failed to set MTU size.."
    fi
  fi
  while ! ip link set "$VM_NET_TAP" up; do
@ -104,33 +81,21 @@ configureDHCP() {
 configureDNS() {
  # dnsmasq configuration:
  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
  chmod 644 /var/lib/misc/dnsmasq.leases
  # dnsmasq configuration:
  DNSMASQ_OPTS+=" --dhcp-authoritative"
  # Set DHCP range and host
  DNSMASQ_OPTS+=" --dhcp-range=$VM_NET_IP,$VM_NET_IP"
  DNSMASQ_OPTS+=" --dhcp-host=$VM_NET_MAC,,$VM_NET_IP,$VM_NET_HOST,infinite"
  # Set DNS server and gateway
-  DNSMASQ_OPTS+=" --dhcp-option=option:netmask,255.255.255.0"
+  DNSMASQ_OPTS+=" --dhcp-option=option:dns-server,${VM_NET_IP%.*}.1 --dhcp-option=option:router,${VM_NET_IP%.*}.1"
  DNSMASQ_OPTS+=" --dhcp-option=option:router,${VM_NET_IP%.*}.1"
  DNSMASQ_OPTS+=" --dhcp-option=option:dns-server,${VM_NET_IP%.*}.1"
  # Add DNS entry for container
  DNSMASQ_OPTS+=" --address=/host.lan/${VM_NET_IP%.*}.1"
  DNSMASQ_OPTS=$(echo "$DNSMASQ_OPTS" | sed 's/\t/ /g' | tr -s ' ' | sed 's/^ *//')
  if [[ "${DEBUG_DNS:-}" == [Yy1]* ]]; then
   DNSMASQ_OPTS+=" -d"
   $DNSMASQ ${DNSMASQ_OPTS:+ $DNSMASQ_OPTS} &
   return 0
  fi
  if ! $DNSMASQ ${DNSMASQ_OPTS:+ $DNSMASQ_OPTS}; then
    error "Failed to start dnsmasq, reason: $?" && return 1
  fi
@ -147,7 +112,7 @@ getUserPorts() {
  [ -z "$list" ] && list="$ssh,$dsm" || list+=",$ssh,$dsm"
-  list="${list//,/ }"
+  list="${list/,/ }"
  list="${list## }"
  list="${list%% }"
@ -176,11 +141,7 @@ getHostPorts() {
 configureUser() {
  if [ -z "$IP6" ]; then
  NET_OPTS="-netdev user,id=hostnet0,host=${VM_NET_IP%.*}.1,net=${VM_NET_IP%.*}.0/24,dhcpstart=$VM_NET_IP,hostname=$VM_NET_HOST"
  else
    NET_OPTS="-netdev user,id=hostnet0,ipv4=on,host=${VM_NET_IP%.*}.1,net=${VM_NET_IP%.*}.0/24,dhcpstart=$VM_NET_IP,ipv6=on,hostname=$VM_NET_HOST"
  fi
  local forward
  forward=$(getUserPorts "$USER_PORTS")
@ -191,12 +152,8 @@ configureUser() {
 configureNAT() {
  local tuntap="TUN device is missing. $ADD_ERR --device /dev/net/tun"
  local tables="The 'ip_tables' kernel module is not loaded. Try this command: sudo modprobe ip_tables iptable_nat"
  # Create the necessary file structure for /dev/net/tun
  if [ ! -c /dev/net/tun ]; then
    [[ "$PODMAN" == [Yy1]* ]] && return 1
    [ ! -d /dev/net ] && mkdir -m 755 /dev/net
    if mknod /dev/net/tun c 10 200; then
      chmod 666 /dev/net/tun
@ -204,20 +161,22 @@ configureNAT() {
  fi
  if [ ! -c /dev/net/tun ]; then
-    error "$tuntap" && return 1
+    error "TUN device missing. $ADD_ERR --device /dev/net/tun --cap-add NET_ADMIN" && return 1
  fi
  # Check port forwarding flag
  if [[ $(< /proc/sys/net/ipv4/ip_forward) -eq 0 ]]; then
-    { sysctl -w net.ipv4.ip_forward=1 > /dev/null 2>&1; rc=$?; } || :
+    { sysctl -w net.ipv4.ip_forward=1 > /dev/null; rc=$?; } || :
    if (( rc != 0 )) || [[ $(< /proc/sys/net/ipv4/ip_forward) -eq 0 ]]; then
-      [[ "$PODMAN" == [Yy1]* ]] && return 1
+      error "IP forwarding is disabled. $ADD_ERR --sysctl net.ipv4.ip_forward=1" && return 1
      error "IP forwarding is disabled. $ADD_ERR --sysctl net.ipv4.ip_forward=1"
      return 1
    fi
  fi
  local tables="The 'ip_tables' kernel module is not loaded. Try this command: sudo modprobe ip_tables iptable_nat"
  local tuntap="The 'tun' kernel module is not available. Try this command: 'sudo modprobe tun' or run the container with 'privileged: true'."
  # Create a bridge with a static IP for the VM guest
  { ip link add dev dockerbridge type bridge ; rc=$?; } || :
  if (( rc != 0 )); then
@ -225,7 +184,7 @@ configureNAT() {
  fi
  if ! ip address add "${VM_NET_IP%.*}.1/24" broadcast "${VM_NET_IP%.*}.255" dev dockerbridge; then
-    error "Failed to add IP address pool!" && return 1
+    error "Failed to add IP address!" && return 1
  fi
  while ! ip link set dockerbridge up; do
@ -238,18 +197,6 @@ configureNAT() {
    error "$tuntap" && return 1
  fi
  if [[ "$MTU" != "0" ]] && [[ "$MTU" != "1500" ]]; then
    if ! ip link set dev "$VM_NET_TAP" mtu "$MTU"; then
      warn "Failed to set MTU size.."
    fi
  fi
  GATEWAY_MAC=$(echo "$VM_NET_MAC" | md5sum | sed 's/^\(..\)\(..\)\(..\)\(..\)\(..\).*$/02:\1:\2:\3:\4:\5/')
  if ! ip link set dev "$VM_NET_TAP" address "$GATEWAY_MAC"; then
    warn "Failed to set gateway MAC address.."
  fi
  while ! ip link set "$VM_NET_TAP" up promisc on; do
    info "Waiting for TAP to become available..."
    sleep 2
@ -292,23 +239,7 @@ configureNAT() {
  NET_OPTS+=",script=no,downscript=no"
-  configureDNS || return 1
+  ! configureDNS && return 1
  return 0
 }
 closeBridge() {
  local pid="/var/run/dnsmasq.pid"
  [ -s "$pid" ] && pKill "$(<"$pid")"
  [[ "${NETWORK,,}" == "user"* ]] && return 0
  ip link set "$VM_NET_TAP" down promisc off &> null || true
  ip link delete "$VM_NET_TAP" &> null || true
  ip link set dockerbridge down &> null || true
  ip link delete dockerbridge &> null || true
  return 0
 }
@ -328,36 +259,40 @@ closeNetwork() {
  exec 30<&- || true
  exec 40<&- || true
-  if [[ "$DHCP" != [Yy1]* ]]; then
+  if [[ "$DHCP" == [Yy1]* ]]; then
    closeBridge
    return 0
  fi
    ip link set "$VM_NET_TAP" down || true
    ip link delete "$VM_NET_TAP" || true
  else
    local pid="/var/run/dnsmasq.pid"
    [ -s "$pid" ] && pKill "$(<"$pid")"
    [[ "${NETWORK,,}" == "user"* ]] && return 0
    ip link set "$VM_NET_TAP" down promisc off || true
    ip link delete "$VM_NET_TAP" || true
    ip link set dockerbridge down || true
    ip link delete dockerbridge || true
  fi
  return 0
 }
 checkOS() {
-  local kernel
+  local name
  local os=""
-  local if="macvlan"
+  name=$(uname -a)
  kernel=$(uname -a)
-  [[ "${kernel,,}" == *"darwin"* ]] && os="Docker Desktop for macOS"
+  [[ "${name,,}" == *"darwin"* ]] && os="MacOS"
-  [[ "${kernel,,}" == *"microsoft"* ]] && os="Docker Desktop for Windows"
+  [[ "${name,,}" == *"microsoft"* ]] && os="Windows"
  if [[ "$DHCP" == [Yy1]* ]]; then
    if="macvtap"
    [[ "${kernel,,}" == *"synology"* ]] && os="Synology Container Manager"
  fi
  if [ -n "$os" ]; then
-    warn "you are using $os which does not support $if, please revert to bridge networking!"
+    warn "you are using Docker Desktop for $os which does not support macvlan, please revert to bridge networking!"
  fi
  return 0
@ -378,33 +313,12 @@ getInfo() {
  if [ ! -d "/sys/class/net/$VM_NET_DEV" ]; then
    error "Network interface '$VM_NET_DEV' does not exist inside the container!"
-    error "$ADD_ERR -e \"VM_NET_DEV=NAME\" to specify another interface name." && exit 26
+    error "$ADD_ERR -e \"VM_NET_DEV=NAME\" to specify another interface name." && exit 27
  fi
  BASE_IP="${VM_NET_IP%.*}."
  if [ "${VM_NET_IP/$BASE_IP/}" -lt "3" ]; then
    error "Invalid VM_NET_IP, must end in a higher number than .3" && exit 27
  fi
  if [ -z "$MTU" ]; then
    MTU=$(cat "/sys/class/net/$VM_NET_DEV/mtu")
  fi
  if [ "$MTU" -gt "1500" ]; then
    info "MTU size is too large: $MTU, ignoring..." && MTU="0"
  fi
  if [[ "${ADAPTER,,}" != "virtio-net-pci" ]]; then
    if [[ "$MTU" != "0" ]] && [[ "$MTU" != "1500" ]]; then
      warn "MTU size is $MTU, but cannot be set for $ADAPTER adapters!" && MTU="0"
    fi
  fi
  if [ -z "$VM_NET_MAC" ]; then
    local file="$STORAGE/dsm.mac"
    [ -s "$file" ] && VM_NET_MAC=$(<"$file")
    VM_NET_MAC="${VM_NET_MAC//[![:print:]]/}"
    if [ -z "$VM_NET_MAC" ]; then
      # Generate MAC address based on Docker container ID in hostname
      VM_NET_MAC=$(echo "$HOST" | md5sum | sed 's/^\(..\)\(..\)\(..\)\(..\)\(..\).*$/02:11:32:\3:\4:\5/')
@ -424,17 +338,8 @@ getInfo() {
    error "Invalid MAC address: '$VM_NET_MAC', should be 12 or 17 digits long!" && exit 28
  fi
-  GATEWAY=$(ip route list dev "$VM_NET_DEV" | awk ' /^default/ {print $3}' | head -n 1)
+  GATEWAY=$(ip route list dev "$VM_NET_DEV" | awk ' /^default/ {print $3}')
-  IP=$(ip address show dev "$VM_NET_DEV" | grep inet | awk '/inet / { print $2 }' | cut -f1 -d/ | head -n 1)
+  IP=$(ip address show dev "$VM_NET_DEV" | grep inet | awk '/inet / { print $2 }' | cut -f1 -d/)
  IP6=""
  # shellcheck disable=SC2143
  if [ -f /proc/net/if_inet6 ] && [ -n "$(ifconfig -a | grep inet6)" ]; then
    IP6=$(ip -6 addr show dev "$VM_NET_DEV" scope global up)
    [ -n "$IP6" ] && IP6=$(echo "$IP6" | sed -e's/^.*inet6 \([^ ]*\)\/.*$/\1/;t;d' | head -n 1)
  fi
  [ -f "/run/.containerenv" ] && PODMAN="Y" || PODMAN="N"
  echo "$IP" > /run/shm/qemu.ip
  return 0
@ -453,14 +358,8 @@ getInfo
 html "Initializing network..."
 if [[ "$DEBUG" == [Yy1]* ]]; then
-  mtu=$(cat "/sys/class/net/$VM_NET_DEV/mtu")
+  info "Host: $HOST  IP: $IP  Gateway: $GATEWAY  Interface: $VM_NET_DEV  MAC: $VM_NET_MAC"
-  line="Host: $HOST  IP: $IP  Gateway: $GATEWAY  Interface: $VM_NET_DEV  MAC: $VM_NET_MAC  MTU: $mtu"
+  [ -f /etc/resolv.conf ] && grep '^nameserver*' /etc/resolv.conf
  [[ "$MTU" != "0" ]] && [[ "$MTU" != "$mtu" ]] && line+=" ($MTU)"
  info "$line"
  if [ -f /etc/resolv.conf ]; then
    nameservers=$(grep '^nameserver*' /etc/resolv.conf | head -c -1 | sed 's/nameserver //g;' | sed -z 's/\n/, /g')
    [ -n "$nameservers" ] && info "Nameservers: $nameservers"
  fi
  echo
 fi
@ -468,11 +367,6 @@ if [[ "$IP" == "172.17."* ]]; then
  warn "your container IP starts with 172.17.* which will cause conflicts when you install the Container Manager package inside DSM!"
 fi
 if [[ -d "/sys/class/net/$VM_NET_TAP" ]]; then
  info "Lingering interface will be removed..."
  ip link delete "$VM_NET_TAP" || true
 fi
 if [[ "$DHCP" == [Yy1]* ]]; then
  checkOS
@ -482,7 +376,7 @@ if [[ "$DHCP" == [Yy1]* ]]; then
  fi
  # Configure for macvtap interface
-  configureDHCP || exit 20
+  ! configureDHCP && exit 20
  MSG="Booting DSM instance..."
  html "$MSG"
@ -502,16 +396,14 @@ else
    # Configure for tap interface
    if ! configureNAT; then
      closeBridge
      NETWORK="user"
-      msg="falling back to user-mode networking!"
+      warn "falling back to usermode networking! Performance will be bad and port forwarding will not work."
-      if [[ "$PODMAN" != [Yy1]* ]]; then
+
-        msg="an error occured, $msg"
+      ip link set "$VM_NET_TAP" down promisc off &> null || true
-      else
+      ip link delete "$VM_NET_TAP" &> null || true
-        msg="podman detected, $msg"
+
-      fi
+      ip link set dockerbridge down &> null || true
-      warn "$msg"
+      ip link delete dockerbridge &> null || true
      [ -z "$USER_PORTS" ] && info "Notice: port mapping will not work without \"USER_PORTS\" now."
    fi
@ -519,14 +411,13 @@ else
  if [[ "${NETWORK,,}" == "user"* ]]; then
-    # Configure for user-mode networking (slirp)
+    # Configure for usermode networking (slirp)
-    configureUser || exit 24
+    ! configureUser && exit 24
  fi
 fi
-NET_OPTS+=" -device $ADAPTER,id=net0,netdev=hostnet0,romfile=,mac=$VM_NET_MAC"
+NET_OPTS+=" -device virtio-net-pci,romfile=,netdev=hostnet0,mac=$VM_NET_MAC,id=net0"
 [[ "$MTU" != "0" ]] && [[ "$MTU" != "1500" ]] && NET_OPTS+=",host_mtu=$MTU"
 return 0
--- a/src/proc.sh
+++ b/src/proc.sh
@ -9,24 +9,6 @@ set -Eeuo pipefail
 : "${CPU_MODEL:=""}"
 : "${DEF_MODEL:="qemu64"}"
 CLOCKSOURCE="tsc"
 [[ "${ARCH,,}" == "arm64" ]] && CLOCKSOURCE="arch_sys_counter"
 CLOCK="/sys/devices/system/clocksource/clocksource0/current_clocksource"
 if [ ! -f "$CLOCK" ]; then
  warn "file \"$CLOCK\" cannot not found?"
 else
  result=$(<"$CLOCK")
  result="${result//[![:print:]]/}"
  case "${result,,}" in
    "${CLOCKSOURCE,,}" ) ;;
    "kvm-clock" ) info "Nested KVM virtualization detected.." ;;
    "hyperv_clocksource_tsc_page" ) info "Nested Hyper-V virtualization detected.." ;;
    "hpet" ) warn "unsupported clock source detected: '$result'. Please set host clock source to '$CLOCKSOURCE'." ;;
    *) warn "unexpected clock source detected: '$result'. Please set host clock source to '$CLOCKSOURCE'." ;;
  esac
 fi
 if [[ "${ARCH,,}" != "amd64" ]]; then
  KVM="N"
  warn "your CPU architecture is ${ARCH^^} and cannot provide KVM acceleration for x64 instructions, this will cause a major loss of performance."
@ -37,14 +19,14 @@ if [[ "$KVM" != [Nn]* ]]; then
  KVM_ERR=""
  if [ ! -e /dev/kvm ]; then
-    KVM_ERR="(/dev/kvm is missing)"
+    KVM_ERR="(device file missing)"
  else
    if ! sh -c 'echo -n > /dev/kvm' &> /dev/null; then
-      KVM_ERR="(/dev/kvm is unwriteable)"
+      KVM_ERR="(no write access)"
    else
      flags=$(sed -ne '/^flags/s/^.*: //p' /proc/cpuinfo)
      if ! grep -qw "vmx\|svm" <<< "$flags"; then
-        KVM_ERR="(not enabled in BIOS)"
+        KVM_ERR="(vmx/svm disabled)"
      fi
    fi
  fi
@ -52,27 +34,24 @@ if [[ "$KVM" != [Nn]* ]]; then
  if [ -n "$KVM_ERR" ]; then
    KVM="N"
    if [[ "$OSTYPE" =~ ^darwin ]]; then
-      warn "you are using macOS which has no KVM support, this will cause a major loss of performance."
+      warn "you are using MacOS which has no KVM support, this will cause a major loss of performance."
    else
-      kernel=$(uname -a)
+      if grep -qi Microsoft /proc/version; then
-      case "${kernel,,}" in
+        warn "you are using Windows 10 which has no KVM support, this will cause a major loss of performance."
-        *"microsoft"* )
+      else
-          error "Please bind '/dev/kvm' as a volume in the optional container settings when using Docker Desktop." ;;
+        error "KVM acceleration not available $KVM_ERR, this will cause a major loss of performance."
-        *"synology"* )
+        error "See the FAQ on how to diagnose the cause, or continue without KVM by setting KVM=N (not recommended)."
          error "Please make sure that Synology VMM (Virtual Machine Manager) is installed and that '/dev/kvm' is binded to this container." ;;
        *)
          error "KVM acceleration is not available $KVM_ERR, this will cause a major loss of performance."
          error "See the FAQ for possible causes, or continue without it by adding KVM: \"N\" (not recommended)." ;;
      esac
        [[ "$DEBUG" != [Yy1]* ]] && exit 88
      fi
    fi
  fi
 fi
 if [[ "$KVM" != [Nn]* ]]; then
  CPU_FEATURES="kvm=on,l3-cache=on,+hypervisor"
  CLOCK="/sys/devices/system/clocksource/clocksource0/current_clocksource"
  KVM_OPTS=",accel=kvm -enable-kvm -global kvm-pit.lost_tick_policy=discard"
  if ! grep -qw "sse4_2" <<< "$flags"; then
@ -86,6 +65,15 @@ if [[ "$KVM" != [Nn]* ]]; then
    CPU_FEATURES+=",migratable=no"
  fi
  if [ -f "$CLOCK" ]; then
    CLOCK=$(<"$CLOCK")
    if [[ "${CLOCK,,}" != "tsc" ]]; then
      warn "unexpected clocksource: $CLOCK"
    fi
  else
    warn "file \"$CLOCK\" cannot not found?"
  fi
  if grep -qw "svm" <<< "$flags"; then
    # AMD processor
@ -143,7 +131,7 @@ else
 fi
 if [ -z "$HOST_CPU" ]; then
-  [[ "${CPU,,}" != "unknown" ]] && HOST_CPU="$CPU"
+  HOST_CPU=$(lscpu | grep -m 1 'Model name' | cut -f 2 -d ":" | awk '{$1=$1}1' | sed 's# @.*##g' | sed s/"(R)"//g | sed 's/[^[:alnum:] ]\+/ /g' | sed 's/  */ /g')
 fi
 if [ -n "$HOST_CPU" ]; then
--- a/src/reset.sh
+++ b/src/reset.sh
@ -1,6 +1,10 @@
 #!/usr/bin/env bash
 set -Eeuo pipefail
 info () { printf "%b%s%b" "\E[1;34m❯ \E[1;36m" "${1:-}" "\E[0m\n"; }
 error () { printf "%b%s%b" "\E[1;31m❯ " "ERROR: ${1:-}" "\E[0m\n" >&2; }
 warn () { printf "%b%s%b" "\E[1;31m❯ " "Warning: ${1:-}" "\E[0m\n" >&2; }
 trap 'error "Status $? while: $BASH_COMMAND (line $LINENO/$BASH_LINENO)"' ERR
 [ ! -f "/run/entry.sh" ] && error "Script must run inside Docker container!" && exit 11
@ -17,24 +21,24 @@ echo "❯ For support visit $SUPPORT"
 : "${CONSOLE:="N"}"       # Disable console mode
 : "${ALLOCATE:=""}"       # Preallocate diskspace
 : "${ARGUMENTS:=""}"      # Extra QEMU parameters
-: "${CPU_CORES:="2"}"      # Amount of CPU cores
+: "${CPU_CORES:="1"}"     # Amount of CPU cores
-: "${RAM_SIZE:="2G"}"      # Maximum RAM amount
+: "${RAM_SIZE:="1G"}"     # Maximum RAM amount
 : "${RAM_CHECK:="Y"}"     # Check available RAM
 : "${DISK_SIZE:="16G"}"   # Initial data disk size
 : "${STORAGE:="/storage"}" # Storage folder location
 # Helper variables
 PROCESS="${APP,,}"
 PROCESS="${PROCESS// /-}"
 STORAGE="/storage"
 INFO="/run/shm/msg.html"
 PAGE="/run/shm/index.html"
 TEMPLATE="/var/www/index.html"
 FOOTER1="$APP for Docker v$(</run/version)"
 FOOTER2="<a href='$SUPPORT'>$SUPPORT</a>"
-CPU=$(cpu)
+CPI=$(lscpu)
 SYS=$(uname -r)
 HOST=$(hostname -s)
 KERNEL=$(echo "$SYS" | cut -b 1)
@ -42,13 +46,18 @@ MINOR=$(echo "$SYS" | cut -d '.' -f2)
 ARCH=$(dpkg --print-architecture)
 CORES=$(grep -c '^processor' /proc/cpuinfo)
-if ! grep -qi "socket(s)" <<< "$(lscpu)"; then
+if ! grep -qi "socket(s)" <<< "$CPI"; then
  SOCKETS=1
 else
-  SOCKETS=$(lscpu | grep -m 1 -i 'socket(s)' | awk '{print $(2)}')
+  SOCKETS=$(echo "$CPI" | grep -m 1 -i 'socket(s)' | awk '{print $(2)}')
 fi
-[ -n "${CPU_CORES//[0-9 ]}" ] && error "Invalid amount of CPU_CORES: $CPU_CORES" && exit 15
+if ! grep -qi "model name" <<< "$CPI"; then
  CPU="Unknown"
 else
  CPU=$(echo "$CPI" | grep -m 1 -i 'model name' | cut -f 2 -d ":" | awk '{$1=$1}1' | sed 's# @.*##g' | sed s/"(R)"//g | sed 's/[^[:alnum:] ]\+/ /g' | sed 's/  */ /g')
  CPU="${CPU// with Radeon Graphics/}"
 fi
 # Check system
@ -60,11 +69,6 @@ fi
 # Check folder
 if [[ "${COMMIT:-}" == [Yy1]* ]]; then
  STORAGE="/local"
  mkdir -p "$STORAGE"
 fi
 if [ ! -d "$STORAGE" ]; then
  error "Storage folder ($STORAGE) not found!" && exit 13
 fi
@ -81,39 +85,28 @@ fi
 RAM_SPARE=500000000
 RAM_AVAIL=$(free -b | grep -m 1 Mem: | awk '{print $7}')
 RAM_TOTAL=$(free -b | grep -m 1 Mem: | awk '{print $2}')
 RAM_SIZE="${RAM_SIZE// /}"
 [ -z "$RAM_SIZE" ] && error "RAM_SIZE not specified!" && exit 16
 if [ -z "${RAM_SIZE//[0-9. ]}" ]; then
  [ "${RAM_SIZE%%.*}" -lt "130" ] && RAM_SIZE="${RAM_SIZE}G" || RAM_SIZE="${RAM_SIZE}M"
 fi
 RAM_SIZE=$(echo "${RAM_SIZE^^}" | sed 's/MB/M/g;s/GB/G/g;s/TB/T/g')
 ! numfmt --from=iec "$RAM_SIZE" &>/dev/null && error "Invalid RAM_SIZE: $RAM_SIZE" && exit 16
 RAM_WANTED=$(numfmt --from=iec "$RAM_SIZE")
-[ "$RAM_WANTED" -lt "136314880 " ] && error "RAM_SIZE is too low: $RAM_SIZE" && exit 16
+AVAIL_GB=$(( RAM_AVAIL/1073741824 ))
 TOTAL_GB=$(( (RAM_TOTAL + 1073741823)/1073741824 ))
 WANTED_GB=$(( (RAM_WANTED + 1073741823)/1073741824 ))
 # Print system info
 SYS="${SYS/-generic/}"
 FS="${FS/UNKNOWN //}"
 FS="${FS/ext2\/ext3/ext4}"
 FS=$(echo "$FS" | sed 's/[)(]//g')
 SPACE=$(df --output=avail -B 1 "$STORAGE" | tail -n 1)
-SPACE_GB=$(formatBytes "$SPACE" "down")
+SPACE_GB=$(( (SPACE + 1073741823)/1073741824 ))
 AVAIL_MEM=$(formatBytes "$RAM_AVAIL" "down")
 TOTAL_MEM=$(formatBytes "$RAM_TOTAL" "up")
-echo "❯ CPU: ${CPU} | RAM: ${AVAIL_MEM/ GB/}/$TOTAL_MEM | DISK: $SPACE_GB (${FS}) | KERNEL: ${SYS}..."
+echo "❯ CPU: ${CPU} | RAM: $AVAIL_GB/$TOTAL_GB GB | DISK: $SPACE_GB GB (${FS}) | HOST: ${SYS}..."
 echo
-# Check available memory
+# Check memory
-if [[ "$RAM_CHECK" != [Nn]* ]] && (( (RAM_WANTED + RAM_SPARE) > RAM_AVAIL )); then
+if [[ "$RAM_CHECK" != [Nn]* ]]; then
-  AVAIL_MEM=$(formatBytes "$RAM_AVAIL")
+  if (( (RAM_WANTED + RAM_SPARE) > RAM_AVAIL )); then
-  msg="Your configured RAM_SIZE of ${RAM_SIZE/G/ GB} is too high for the $AVAIL_MEM of memory available, please set a lower value."
+    error "Your configured RAM_SIZE of $WANTED_GB GB is too high for the $AVAIL_GB GB of memory available, please set a lower value."
-  [[ "${FS,,}" != "zfs" ]] && error "$msg" && exit 17
+    exit 17
-  info "$msg"
+  fi
 fi
 # Cleanup files
@ -124,6 +117,91 @@ rm -f /run/shm/dsm.url
 rm -rf /tmp/dsm
 rm -rf "$STORAGE/tmp"
 # Helper functions
 isAlive() {
  local pid=$1
  if kill -0 "$pid" 2>/dev/null; then
    return 0
  fi
  return 1
 }
 pKill() {
  local pid=$1
  { kill -15 "$pid" || true; } 2>/dev/null
  while isAlive "$pid"; do
    sleep 0.2
  done
  return 0
 }
 fWait() {
  local name=$1
  while pgrep -f -l "$name" >/dev/null; do
    sleep 0.2
  done
  return 0
 }
 fKill() {
  local name=$1
  { pkill -f "$name" || true; } 2>/dev/null
  fWait "$name"
  return 0
 }
 escape () {
    local s
    s=${1//&/\&amp;}
    s=${s//</\&lt;}
    s=${s//>/\&gt;}
    s=${s//'"'/\&quot;}
    printf -- %s "$s"
    return 0
 }
 html()
 {
    local title
    local body
    local script
    local footer
    title=$(escape "$APP")
    title="<title>$title</title>"
    footer=$(escape "$FOOTER1")
    body=$(escape "$1")
    if [[ "$body" == *"..." ]]; then
      body="<p class=\"loading\">${body/.../}</p>"
    fi
    [ -n "${2:-}" ] && script="$2" || script=""
    local HTML
    HTML=$(<"$TEMPLATE")
    HTML="${HTML/\[1\]/$title}"
    HTML="${HTML/\[2\]/$script}"
    HTML="${HTML/\[3\]/$body}"
    HTML="${HTML/\[4\]/$footer}"
    HTML="${HTML/\[5\]/$FOOTER2}"
    echo "$HTML" > "$PAGE"
    echo "$body" > "$INFO"
    return 0
 }
 getCountry() {
  local url=$1
  local query=$2
@ -184,17 +262,6 @@ addPackage() {
  return 0
 }
 # shellcheck disable=SC2143
 if [ -f /proc/net/if_inet6 ] && [ -n "$(ifconfig -a | grep inet6)" ]; then
  sed -i "s/listen 5000 default_server;/listen [::]:5000 default_server ipv6only=off;/g" /etc/nginx/sites-enabled/web.conf
 else
  sed -i "s/listen [::]:5000 default_server ipv6only=off;/listen 5000 default_server;/g" /etc/nginx/sites-enabled/web.conf
 fi
 # Start webserver
 cp -r /var/www/* /run/shm
 html "Starting $APP for Docker..."
--- a/src/utils.sh
+++ b/src/utils.sh
@ -1,175 +0,0 @@
 #!/usr/bin/env bash
 set -Eeuo pipefail
 # Helper functions
 info () { printf "%b%s%b" "\E[1;34m❯ \E[1;36m" "${1:-}" "\E[0m\n"; }
 error () { printf "%b%s%b" "\E[1;31m❯ " "ERROR: ${1:-}" "\E[0m\n" >&2; }
 warn () { printf "%b%s%b" "\E[1;31m❯ " "Warning: ${1:-}" "\E[0m\n" >&2; }
 formatBytes() {
  local result
  result=$(numfmt --to=iec --suffix=B "$1" | sed -r 's/([A-Z])/ \1/' | sed 's/ B/ bytes/g;')
  local unit="${result//[0-9. ]}"
  result="${result//[a-zA-Z ]/}"
  if [[ "${2:-}" == "up" ]]; then
    if [[ "$result" == *"."* ]]; then
      result="${result%%.*}"
      result=$((result+1))
    fi
  else
    if [[ "${2:-}" == "down" ]]; then
      result="${result%%.*}"
    fi
  fi
  echo "$result $unit"
  return 0
 }
 isAlive() {
  local pid="$1"
  if kill -0 "$pid" 2>/dev/null; then
    return 0
  fi
  return 1
 }
 pKill() {
  local pid="$1"
  { kill -15 "$pid" || true; } 2>/dev/null
  while isAlive "$pid"; do
    sleep 0.2
  done
  return 0
 }
 fWait() {
  local name="$1"
  while pgrep -f -l "$name" >/dev/null; do
    sleep 0.2
  done
  return 0
 }
 fKill() {
  local name="$1"
  { pkill -f "$name" || true; } 2>/dev/null
  fWait "$name"
  return 0
 }
 escape () {
  local s
  s=${1//&/\&amp;}
  s=${s//</\&lt;}
  s=${s//>/\&gt;}
  s=${s//'"'/\&quot;}
  printf -- %s "$s"
  return 0
 }
 html() {
  local title
  local body
  local script
  local footer
  title=$(escape "$APP")
  title="<title>$title</title>"
  footer=$(escape "$FOOTER1")
  body=$(escape "$1")
  if [[ "$body" == *"..." ]]; then
    body="<p class=\"loading\">${body/.../}</p>"
  fi
  [ -n "${2:-}" ] && script="$2" || script=""
  local HTML
  HTML=$(<"$TEMPLATE")
  HTML="${HTML/\[1\]/$title}"
  HTML="${HTML/\[2\]/$script}"
  HTML="${HTML/\[3\]/$body}"
  HTML="${HTML/\[4\]/$footer}"
  HTML="${HTML/\[5\]/$FOOTER2}"
  echo "$HTML" > "$PAGE"
  echo "$body" > "$INFO"
  return 0
 }
 cpu() {
  local ret
  local cpu=""
  ret=$(lscpu)
  if grep -qi "model name" <<< "$ret"; then
    cpu=$(echo "$ret" | grep -m 1 -i 'model name' | cut -f 2 -d ":" | awk '{$1=$1}1' | sed 's# @.*##g' | sed s/"(R)"//g | sed 's/[^[:alnum:] ]\+/ /g' | sed 's/  */ /g')
  fi
  if [ -z "${cpu// /}" ] && grep -qi "model:" <<< "$ret"; then
    cpu=$(echo "$ret" | grep -m 1 -i 'model:' | cut -f 2 -d ":" | awk '{$1=$1}1' | sed 's# @.*##g' | sed s/"(R)"//g | sed 's/[^[:alnum:] ]\+/ /g' | sed 's/  */ /g')
  fi
  cpu="${cpu// CPU/}"
  cpu="${cpu// 4 Core/}"
  cpu="${cpu// 6 Core/}"
  cpu="${cpu// 8 Core/}"
  cpu="${cpu// 10 Core/}"
  cpu="${cpu// 12 Core/}"
  cpu="${cpu// 16 Core/}"
  cpu="${cpu// 32 Core/}"
  cpu="${cpu// 48 Core/}"
  cpu="${cpu// 64 Core/}"
  cpu="${cpu// 96 Core/}"
  cpu="${cpu// 128 Core/}"
  cpu="${cpu//7th Gen /}"
  cpu="${cpu//8th Gen /}"
  cpu="${cpu//9th Gen /}"
  cpu="${cpu//10th Gen /}"
  cpu="${cpu//11th Gen /}"
  cpu="${cpu//12th Gen /}"
  cpu="${cpu//13th Gen /}"
  cpu="${cpu//14th Gen /}"
  cpu="${cpu//15th Gen /}"
  cpu="${cpu// Processor/}"
  cpu="${cpu// Quad core/}"
  cpu="${cpu// Dual core/}"
  cpu="${cpu// Octa core/}"
  cpu="${cpu// Core TM/ Core}"
  cpu="${cpu// with Radeon Graphics/}"
  cpu="${cpu// with Radeon Vega Graphics/}"
  cpu="${cpu// with Radeon Vega Mobile Gfx/}"
  [ -z "${cpu// /}" ] && cpu="Unknown"
  echo "$cpu"
  return 0
 }
 hasDisk() {
  [ -b "/disk" ] && return 0
  [ -b "/disk1" ] && return 0
  [ -b "/dev/disk1" ] && return 0
  [ -b "${DEVICE:-}" ] && return 0
  [ -z "${DISK_NAME:-}" ] && DISK_NAME="data"
  [ -s "$STORAGE/$DISK_NAME.img" ]  && return 0
  [ -s "$STORAGE/$DISK_NAME.qcow2" ] && return 0
  return 1
 }
 return 0
--- a/web/index.html
+++ b/web/index.html
@ -5,8 +5,8 @@
        [1]
        <meta http-equiv="Cache-Control" content="no-cache" />
        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-        <link rel="stylesheet" type="text/css" href="css/style.css" />
+        <link rel="stylesheet" type="text/css" href="/css/style.css" />
-        <link rel="icon" href="img/favicon.svg" type="image/x-icon">
+        <link rel="icon" href="/img/favicon.svg" type="image/x-icon">
        [2]
    </head>
@ -28,7 +28,7 @@
                [5]
            </footer>
        </div>
-        <script type="text/javascript" src="js/script.js"></script>
+        <script type="text/javascript" src="/js/script.js"></script>
    </body>
 </html>
--- a/web/js/script.js
+++ b/web/js/script.js
@ -3,7 +3,7 @@ var interval = 1000;
 function getInfo() {
-    var url = "msg.html";
+    var url = "/msg.html";
    try {
--- a/web/conf/nginx.conf
+++ b/web/conf/nginx.conf
@ -1,4 +1,5 @@
 server {
    listen 80;
    listen 5000 default_server;
    autoindex on;