fix: Podman detection (#990 )

feat: Enable IPv6 support for user-mode container networking (#983 )
feat: Check CPU vendor (#982 )
2025-06-06 08:27:22 +08:00 · 2025-05-27 00:50:40 +02:00 · 2025-04-27 11:28:54 +02:00 · 2025-04-27 11:21:37 +02:00 · 2025-04-23 12:54:22 +02:00 · 2025-04-20 21:43:02 +02:00
27 changed files with 999 additions and 678 deletions
--- a/.devcontainer.json
+++ b/.devcontainer.json
@ -0,0 +1,6 @@
+{
+  "name": "dsm",
+  "service": "dsm",
+  "forwardPorts": [5000],
+  "dockerComposeFile": "compose.yml"
+}
--- a/.github/ISSUE_TEMPLATE/1-issue.yml
+++ b/.github/ISSUE_TEMPLATE/1-issue.yml
@ -1,35 +1,12 @@
 name: "\U0001F6A8 Technical issue"
 description: When you're experiencing problems using the container
 body:
-  - type: checkboxes
-    attributes:
-      label: Is there no existing issue for this?
-      description: Please search to see if no solution was already provided before.
-      options:
-      - label: I have searched the existing issues
-        required: true
-  - type: input
-    id: cpu
-    attributes:
-      label: Machine specifications
-      description: The processor and RAM amount in your machine.
-      placeholder: e.g. Intel N5105 / 16 GB 
-    validations:
-      required: true
  - type: input
    id: os
    attributes:
      label: Operating system
-      description: The distribution and kernel version (as shown by `uname -a`).
-      placeholder: e.g. Ubuntu 24.04 / Kernel 6.8.0-22-generic
-    validations:
-      required: true
-  - type: input
-    id: docker
-    attributes:
-      label: Docker version
-      description: The version of the Docker engine (as shown by `docker -v`).
-      placeholder: e.g. 26.0.1
+      description: Your Linux distribution (can be shown by `lsb_release -a`).
+      placeholder: e.g. Ubuntu 24.04
    validations:
      required: true
  - type: textarea
@ -44,6 +21,7 @@ body:
    attributes:
      label: Docker compose
      description: The compose file (or otherwise the `docker run` command used).
+      render: yaml
    validations:
      required: true
  - type: textarea
@ -51,6 +29,7 @@ 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/2-feature.yml
+++ b/.github/ISSUE_TEMPLATE/2-feature.yml
@ -3,13 +3,6 @@ description: Suggest an idea for improving the container
 title: "[Feature]: "
 labels: ["enhancement"]
 body:
-  - type: checkboxes
-    attributes:
-      label: Is there no existing feature request for this?
-      description: Please search to see if the feature was not already requested before.
-      options:
-      - label: I have searched the existing feature requests
-        required: true
  - type: textarea
    id: problem
    attributes:
--- a/.github/ISSUE_TEMPLATE/3-bug.yml
+++ b/.github/ISSUE_TEMPLATE/3-bug.yml
@ -3,35 +3,12 @@ description: Create a report to help us improve the container
 title: "[Bug]: "
 labels: ["bug"]
 body:
-  - type: checkboxes
-    attributes:
-      label: Is there no existing bug report for this?
-      description: Please search to see if the bug was not already reported before.
-      options:
-      - label: I have searched the existing bug reports
-        required: true
-  - type: input
-    id: cpu
-    attributes:
-      label: Machine specifications
-      description: The processor and RAM amount in your machine.
-      placeholder: e.g. Intel N5105 / 16 GB 
-    validations:
-      required: true
  - type: input
    id: os
    attributes:
      label: Operating system
-      description: The distribution and kernel version (as shown by `uname -a`).
-      placeholder: e.g. Ubuntu 24.04 / Kernel 6.8.0-22-generic
-    validations:
-      required: true
-  - type: input
-    id: docker
-    attributes:
-      label: Docker version
-      description: The version of the Docker engine (as shown by `docker -v`).
-      placeholder: e.g. 26.0.1
+      description: Your Linux distribution (can be shown by `lsb_release -a`).
+      placeholder: e.g. Ubuntu 24.04
    validations:
      required: true
  - type: textarea
@ -46,6 +23,7 @@ body:
    attributes:
      label: Docker compose
      description: The compose file (or otherwise the `docker run` command used).
+      render: yaml
    validations:
      required: true
  - type: textarea
@ -53,6 +31,7 @@ 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/build.yml
+++ b/.github/workflows/build.yml
@ -54,7 +54,7 @@ jobs:
          labels: |
            org.opencontainers.image.title=${{ vars.NAME }}
        env:
-          DOCKER_METADATA_ANNOTATIONS_LEVELS: manifest,index            
+          DOCKER_METADATA_ANNOTATIONS_LEVELS: manifest,index
      - 
        name: Set up Docker Buildx
        uses: docker/setup-buildx-action@v3
@ -73,7 +73,7 @@ jobs:
          password: ${{ secrets.GITHUB_TOKEN }}
      -
        name: Build Docker image
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
        with:
          context: .
          push: true
--- 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
+          ignore: DL3008,DL3003,DL3006,DL3013
          failure-threshold: warning
--- a/27
+++ b/27
@ -1,4 +1,4 @@
-FROM qemux/qemu-host:2.04 as builder
+FROM qemux/qemu-host:2.05 AS builder

 #  FROM golang as builder
 #  WORKDIR /
@ -15,19 +15,21 @@ ARG DEBCONF_NOWARNINGS="yes"
 ARG DEBIAN_FRONTEND="noninteractive"
 ARG DEBCONF_NONINTERACTIVE_SEEN="true"

-RUN set -eu && extra="" && \
-    if [ "$TARGETPLATFORM" != "linux/amd64" ]; then extra="qemu-user"; fi && \
+RUN set -eu && \
    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 \
@ -35,12 +37,16 @@ RUN set -eu && extra="" && \
        dnsmasq \
        fakeroot \
        net-tools \
+        e2fsprogs \
        qemu-utils \
+        iputils-ping \
        ca-certificates \
        netcat-openbsd \
-        qemu-system-x86 \
-        "$extra" && \
+        qemu-system-x86 && \
    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 && \
@ -49,14 +55,15 @@ RUN set -eu && extra="" && \
 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/nginx.conf /etc/nginx/sites-enabled/web.conf
+COPY --chmod=744 ./web/conf/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 "1G"
-ENV DISK_SIZE "16G"
-ENV CPU_CORES "1"
+ENV RAM_SIZE="2G"
+ENV CPU_CORES="2"
+ENV DISK_SIZE="16G"

 HEALTHCHECK --interval=60s --start-period=45s --retries=2 CMD /run/check.sh

--- a/compose.yml
+++ b/compose.yml
@ -1,15 +1,17 @@
 services:
-    dsm:
-        container_name: dsm
-        image: vdsm/virtual-dsm:latest
-        environment:
-            DISK_SIZE: "16G"
-        devices:
-            - /dev/kvm
-        cap_add:
-            - NET_ADMIN
-        ports:
-            - 5000:5000
-        volumes:
-            - /var/dsm:/storage
-        stop_grace_period: 2m
+  dsm:
+    container_name: dsm
+    image: vdsm/virtual-dsm
+    environment:
+      DISK_SIZE: "16G"
+    devices:
+      - /dev/kvm
+      - /dev/net/tun
+    cap_add:
+      - NET_ADMIN
+    ports:
+      - 5000:5000
+    volumes:
+      - ./dsm:/storage
+    restart: always
+    stop_grace_period: 2m
--- a/kubernetes.yml
+++ b/kubernetes.yml
@ -1,58 +1,77 @@
+---
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
  name: dsm-pvc
 spec:
  accessModes:
-    - ReadWriteOnce
+  - ReadWriteOnce
  resources:
    requests:
      storage: 16Gi
 ---
-apiVersion: v1
-kind: Pod
+apiVersion: apps/v1
+kind: Deployment
 metadata:
  name: dsm
  labels:
    name: dsm
 spec:
-  terminationGracePeriodSeconds: 120 # the Kubernetes default is 30 seconds and it may be not enough
-  containers:
-    - name: dsm
-      image: vdsm/virtual-dsm
-      ports:
-        - containerPort: 5000
-          protocol: TCP
-      resources:
-        limits:
-          devices.kubevirt.io/kvm: 1
-      securityContext:
-        privileged: true
-      env:
-        - name: RAM_SIZE
-          value: 1G
-        - name: CPU_CORES
-          value: "1"
+  replicas: 1
+  selector:
+    matchLabels:
+      app: dsm
+  template:
+    metadata:
+      labels:
+        app: dsm
+    spec:
+      containers:
+      - name: dsm
+        image: vdsm/virtual-dsm
+        env:
        - name: DISK_SIZE
-          value: "16G"  # Kubernetes uses Gi, but DSM uses GB
-      volumeMounts:
+          value: "16G"
+        ports:
+          - containerPort: 5000
+            name: http
+            protocol: TCP
+        securityContext:
+          capabilities:
+            add:
+            - NET_ADMIN
+          privileged: true
+        volumeMounts:
        - mountPath: /storage
          name: storage
-  volumes:
-    - name: storage
-      persistentVolumeClaim:
-        claimName: dsm-pvc
+        - mountPath: /dev/kvm
+          name: dev-kvm
+        - mountPath: /dev/net/tun
+          name: dev-tun
+      terminationGracePeriodSeconds: 120
+      volumes:
+      - name: storage
+        persistentVolumeClaim:
+          claimName: dsm-pvc
+      - 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:
-  type: NodePort
-  selector:
-    name: dsm
+  internalTrafficPolicy: Cluster
  ports:
-    - name: tcp-5000
+    - name: http
      port: 5000
+      protocol: TCP
      targetPort: 5000
-      nodePort: 31150
+  selector:
+    app: dsm
+  type: ClusterIP
--- a/readme.md
+++ b/readme.md
@ -7,21 +7,22 @@
 [![Build]][build_url]
 [![Version]][tag_url]
 [![Size]][tag_url]
+[![Package]][pkg_url]
 [![Pulls]][hub_url]

 </div></h1>

 Virtual DSM in a Docker container.

-## Features
+## Features ✨

 - Multiple disks
 - KVM acceleration
 - Upgrades supported
 
-## Usage
+## Usage  🐳

-Via Docker Compose:
+##### Via Docker Compose:

 ```yaml
 services:
@ -32,51 +33,59 @@ services:
      DISK_SIZE: "16G"
    devices:
      - /dev/kvm
+      - /dev/net/tun
    cap_add:
      - NET_ADMIN
    ports:
      - 5000:5000
    volumes:
-      - /var/dsm:/storage
+      - ./dsm:/storage
+    restart: always
    stop_grace_period: 2m
 ```

-Via Docker CLI:
+##### Via Docker CLI:

 ```bash
-docker run -it --name dsm -p 5000:5000 --device=/dev/kvm --cap-add NET_ADMIN --stop-timeout 120 vdsm/virtual-dsm
+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
 ```

-Via Kubernetes:
+##### Via Kubernetes:

 ```shell
-kubectl apply -f kubernetes.yml
+kubectl apply -f https://raw.githubusercontent.com/vdsm/virtual-dsm/refs/heads/master/kubernetes.yml
 ```

-## FAQ
+##### Via Github Codespaces:

-* ### How do I use it?
+[![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://localhost:5000) using your web browser.
+  - Start the container and connect to [port 5000](http://127.0.0.1:5000/) using your web browser.

-  - Wait until DSM is ready, choose an username and password, and you will be taken to the desktop.
+  - Wait until DSM finishes its installation
+ 
+  - 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?
+### How do I change the storage location?

  To change the storage location, include the following bind mount in your compose file:

  ```yaml
  volumes:
-    - /var/dsm:/storage
+    - ./dsm:/storage
  ```

-  Replace the example path `/var/dsm` with the desired storage folder.
+  Replace the example path `./dsm` with the desired storage folder or named volume.
 
-* ### How do I change the size of the disk?
+### How do I change the size of the disk?

  To expand the default size of 16 GB, locate the `DISK_SIZE` setting in your compose file and modify it to your preferred capacity:

@ -85,11 +94,12 @@ kubectl apply -f kubernetes.yml
    DISK_SIZE: "128G"
  ```
  
-  This can also be used to resize the existing disk to a larger capacity without any data loss.
+> [!TIP]
+> This can also be used to resize the existing disk to a larger capacity without any data loss.

-* ### How do I create a growable disk?
+### How do I create a growable disk?

-  By default, the entire capacity of the disk is reserved in advance.
+  By default, the entire capacity of the disk will be reserved in advance.

  To create a growable disk that only allocates space that is actually used, add the following environment variable:

@ -98,9 +108,7 @@ kubectl apply -f kubernetes.yml
    DISK_FMT: "qcow2"
  ```

-  Please note that this may reduce the write performance of the disk.
-
-* ### How do I add multiple disks?
+### How do I add multiple disks?

  To create additional disks, modify your compose file like this:
  
@ -109,31 +117,27 @@ kubectl apply -f kubernetes.yml
    DISK2_SIZE: "32G"
    DISK3_SIZE: "64G"
  volumes:
-    - /home/example:/storage2
-    - /mnt/data/example:/storage3
+    - ./example2:/storage2
+    - ./example3:/storage3
  ```

-* ### How do I pass-through a disk?
+### How do I pass-through a disk?

-   It is possible to pass-through disk devices directly by adding them to your compose file in this way:
+   It is possible to pass-through disk devices or partitions directly by adding them to your compose file in this way:

  ```yaml
  devices:
-    - /dev/disk/by-uuid/12345-12345-12345-12345-12345:/disk2
-    - /dev/disk/by-uuid/45678-45678-45678-45678-45678:/disk3
+    - /dev/sdb:/disk1
+    - /dev/sdc1:/disk2
  ```

-  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. 
+  Make sure it is totally empty (without any filesystem), otherwise DSM may not format it as a volume.

-  Please note that the device needs to be totally empty (without any partition table) otherwise DSM does not always format it into a volume.
+### How do I change the amount of CPU or RAM?

-  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.
+  By default, the container will be allowed to use a maximum of 2 CPU cores and 2 GB of RAM.

-* ### How do I increase the amount of CPU or RAM?
-
-  By default, a single CPU core and 1 GB of RAM are allocated to the container.
-
-  If there arises a need to increase this, add the following environment variables:
+  If you want to adjust this, you can specify the desired amount using the following environment variables:

  ```yaml
  environment:
@ -141,18 +145,35 @@ kubectl apply -f kubernetes.yml
    CPU_CORES: "4"
  ```

-* ### How do I verify if my system supports KVM?
+### How do I verify if my system supports KVM?

-  To verify if your system supports KVM, run the following commands:
+  First check if your software is compatible using this chart:
+
+  | **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 acceleration can't be used, check the virtualization settings in the BIOS.
+  If you receive an error from `kvm-ok` indicating that KVM cannot be used, please check whether:

-* ### How do I assign an individual IP address to the container?
+  - the virtualization extensions (`Intel VT-x` or `AMD SVM`) are enabled in your BIOS.
+
+  - 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.
+
+### How do I assign an individual IP address to the container?

  By default, the container uses bridge networking, which shares the IP address with the host. 

@ -186,13 +207,14 @@ kubectl apply -f kubernetes.yml
 
  An added benefit of this approach is that you won't have to perform any port mapping anymore, since all ports will be exposed by default.

-  Please note that this IP address won't be accessible from the Docker host due to the design of macvlan, which doesn't permit communication between the two. If this is a concern, you need to create a [second macvlan](https://blog.oddbit.com/post/2018-03-12-using-docker-macvlan-networks/#host-access) as a workaround.
+> [!IMPORTANT]
+> This IP address won't be accessible from the Docker host due to the design of macvlan, which doesn't permit communication between the two. If this is a concern, you need to create a [second macvlan](https://blog.oddbit.com/post/2018-03-12-using-docker-macvlan-networks/#host-access) as a workaround.

-* ### How can DSM acquire an IP address from my router?
+### How can DSM acquire an IP address from my router?

-  After configuring the container for macvlan (see above), it is possible for DSM to become part of your home network by requesting an IP from your router, just like your other devices.
+  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, add the following lines to your compose file:
+  To enable this mode, in which the container and DSM will have separate IP addresses, add the following lines to your compose file:

  ```yaml
  environment:
@ -203,9 +225,7 @@ kubectl apply -f kubernetes.yml
    - 'c *:* rwm'
  ```

-  Please note that even if you don't need DHCP, it's still recommended to enable this mode, as it prevents NAT issues and increases performance by using a `macvtap` interface. You can just set a static IP from the DSM control panel afterwards.
-
-* ### How do I pass-through the GPU?
+### How do I pass-through the GPU?

  To pass-through your Intel GPU, add the following lines to your compose file:

@ -216,50 +236,61 @@ kubectl apply -f kubernetes.yml
    - /dev/dri
  ```

-  This can be used to enable the facial recognition function in Synology Photos for example.
+> [!NOTE]
+> This can be used to enable the facial recognition function in Synology Photos, but does not provide hardware transcoding for video.

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

-  By default, version 7.2 will be installed, but if you prefer an older version, you can add its download URL to your compose file as follows:
+  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:

  ```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.
-
-  If you don't have internet access, it's also possible to skip the download by setting URL to:
+  With this method, it is even possible to switch back and forth between versions while keeping 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:
+  
  ```yaml
-  environment:
-    URL: "DSM_VirtualDSM_42218.pat"
+  volumes:
+    - ./DSM_VirtualDSM_42218.pat:/boot.pat
  ```

-  after placing a file called `DSM_VirtualDSM_42218.pat` in your `/storage` folder.
+  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.

-* ### What are the differences compared to the standard DSM?
+### 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.
-  
-* ### Is this project legal?

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

-## Stars
+## Stars 🌟
 [![Stars](https://starchart.cc/vdsm/virtual-dsm.svg?variant=adaptive)](https://starchart.cc/vdsm/virtual-dsm)

-## Disclaimer
+## Disclaimer ⚖️

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

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

 [Build]: https://github.com/vdsm/virtual-dsm/actions/workflows/build.yml/badge.svg
 [Size]: https://img.shields.io/docker/image-size/vdsm/virtual-dsm/latest?color=066da5&label=size
 [Pulls]: https://img.shields.io/docker/pulls/vdsm/virtual-dsm.svg?style=flat&label=pulls&logo=docker
 [Version]: https://img.shields.io/docker/v/vdsm/virtual-dsm/latest?arch=amd64&sort=semver&color=066da5
+[Package]: https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fipitio.github.io%2Fbackage%2Fvdsm%2Fvirtual-dsm%2Fvirtual-dsm.json&query=%24.downloads&logo=github&style=flat&color=066da5&label=pulls
--- a/src/check.sh
+++ b/src/check.sh
@ -5,7 +5,7 @@ set -Eeuo pipefail

 [ -f "/run/shm/qemu.end" ] && echo "QEMU is shutting down.." && exit 1
 [ ! -s "/run/shm/qemu.pid" ] && echo "QEMU is not running yet.." && exit 0
-[[ "$NETWORK" != [Yy1]* ]] && echo "Networking is disabled.." && exit 0
+[[ "$NETWORK" == [Nn]* ]] && echo "Networking is disabled.." && exit 0

 file="/run/shm/dsm.url"
 address="/run/shm/qemu.ip"
--- a/src/config.sh
+++ b/src/config.sh
@ -4,10 +4,10 @@ set -Eeuo pipefail
 DEF_OPTS="-nodefaults -boot strict=on"
 RAM_OPTS=$(echo "-m ${RAM_SIZE^^}" | sed 's/MB/M/g;s/GB/G/g;s/TB/T/g')
 CPU_OPTS="-cpu $CPU_FLAGS -smp $CPU_CORES,sockets=1,dies=1,cores=$CPU_CORES,threads=1"
-MAC_OPTS="-machine type=q35,usb=off,vmport=off,dump-guest-core=off,hpet=off${KVM_OPTS}"
+MAC_OPTS="-machine type=q35,smm=off,usb=off,vmport=off,dump-guest-core=off,hpet=off${KVM_OPTS}"
 DEV_OPTS="-device virtio-balloon-pci,id=balloon0,bus=pcie.0,addr=0x4"
-DEV_OPTS="$DEV_OPTS -object rng-random,id=objrng0,filename=/dev/urandom"
-DEV_OPTS="$DEV_OPTS -device virtio-rng-pci,rng=objrng0,id=rng0,bus=pcie.0,addr=0x1c"
+DEV_OPTS+=" -object rng-random,id=objrng0,filename=/dev/urandom"
+DEV_OPTS+=" -device virtio-rng-pci,rng=objrng0,id=rng0,bus=pcie.0,addr=0x1c"

 ARGS="$DEF_OPTS $CPU_OPTS $RAM_OPTS $MAC_OPTS $DISPLAY_OPTS $MON_OPTS $SERIAL_OPTS $NET_OPTS $DISK_OPTS $DEV_OPTS $ARGUMENTS"
 ARGS=$(echo "$ARGS" | sed 's/\t/ /g' | tr -s ' ')
@ -17,21 +17,27 @@ 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_GB=$(( RAM_AVAIL/1073741824 ))
+  AVAIL_MEM=$(formatBytes "$RAM_AVAIL")

  if (( (RAM_WANTED + RAM_SPARE) > RAM_AVAIL )); then
-    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."
-    exit 17
-  fi
-
-  if (( (RAM_WANTED + (RAM_SPARE * 3)) > RAM_AVAIL )); then
-    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."
+    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."
+    [[ "${FS,,}" != "zfs" ]] && error "$msg" && exit 17
+    info "$msg"
+  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."
+      if [[ "${FS,,}" != "zfs" ]]; then
+        warn "$msg"
+      else
+        info "$msg"
+      fi
+    fi
  fi

 fi

 if [[ "$DEBUG" == [Yy1]* ]]; then
-  printf "Arguments:\n\n%s" "${ARGS// -/$'\n-'}" && echo
+  printf "Arguments:\n\n%s\n\n" "${ARGS// -/$'\n-'}"
 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_turing'
+: "${DISK_IO:="native"}"          # I/O Mode, can be set to 'native', 'threads' or 'io_uring'
 : "${DISK_FMT:="raw"}"            # Disk file format, 'raw' by default for best performance
-: "${DISK_TYPE:=""}"              # Device type to be used, choose "ide", "usb", "blk" or "scsi"
+: "${DISK_TYPE:=""}"              # Device type to be used, "sata", "nvme", "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.
@ -90,12 +90,13 @@ supportsDirect() {
 }

 createDisk() {
+
  local DISK_FILE=$1
  local DISK_SPACE=$2
  local DISK_DESC=$3
  local DISK_FMT=$4
  local FS=$5
-  local DATA_SIZE DIR SPACE FA
+  local DATA_SIZE DIR SPACE GB FA

  DATA_SIZE=$(numfmt --from=iec "$DISK_SPACE")

@ -108,16 +109,16 @@ createDisk() {
    SPACE=$(df --output=avail -B 1 "$DIR" | tail -n 1)

    if (( DATA_SIZE > SPACE )); then
-      local SPACE_GB=$(( (SPACE + 1073741823)/1073741824 ))
-      error "Not enough free space to create a $DISK_DESC of $DISK_SPACE in $DIR, it has only $SPACE_GB GB available..."
+      GB=$(formatBytes "$SPACE")
+      error "Not enough free space to create a $DISK_DESC of ${DISK_SPACE/G/ GB} in $DIR, it has only $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 $DISK_STYLE $DISK_DESC image in $DISK_FMT format..."
+  info "Creating a ${DISK_SPACE/G/ GB} $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 ($DISK_FILE)"
+  local FAIL="Could not create a $DISK_STYLE $DISK_FMT $DISK_DESC image of ${DISK_SPACE/G/ GB} ($DISK_FILE)"

  case "${DISK_FMT,,}" in
    raw)
@ -140,10 +141,12 @@ createDisk() {
      else

        # Create an empty file
-        if ! fallocate -l "$DATA_SIZE" "$DISK_FILE"; then
-          if ! truncate -s "$DATA_SIZE" "$DISK_FILE"; then
-            rm -f "$DISK_FILE"
-            error "$FAIL" && exit 77
+        if ! fallocate -l "$DATA_SIZE" "$DISK_FILE" &>/dev/null; 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

@ -152,8 +155,8 @@ createDisk() {
    qcow2)

      local DISK_PARAM="$DISK_ALLOC"
-      isCow "$FS" && DISK_PARAM="$DISK_PARAM,nocow=on"
-      [ -n "$DISK_FLAGS" ] && DISK_PARAM="$DISK_PARAM,$DISK_FLAGS"
+      isCow "$FS" && DISK_PARAM+=",nocow=on"
+      [ -n "$DISK_FLAGS" ] && DISK_PARAM+=",$DISK_FLAGS"

      if ! qemu-img create -f "$DISK_FMT" -o "$DISK_PARAM" -- "$DISK_FILE" "$DATA_SIZE" ; then
        rm -f "$DISK_FILE"
@ -173,12 +176,13 @@ createDisk() {
 }

 resizeDisk() {
+
  local DISK_FILE=$1
  local DISK_SPACE=$2
  local DISK_DESC=$3
  local DISK_FMT=$4
  local FS=$5
-  local CUR_SIZE DATA_SIZE DIR SPACE
+  local CUR_SIZE DATA_SIZE DIR SPACE GB

  CUR_SIZE=$(getSize "$DISK_FILE")
  DATA_SIZE=$(numfmt --from=iec "$DISK_SPACE")
@ -192,17 +196,17 @@ resizeDisk() {
    SPACE=$(df --output=avail -B 1 "$DIR" | tail -n 1)

    if (( REQ > SPACE )); then
-      local SPACE_GB=$(( (SPACE + 1073741823)/1073741824 ))
-      error "Not enough free space to resize $DISK_DESC to $DISK_SPACE in $DIR, it has only $SPACE_GB GB available.."
+      GB=$(formatBytes "$SPACE")
+      error "Not enough free space to resize $DISK_DESC to ${DISK_SPACE/G/ GB} in $DIR, it has only $GB available.."
      error "Please specify a smaller ${DISK_DESC^^}_SIZE or disable preallocation by setting ALLOCATE=N." && exit 74
    fi
  fi

-  local GB=$(( (CUR_SIZE + 1073741823)/1073741824 ))
-  MSG="Resizing $DISK_DESC from ${GB}G to $DISK_SPACE..."
+  GB=$(formatBytes "$CUR_SIZE")
+  MSG="Resizing $DISK_DESC from $GB to ${DISK_SPACE/G/ GB}..."
  info "$MSG" && html "$MSG"

-  local FAIL="Could not resize the $DISK_STYLE $DISK_FMT $DISK_DESC image from ${GB}G to $DISK_SPACE ($DISK_FILE)"
+  local FAIL="Could not resize the $DISK_STYLE $DISK_FMT $DISK_DESC image from ${GB} to ${DISK_SPACE/G/ GB} ($DISK_FILE)"

  case "${DISK_FMT,,}" in
    raw)
@ -217,9 +221,11 @@ resizeDisk() {
      else

        # Resize file by allocating more space
-        if ! fallocate -l "$DATA_SIZE" "$DISK_FILE"; then
-          if ! truncate -s "$DATA_SIZE" "$DISK_FILE"; then
-            error "$FAIL" && exit 75
+        if ! fallocate -l "$DATA_SIZE" "$DISK_FILE" &>/dev/null; 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

@ -238,6 +244,7 @@ resizeDisk() {
 }

 convertDisk() {
+
  local SOURCE_FILE=$1
  local SOURCE_FMT=$2
  local DST_FILE=$3
@ -254,7 +261,7 @@ convertDisk() {

  if [[ "$ALLOCATE" != [Nn]* ]]; then

-    local DIR CUR_SIZE SPACE
+    local DIR CUR_SIZE SPACE GB

    # Check free diskspace
    DIR=$(dirname "$TMP_FILE")
@ -262,24 +269,25 @@ convertDisk() {
    SPACE=$(df --output=avail -B 1 "$DIR" | tail -n 1)

    if (( CUR_SIZE > SPACE )); then
-      local SPACE_GB=$(( (SPACE + 1073741823)/1073741824 ))
-      error "Not enough free space to convert $DISK_DESC to $DST_FMT in $DIR, it has only $SPACE_GB GB available..."
+      GB=$(formatBytes "$SPACE")
+      error "Not enough free space to convert $DISK_DESC to $DST_FMT in $DIR, it has only $GB available..."
      error "Please free up some disk space or disable preallocation by setting ALLOCATE=N." && exit 76
    fi
  fi

-  html "Converting $DISK_DESC to $DST_FMT..."
-  info "Converting $DISK_DESC to $DST_FMT, please wait until completed..."
+  local msg="Converting $DISK_DESC to $DST_FMT"
+  html "$msg..."
+  info "$msg, please wait until completed..."

  local CONV_FLAGS="-p"
  local DISK_PARAM="$DISK_ALLOC"
-  isCow "$FS" && DISK_PARAM="$DISK_PARAM,nocow=on"
+  isCow "$FS" && DISK_PARAM+=",nocow=on"

  if [[ "$DST_FMT" != "raw" ]]; then
-      if [[ "$ALLOCATE" == [Nn]* ]]; then
-        CONV_FLAGS="$CONV_FLAGS -c"
-      fi
-      [ -n "$DISK_FLAGS" ] && DISK_PARAM="$DISK_PARAM,$DISK_FLAGS"
+    if [[ "$ALLOCATE" == [Nn]* ]]; then
+      CONV_FLAGS+=" -c"
+    fi
+    [ -n "$DISK_FLAGS" ] && DISK_PARAM+=",$DISK_FLAGS"
  fi

  # shellcheck disable=SC2086
@ -289,13 +297,15 @@ convertDisk() {
  fi

  if [[ "$DST_FMT" == "raw" ]]; then
-      if [[ "$ALLOCATE" != [Nn]* ]]; then
-        # Work around qemu-img bug
-        CUR_SIZE=$(stat -c%s "$TMP_FILE")
-        if ! fallocate -l "$CUR_SIZE" "$TMP_FILE"; then
-            error "Failed to allocate $CUR_SIZE bytes for $DISK_DESC image $TMP_FILE"
+    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 -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"
@ -308,13 +318,15 @@ convertDisk() {
    fi
  fi

-  html "Conversion of $DISK_DESC completed..."
-  info "Conversion of $DISK_DESC to $DST_FMT completed succesfully!"
+  msg="Conversion of $DISK_DESC"
+  html "$msg completed..."
+  info "$msg to $DST_FMT completed successfully!"

  return 0
 }

 checkFS () {
+
  local FS=$1
  local DISK_FILE=$2
  local DISK_DESC=$3
@ -348,6 +360,7 @@ checkFS () {
 }

 createDevice () {
+
  local DISK_FILE=$1
  local DISK_TYPE=$2
  local DISK_INDEX=$3
@ -355,31 +368,44 @@ 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=""
  [ -n "$DISK_INDEX" ] && index=",bootindex=$DISK_INDEX"
-  local result="-drive file=$DISK_FILE,id=$DISK_ID,if=none,format=$DISK_FMT,cache=$DISK_CACHE,aio=$DISK_IO,discard=$DISK_DISCARD,detect-zeroes=on"
+  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
-    "usb" )
-      result="$result \
-      -device usb-storage,drive=${DISK_ID}${index}"
+    "none" ) ;;
+    "auto" )
+      echo "$result"
      ;;
-    "ide" )
-      result="$result \
-      -device ide-hd,drive=${DISK_ID},bus=ide.$DISK_INDEX,rotation_rate=$DISK_ROTATION${index}"
+    "usb" )
+      result+=",if=none \
+      -device usb-storage,drive=${DISK_ID}${index}${DISK_SERIAL}${DISK_SECTORS}"
+      echo "$result"
+      ;;
+    "nvme" )
+      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}"
      echo "$result"
      ;;
    "blk" | "virtio-blk" )
-      result="$result \
-      -device virtio-blk-pci,drive=${DISK_ID},scsi=off,bus=pcie.0,addr=$DISK_ADDRESS,iothread=io2${index}"
+      result+=",if=none \
+      -device virtio-blk-pci,drive=${DISK_ID},bus=pcie.0,addr=$DISK_ADDRESS,iothread=io2${index}${DISK_SERIAL}${DISK_SECTORS}"
      echo "$result"
      ;;
    "scsi" | "virtio-scsi" )
-      result="$result \
+      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}"
+      -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}"
      echo "$result"
      ;;
  esac
@ -388,6 +414,7 @@ createDevice () {
 }

 addDisk () {
+
  local DISK_BASE=$1
  local DISK_TYPE=$2
  local DISK_DESC=$3
@ -397,7 +424,7 @@ addDisk () {
  local DISK_FMT=$7
  local DISK_IO=$8
  local DISK_CACHE=$9
-  local DISK_EXT DIR DATA_SIZE FS PREV_FMT PREV_EXT CUR_SIZE OPTS
+  local DISK_EXT DIR SPACE DATA_SIZE FS PREV_FMT PREV_EXT CUR_SIZE

  DISK_EXT=$(fmt2ext "$DISK_FMT")
  local DISK_FILE="$DISK_BASE.$DISK_EXT"
@ -405,16 +432,19 @@ addDisk () {
  DIR=$(dirname "$DISK_FILE")
  [ ! -d "$DIR" ] && return 0

-  [ -z "$DISK_SPACE" ] && DISK_SPACE="16G"
-  DISK_SPACE=$(echo "${DISK_SPACE^^}" | sed 's/MB/M/g;s/GB/G/g;s/TB/T/g')
-  DATA_SIZE=$(numfmt --from=iec "$DISK_SPACE")
+  SPACE="${DISK_SPACE// /}"
+  [ -z "$SPACE" ] && SPACE="16G"
+  [ -z "${SPACE//[0-9. ]}" ] && SPACE="${SPACE}G"
+  SPACE=$(echo "${SPACE^^}" | sed 's/MB/M/g;s/GB/G/g;s/TB/T/g')
+
+  if ! numfmt --from=iec "$SPACE" &>/dev/null; then
+    error "Invalid value for ${DISK_DESC^^}_SIZE: $DISK_SPACE" && exit 73
+  fi
+
+  DATA_SIZE=$(numfmt --from=iec "$SPACE")

  if (( DATA_SIZE < 6442450944 )); then
-    if (( DATA_SIZE < 1 )); then
-      error "Invalid value for ${DISK_DESC^^}_SIZE: $DISK_SPACE" && exit 73
-    else
-      error "Please increase ${DISK_DESC^^}_SIZE to at least 6 GB." && exit 73
-    fi
+    error "Please increase ${DISK_DESC^^}_SIZE to at least 6 GB." && exit 73
  fi

  FS=$(stat -f -c %T "$DIR")
@ -432,6 +462,7 @@ addDisk () {
    else
      PREV_FMT="qcow2"
    fi
+
    PREV_EXT=$(fmt2ext "$PREV_FMT")

    if [ -s "$DISK_BASE.$PREV_EXT" ] ; then
@ -444,22 +475,22 @@ addDisk () {
    CUR_SIZE=$(getSize "$DISK_FILE")

    if (( DATA_SIZE > CUR_SIZE )); then
-      resizeDisk "$DISK_FILE" "$DISK_SPACE" "$DISK_DESC" "$DISK_FMT" "$FS" || exit $?
+      resizeDisk "$DISK_FILE" "$SPACE" "$DISK_DESC" "$DISK_FMT" "$FS" || exit $?
    fi

  else

-    createDisk "$DISK_FILE" "$DISK_SPACE" "$DISK_DESC" "$DISK_FMT" "$FS" || exit $?
+    createDisk "$DISK_FILE" "$SPACE" "$DISK_DESC" "$DISK_FMT" "$FS" || exit $?

  fi

-  OPTS=$(createDevice "$DISK_FILE" "$DISK_TYPE" "$DISK_INDEX" "$DISK_ADDRESS" "$DISK_FMT" "$DISK_IO" "$DISK_CACHE")
-  DISK_OPTS="$DISK_OPTS $OPTS"
+  DISK_OPTS+=$(createDevice "$DISK_FILE" "$DISK_TYPE" "$DISK_INDEX" "$DISK_ADDRESS" "$DISK_FMT" "$DISK_IO" "$DISK_CACHE" "" "")

  return 0
 }

 addDevice () {
+
  local DISK_DEV=$1
  local DISK_TYPE=$2
  local DISK_INDEX=$3
@ -468,19 +499,39 @@ 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 OPTS
-  OPTS=$(createDevice "$DISK_DEV" "$DISK_TYPE" "$DISK_INDEX" "$DISK_ADDRESS" "raw" "$DISK_IO" "$DISK_CACHE")
-  DISK_OPTS="$DISK_OPTS $OPTS"
+  local sectors=""
+  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
 }

 html "Initializing disks..."

+[ -z "${DISK_OPTS:-}" ] && DISK_OPTS=""
+[ -z "${DISK_TYPE:-}" ] && DISK_TYPE="scsi"
+[ -z "${DISK_NAME:-}" ] && DISK_NAME="data"
+
 case "${DISK_TYPE,,}" in
-  "" ) DISK_TYPE="scsi" ;;
-  "ide" | "usb" | "blk" | "scsi" ) ;;
-  * ) error "Invalid DISK_TYPE, value \"$DISK_TYPE\" is unrecognized!" && exit 80 ;;
+  "ide" | "sata" | "nvme" | "usb" | "scsi" | "blk" | "auto" | "none" ) ;;
+  * ) error "Invalid DISK_TYPE specified, value \"$DISK_TYPE\" is not recognized!" && exit 80 ;;
 esac

 if [ -z "$ALLOCATE" ]; then
@ -499,17 +550,16 @@ else
  DISK_ALLOC="preallocation=falloc"
 fi

-DISK_OPTS=$(createDevice "$BOOT" "$DISK_TYPE" "1" "0xa" "raw" "$DISK_IO" "$DISK_CACHE")
-OPTS=$(createDevice "$SYSTEM" "$DISK_TYPE" "2" "0xb" "raw" "$DISK_IO" "$DISK_CACHE")
-DISK_OPTS="$DISK_OPTS $OPTS"
+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" "" "")

-DISK1_FILE="$STORAGE/data"
+DISK1_FILE="$STORAGE/${DISK_NAME}"
 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"
+DISK2_FILE="/storage2/${DISK_NAME}2"
 if [ ! -f "$DISK2_FILE.img" ]; then
  # Fallback for legacy installs
  FALLBACK="/storage2/data.img"
@ -522,7 +572,7 @@ if [ ! -f "$DISK2_FILE.img" ]; then
  fi
 fi

-DISK3_FILE="/storage3/data3"
+DISK3_FILE="/storage3/${DISK_NAME}3"
 if [ ! -f "$DISK3_FILE.img" ]; then
  # Fallback for legacy installs
  FALLBACK="/storage3/data.img"
@ -535,7 +585,7 @@ if [ ! -f "$DISK3_FILE.img" ]; then
  fi
 fi

-DISK4_FILE="/storage4/data4"
+DISK4_FILE="/storage4/${DISK_NAME}4"

 : "${DISK2_SIZE:=""}"
 : "${DISK3_SIZE:=""}"
@ -581,7 +631,7 @@ else
  addDisk "$DISK4_FILE" "$DISK_TYPE" "disk4" "$DISK4_SIZE" "6" "0xf" "$DISK_FMT" "$DISK_IO" "$DISK_CACHE" || exit $?
 fi

-DISK_OPTS="$DISK_OPTS -object iothread,id=io2"
+DISK_OPTS+=" -object iothread,id=io2"

 html "Initialized disks successfully..."
 return 0
--- a/src/display.sh
+++ b/src/display.sh
@ -6,8 +6,11 @@ set -Eeuo pipefail
 : "${GPU:="N"}"         # GPU passthrough
 : "${VGA:="virtio"}"    # VGA adaptor
 : "${DISPLAY:="none"}"  # Display type
+: "${RENDERNODE:="/dev/dri/renderD128"}"  # Render node

-if [[ "$GPU" != [Yy1]* ]] || [[ "$ARCH" != "amd64" ]]; then
+CPU_VENDOR=$(lscpu | awk '/Vendor ID/{print $3}')
+
+if [[ "$GPU" != [Yy1]* ]] || [[ "$CPU_VENDOR" != "GenuineIntel" ]] || [[ "$ARCH" != "amd64" ]]; then

  [[ "${DISPLAY,,}" == "none" ]] && VGA="none"
  DISPLAY_OPTS="-display $DISPLAY -vga $VGA"
@ -15,20 +18,24 @@ if [[ "$GPU" != [Yy1]* ]] || [[ "$ARCH" != "amd64" ]]; then

 fi

-DISPLAY_OPTS="-display egl-headless,rendernode=/dev/dri/renderD128"
-DISPLAY_OPTS="$DISPLAY_OPTS -vga $VGA"
+DISPLAY_OPTS="-display egl-headless,rendernode=$RENDERNODE"
+DISPLAY_OPTS+=" -vga $VGA"

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

-if [ ! -c /dev/dri/card0 ]; then
-  if mknod /dev/dri/card0 c 226 0; then
-    chmod 666 /dev/dri/card0
+# Extract the card number from the render node
+CARD_NUMBER=$(echo "$RENDERNODE" | grep -oP '(?<=renderD)\d+')
+CARD_DEVICE="/dev/dri/card$((CARD_NUMBER - 128))"
+
+if [ ! -c "$CARD_DEVICE" ]; then
+  if mknod "$CARD_DEVICE" c 226 $((CARD_NUMBER - 128)); then
+    chmod 666 "$CARD_DEVICE"
  fi
 fi

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

--- a/src/entry.sh
+++ b/src/entry.sh
@ -1,11 +1,12 @@
 #!/usr/bin/env bash
 set -Eeuo pipefail

-APP="Virtual DSM"
-SUPPORT="https://github.com/vdsm/virtual-dsm"
+: "${APP:="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
@ -18,7 +19,8 @@ cd /run

 trap - ERR

-info "Booting ${APP}..."
+version=$(qemu-system-x86_64 --version | head -n 1 | cut -d '(' -f 1 | awk '{ print $NF }')
+info "Booting $APP using QEMU v$version..."

 if [[ "$CONSOLE" == [Yy]* ]]; then
  exec qemu-system-x86_64 ${ARGS:+ $ARGS}
@ -32,4 +34,4 @@ tail -fn +0 "$QEMU_LOG" 2>/dev/null &
 cat "$QEMU_TERM" 2>/dev/null & wait $! || :

 sleep 1 & wait $!
-finish 0
+[ ! -f "$QEMU_END" ] && finish 0
--- a/src/install.sh
+++ b/src/install.sh
@ -5,25 +5,38 @@ 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

-if [ -n "$URL" ]; then
+FN="boot.pat"
+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"* ]]; then
-    if [ -s "$STORAGE/$BASE.pat" ]; then
-      URL="file://$STORAGE/$BASE.pat"
-    else
-      error "File $STORAGE/$BASE.pat does not exist!" && exit 65
-    fi
+  if [[ "${URL,,}" != "http"* ]] && [[ "${URL,,}" != "file:"* ]] ; then
+    [ ! -s "$STORAGE/$BASE.pat" ] && error "Invalid URL:  $URL" && exit 65
+    URL="file://$STORAGE/$BASE.pat"
  fi
 fi

@ -46,11 +59,15 @@ if [ -z "$DL" ]; then
  [[ "${COUNTRY^^}" == "CN" ]] && DL="$DL_CHINA" || DL="$DL_GLOBAL"
 fi

-[ -z "$URL" ] && URL="$DL/release/7.2.1/69057-1/DSM_VirtualDSM_69057.pat"
+if [ -z "$URL" ]; then
+  URL="$DL/release/7.2.2/72806/DSM_VirtualDSM_72806.pat"
+fi

-BASE=$(basename "${URL%%\?*}" .pat)
-: "${BASE//+/ }"; printf -v BASE '%b' "${_//%/\\x}"
-BASE=$(echo "$BASE" | sed -e 's/[^A-Za-z0-9._-]/_/g')
+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"
@ -85,9 +102,9 @@ else
  TMP="/tmp/dsm"
  TMP_SPACE=2147483648
  SPACE=$(df --output=avail -B 1 /tmp | tail -n 1)
-  SPACE_MB=$(( (SPACE + 1048575)/1048576 ))
+  SPACE_MB=$(formatBytes "$SPACE")
  if (( TMP_SPACE > SPACE )); then
-    error "Not enough free space inside the container, have $SPACE_MB MB available but need at least 2 GB." && exit 93
+    error "Not enough free space inside the container, have $SPACE_MB available but need at least 2 GB." && exit 93
  fi
 fi

@ -96,13 +113,13 @@ rm -rf "$TMP" && mkdir -p "$TMP"
 # Check free diskspace
 ROOT_SPACE=536870912
 SPACE=$(df --output=avail -B 1 / | tail -n 1)
-SPACE_MB=$(( (SPACE + 1048575)/1048576 ))
-(( ROOT_SPACE > SPACE )) && error "Not enough free space inside the container, have $SPACE_MB MB available but need at least 500 MB." && exit 96
+SPACE_MB=$(formatBytes "$SPACE" "down")
+(( ROOT_SPACE > SPACE )) && error "Not enough free space inside the container, have $SPACE_MB available but need at least 500 MB." && exit 96

-MIN_SPACE=8589934592
+MIN_SPACE=15032385536
 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 8 GB." && exit 94
+SPACE_GB=$(formatBytes "$SPACE")
+(( MIN_SPACE > SPACE )) && error "Not enough free space for installation in $STORAGE, have $SPACE_GB available but need at least 14 GB." && exit 94

 # Check if output is to interactive TTY
 if [ -t 1 ]; then
@ -111,147 +128,50 @@ else
  PROGRESS="--progress=dot:giga"
 fi

-# Download the required files from the Synology website
-
-ROOT="Y"
-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"
-
+if [[ "$URL" == "file://"* ]]; then
+  MSG="Copying DSM"
+  ERR="Failed to copy ${URL:7}"
+  info "Install: Copying installation image..."
+else
+  MSG="Downloading DSM"
+  ERR="Failed to download $URL"
+  info "Install: Downloading $BASE.pat..."
 fi

-if [ ! -s "$RDC" ]; then
-
-  rm -f "$RD"
-  rm -f "$RDC"
-
-  MSG="Downloading installer..."
-  PRG="Downloading installer ([P])..."
-  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" "$PRG" &
-  { curl -r "$POS" -sfk --connect-timeout 10 -S -o "$RD" "$LOC"; rc=$?; } || :
-
-  fKill "progress.sh"
-
-  (( rc == 4 )) && error "Failed to download $LOC , network failure!" && exit 60
-
-  if (( rc != 0 )); then
-    if (( rc != 22 )) && (( rc != 56 )); then
-      error "Failed to download $LOC, 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" "$PRG" &
-    { wget "$LOC" -O "$PAT" -q --no-check-certificate --timeout=10 --show-progress "$PROGRESS"; rc=$?; } || :
-
-    fKill "progress.sh"
-    (( rc == 4 )) && error "Failed to download $LOC , network failure!" && exit 60
-    (( rc != 0 )) && error "Failed to download $LOC , reason: $rc" && exit 60
-
-    tar --extract --file="$PAT" --directory="$(dirname "$RD")"/. "$(basename "$RD")"
-    rm "$PAT"
-
-  fi
-
-  cp "$RD" "$RDC"
-
-fi
-
-if [ -f "$RDC" ]; then
-
-  { xz -dc <"$RDC" >"$TMP/rd" 2>/dev/null; rc=$?; } || :
-  (( rc != 1 )) && error "Failed to unxz $RDC 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..."
-PRG="Downloading DSM ([P])..."
-html "$MSG"
+html "$MSG..."

 PAT="/$BASE.pat"
 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" "$PRG" &
+  /run/progress.sh "$PAT" "$SIZE" "$MSG ([P])..." &

-  { wget "$URL" -O "$PAT" -q --no-check-certificate --timeout=10 --show-progress "$PROGRESS"; rc=$?; } || :
+  { wget "$URL" -O "$PAT" -q --no-check-certificate --timeout=10 --no-http-keep-alive --show-progress "$PROGRESS"; rc=$?; } || :

  fKill "progress.sh"
-  (( rc == 4 )) && error "Failed to download $URL , network failure!" && exit 69
-  (( rc != 0 )) && error "Failed to download $URL , reason: $rc" && exit 69
+
+  (( rc == 3 )) && error "$ERR , cannot write file (disk full?)" && exit 69
+  (( rc == 4 )) && error "$ERR , network failure!" && exit 69
+  (( rc == 8 )) && error "$ERR , server issued an error response!" && exit 69
+  (( rc != 0 )) && error "$ERR , reason: $rc" && exit 69

 fi

-[ ! -s "$PAT" ] && error "Failed to download $URL" && exit 69
+[ ! -s "$PAT" ] && error "$ERR" && exit 69

 SIZE=$(stat -c%s "$PAT")

@ -259,7 +179,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 downloaded image..."
+MSG="Extracting installation image..."
 info "Install: $MSG" && html "$MSG"

 if { tar tf "$PAT"; } >/dev/null 2>&1; then
@ -268,22 +188,15 @@ if { tar tf "$PAT"; } >/dev/null 2>&1; then

 else

-  export LD_LIBRARY_PATH="/run/extract"
+  { (cd "$TMP" && python3 /run/extract.py -i "$PAT" -d 2>/run/extract.log); rc=$?; } || :

-  if [ "$ARCH" == "amd64" ]; then
-    { /run/extract/syno_extract_system_patch "$PAT" "$TMP/."; rc=$?; } || :
-  else
-    { qemu-x86_64 /run/extract/syno_extract_system_patch "$PAT" "$TMP/."; rc=$?; } || :
+  if (( rc != 0 )); then
+    cat /run/extract.log
+    error "Failed to extract PAT file, reason $rc" && exit 63
  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"

@ -297,12 +210,12 @@ SYSTEM="$STORAGE/$BASE.system.img"
 rm -f "$SYSTEM"

 # Check free diskspace
-SYSTEM_SIZE=4954537983
+SYSTEM_SIZE=10738466816
 SPACE=$(df --output=avail -B 1 "$STORAGE" | tail -n 1)
-SPACE_MB=$(( (SPACE + 1048575)/1048576 ))
+SPACE_MB=$(formatBytes "$SPACE")

 if (( SYSTEM_SIZE > SPACE )); then
-  error "Not enough free space in $STORAGE to create a 5 GB system disk, have only $SPACE_MB MB available." && exit 97
+  error "Not enough free space in $STORAGE to create a 10 GB system disk, have only $SPACE_MB available." && exit 97
 fi

 if ! touch "$SYSTEM"; then
@ -317,10 +230,12 @@ if [[ "${FS,,}" == "btrfs" ]]; then
  fi
 fi

-if ! fallocate -l "$SYSTEM_SIZE" "$SYSTEM"; then
-  if ! truncate -s "$SYSTEM_SIZE" "$SYSTEM"; then
-    rm -f "$SYSTEM"
-    error "Could not allocate file $SYSTEM for the system disk." && exit 98
+if ! fallocate -l "$SYSTEM_SIZE" "$SYSTEM" &>/dev/null; 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

@ -332,8 +247,8 @@ PART="$TMP/partition.fdisk"
        echo "unit: sectors"
        echo "sector-size: 512"
        echo ""
-        echo "${SYSTEM}1 : start=        2048, size=     4980480, type=83"
-        echo "${SYSTEM}2 : start=     4982528, size=     4194304, type=82"
+        echo "${SYSTEM}1 : start=        2048, size=    16777216, type=83"
+        echo "${SYSTEM}2 : start=    16779264, size=     4194304, type=82"
 } > "$PART"

 sfdisk -q "$SYSTEM" < "$PART"
@ -355,35 +270,22 @@ 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="622560" # (4980480 * 512) / 4096
+OFFSET="1048576"    # 2048 * 512
+NUMBLOCKS="2097152" # (16777216 * 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;\
-        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
+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"

 rm -rf "$MOUNT"
 echo "$BASE" > "$STORAGE/dsm.ver"
@ -397,5 +299,7 @@ fi
 mv -f "$BOOT" "$STORAGE/$BASE.boot.img"
 rm -rf "$TMP"

-html "Installation finished successfully..."
+html "Booting DSM instance..."
+sleep 1.2
+
 return 0
--- a/src/network.sh
+++ b/src/network.sh
@ -4,9 +4,12 @@ set -Eeuo pipefail
 # Docker environment variables

 : "${MAC:=""}"
+: "${MTU:=""}"
 : "${DHCP:="N"}"
 : "${NETWORK:="Y"}"
+: "${USER_PORTS:=""}"
 : "${HOST_PORTS:=""}"
+: "${ADAPTER:="virtio-net-pci"}"

 : "${VM_NET_DEV:=""}"
 : "${VM_NET_TAP:="dsm"}"
@ -34,11 +37,32 @@ configureDHCP() {
  fi

  # 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=$?; } || :
+  { msg=$(ip link add link "$VM_NET_DEV" name "$VM_NET_TAP" address "$VM_NET_MAC" type macvtap mode bridge 2>&1); rc=$?; } || :

-  if (( rc != 0 )); then
-    error "Cannot create macvtap interface. Please make sure that the network type is 'macvlan' and not 'ipvlan',"
-    error "that your kernel is recent (>4) and supports it, and that the container has the NET_ADMIN capability set." && exit 16
+  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."
+        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
@ -52,25 +76,25 @@ configureDHCP() {

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

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

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

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

  if (( rc != 0 )); then
-    error "Cannot create TAP interface ($rc). $ADD_ERR --device-cgroup-rule='c *:* rwm'" && exit 21
+    error "Cannot create TAP interface ($rc). $ADD_ERR --device-cgroup-rule='c *:* rwm'" && return 1
  fi

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

  if (( rc != 0 )); then
-    error "VHOST can not be found ($rc). $ADD_ERR --device=/dev/vhost-net" && exit 22
+    error "VHOST can not be found ($rc). $ADD_ERR --device=/dev/vhost-net" && return 1
  fi

  NET_OPTS="-netdev tap,id=hostnet0,vhost=on,vhostfd=40,fd=30"
@ -80,32 +104,62 @@ configureDHCP() {

 configureDNS() {

-  # dnsmasq configuration:
-  DNSMASQ_OPTS="$DNSMASQ_OPTS --dhcp-range=$VM_NET_IP,$VM_NET_IP --dhcp-host=$VM_NET_MAC,,$VM_NET_IP,$VM_NET_HOST,infinite --dhcp-option=option:netmask,255.255.255.0"
-
  # Create lease file for faster resolve
  echo "0 $VM_NET_MAC $VM_NET_IP $VM_NET_HOST 01:$VM_NET_MAC" > /var/lib/misc/dnsmasq.leases
  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="$DNSMASQ_OPTS --dhcp-option=option:dns-server,${VM_NET_IP%.*}.1 --dhcp-option=option:router,${VM_NET_IP%.*}.1"
+  DNSMASQ_OPTS+=" --dhcp-option=option:netmask,255.255.255.0"
+  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="$DNSMASQ_OPTS --address=/host.lan/${VM_NET_IP%.*}.1"
+  DNSMASQ_OPTS+=" --address=/host.lan/${VM_NET_IP%.*}.1"

  DNSMASQ_OPTS=$(echo "$DNSMASQ_OPTS" | sed 's/\t/ /g' | tr -s ' ' | sed 's/^ *//')
-  [[ "$DEBUG" == [Yy1]* ]] && set -x
+
+  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: $?" && exit 29
+    error "Failed to start dnsmasq, reason: $?" && return 1
  fi
-  { set +x; } 2>/dev/null
-  [[ "$DEBUG" == [Yy1]* ]] && echo

  return 0
 }

-getPorts() {
+getUserPorts() {
+
+  local args=""
+  local list=$1
+  local ssh="22"
+  local dsm="5000"
+
+  [ -z "$list" ] && list="$ssh,$dsm" || list+=",$ssh,$dsm"
+
+  list="${list//,/ }"
+  list="${list## }"
+  list="${list%% }"
+
+  for port in $list; do
+    args+="hostfwd=tcp::$port-$VM_NET_IP:$port,"
+  done
+
+  echo "${args%?}"
+  return 0
+}
+
+getHostPorts() {

  local list=$1

@ -120,10 +174,29 @@ getPorts() {
  return 0
 }

+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")
+  [ -n "$forward" ] && NET_OPTS+=",$forward"
+
+  return 0
+}
+
 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
@ -131,29 +204,29 @@ configureNAT() {
  fi

  if [ ! -c /dev/net/tun ]; then
-    error "TUN device missing. $ADD_ERR --device /dev/net/tun --cap-add NET_ADMIN" && exit 25
+    error "$tuntap" && 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; rc=$?; } || :
+    { sysctl -w net.ipv4.ip_forward=1 > /dev/null 2>&1; rc=$?; } || :
    if (( rc != 0 )) || [[ $(< /proc/sys/net/ipv4/ip_forward) -eq 0 ]]; then
-      error "IP forwarding is disabled. $ADD_ERR --sysctl net.ipv4.ip_forward=1" && exit 24
+      [[ "$PODMAN" == [Yy1]* ]] && 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
-    error "Failed to create bridge. $ADD_ERR --cap-add NET_ADMIN" && exit 23
+    error "Failed to create bridge. $ADD_ERR --cap-add NET_ADMIN" && return 1
  fi

-  ip address add "${VM_NET_IP%.*}.1/24" broadcast "${VM_NET_IP%.*}.255" dev dockerbridge
+  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
+  fi

  while ! ip link set dockerbridge up; do
    info "Waiting for IP address to become available..."
@ -162,7 +235,19 @@ configureNAT() {

  # QEMU Works with taps, set tap to the bridge created
  if ! ip tuntap add dev "$VM_NET_TAP" mode tap; then
-    error "$tuntap" && exit 31
+    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
@ -170,35 +255,60 @@ configureNAT() {
    sleep 2
  done

-  ip link set dev "$VM_NET_TAP" master dockerbridge
+  if ! ip link set dev "$VM_NET_TAP" master dockerbridge; then
+    error "Failed to set IP link!" && return 1
+  fi

  # Add internet connection to the VM
  update-alternatives --set iptables /usr/sbin/iptables-legacy > /dev/null
  update-alternatives --set ip6tables /usr/sbin/ip6tables-legacy > /dev/null

-  exclude=$(getPorts "$HOST_PORTS")
+  exclude=$(getHostPorts "$HOST_PORTS")

  if ! iptables -t nat -A POSTROUTING -o "$VM_NET_DEV" -j MASQUERADE; then
-    error "$tables" && exit 30
+    error "$tables" && return 1
  fi

  # shellcheck disable=SC2086
-  iptables -t nat -A PREROUTING -i "$VM_NET_DEV" -d "$IP" -p tcp${exclude} -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 ! iptables -t nat -A PREROUTING -i "$VM_NET_DEV" -d "$IP" -p tcp${exclude} -j DNAT --to "$VM_NET_IP"; then
+    error "Failed to configure IP tables!" && return 1
+  fi
+
+  if ! iptables -t nat -A PREROUTING -i "$VM_NET_DEV" -d "$IP" -p udp -j DNAT --to "$VM_NET_IP"; then
+    error "Failed to configure IP tables!" && return 1
+  fi

  if (( KERNEL > 4 )); then
    # Hack for guest VMs complaining about "bad udp checksums in 5 packets"
    iptables -A POSTROUTING -t mangle -p udp --dport bootpc -j CHECKSUM --checksum-fill > /dev/null 2>&1 || true
  fi

-  NET_OPTS="-netdev tap,ifname=$VM_NET_TAP,script=no,downscript=no,id=hostnet0"
+  NET_OPTS="-netdev tap,id=hostnet0,ifname=$VM_NET_TAP"

  if [ -c /dev/vhost-net ]; then
    { exec 40>>/dev/vhost-net; rc=$?; } 2>/dev/null || :
-    (( rc == 0 )) && NET_OPTS="$NET_OPTS,vhost=on,vhostfd=40"
+    (( rc == 0 )) && NET_OPTS+=",vhost=on,vhostfd=40"
  fi

-  configureDNS
+  NET_OPTS+=",script=no,downscript=no"
+
+  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
 }
@ -213,44 +323,41 @@ closeNetwork() {

  fi

-  [[ "$NETWORK" != [Yy1]* ]] && return 0
+  [[ "$NETWORK" == [Nn]* ]] && return 0

  exec 30<&- || true
  exec 40<&- || true

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

-    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")"
-
-    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
+    closeBridge
+    return 0

  fi

+  ip link set "$VM_NET_TAP" down || true
+  ip link delete "$VM_NET_TAP" || true
+
  return 0
 }

 checkOS() {

-  local name
+  local kernel
  local os=""
-  name=$(uname -a)
+  local if="macvlan"
+  kernel=$(uname -a)

-  [[ "${name,,}" == *"darwin"* ]] && os="MacOS"
-  [[ "${name,,}" == *"microsoft"* ]] && os="Windows"
+  [[ "${kernel,,}" == *"darwin"* ]] && os="Docker Desktop for macOS"
+  [[ "${kernel,,}" == *"microsoft"* ]] && os="Docker Desktop for Windows"
+
+  if [[ "$DHCP" == [Yy1]* ]]; then
+    if="macvtap"
+    [[ "${kernel,,}" == *"synology"* ]] && os="Synology Container Manager"
+  fi

  if [ -n "$os" ]; then
-    error "You are using Docker Desktop for $os which does not support macvlan, please revert to bridge networking!"
-    return 1
+    warn "you are using $os which does not support $if, please revert to bridge networking!"
  fi

  return 0
@ -271,12 +378,33 @@ 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 27
+    error "$ADD_ERR -e \"VM_NET_DEV=NAME\" to specify another interface name." && exit 26
+  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/')
@ -296,8 +424,17 @@ 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}')
-  IP=$(ip address show dev "$VM_NET_DEV" | grep inet | awk '/inet / { print $2 }' | cut -f1 -d/)
+  GATEWAY=$(ip route list dev "$VM_NET_DEV" | awk ' /^default/ {print $3}' | head -n 1)
+  IP=$(ip address show dev "$VM_NET_DEV" | grep inet | awk '/inet / { print $2 }' | cut -f1 -d/ | head -n 1)
+
+  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
@ -307,7 +444,7 @@ getInfo() {
 #  Configure Network
 # ######################################

-if [[ "$NETWORK" != [Yy1]* ]]; then
+if [[ "$NETWORK" == [Nn]* ]]; then
  NET_OPTS=""
  return 0
 fi
@ -316,8 +453,14 @@ getInfo
 html "Initializing network..."

 if [[ "$DEBUG" == [Yy1]* ]]; then
-  info "Host: $HOST  IP: $IP  Gateway: $GATEWAY  Interface: $VM_NET_DEV  MAC: $VM_NET_MAC"
-  [ -f /etc/resolv.conf ] && grep '^nameserver*' /etc/resolv.conf
+  mtu=$(cat "/sys/class/net/$VM_NET_DEV/mtu")
+  line="Host: $HOST  IP: $IP  Gateway: $GATEWAY  Interface: $VM_NET_DEV  MAC: $VM_NET_MAC  MTU: $mtu"
+  [[ "$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

@ -325,35 +468,65 @@ 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 && exit 19
+  checkOS

-  if [[ "$GATEWAY" == "172."* ]]; then
-    warn "your gateway IP starts with 172.* which is often a sign that you are not on a macvlan network (required for DHCP)!"
+  if [[ "$IP" == "172."* ]]; then
+    warn "container IP starts with 172.* which is often a sign that you are not on a macvlan network (required for DHCP)!"
  fi

-  # Configuration for DHCP IP
-  configureDHCP
+  # Configure for macvtap interface
+  configureDHCP || exit 20

  MSG="Booting DSM instance..."
  html "$MSG"

 else

-  if [[ "$GATEWAY" != "172."* ]] && [[ "$GATEWAY" != "10."* ]]; then
-    ! checkOS && exit 19
+  if [[ "$IP" != "172."* ]] && [[ "$IP" != "10.8"* ]] && [[ "$IP" != "10.9"* ]]; then
+    checkOS
  fi

  # Shutdown nginx
  nginx -s stop 2> /dev/null
  fWait "nginx"

-  # Configuration for static IP
-  configureNAT
+  if [[ "${NETWORK,,}" != "user"* ]]; then
+
+    # Configure for tap interface
+    if ! configureNAT; then
+
+      closeBridge
+      NETWORK="user"
+      msg="falling back to user-mode networking!"
+      if [[ "$PODMAN" != [Yy1]* ]]; then
+        msg="an error occured, $msg"
+      else
+        msg="podman detected, $msg"
+      fi
+      warn "$msg"
+      [ -z "$USER_PORTS" ] && info "Notice: port mapping will not work without \"USER_PORTS\" now."
+
+    fi
+
+  fi
+
+  if [[ "${NETWORK,,}" == "user"* ]]; then
+
+    # Configure for user-mode networking (slirp)
+    configureUser || exit 24
+
+  fi

 fi

-NET_OPTS="$NET_OPTS -device virtio-net-pci,romfile=,netdev=hostnet0,mac=$VM_NET_MAC,id=net0"
+NET_OPTS+=" -device $ADAPTER,id=net0,netdev=hostnet0,romfile=,mac=$VM_NET_MAC"
+[[ "$MTU" != "0" ]] && [[ "$MTU" != "1500" ]] && NET_OPTS+=",host_mtu=$MTU"

 return 0
--- a/src/power.sh
+++ b/src/power.sh
@ -176,7 +176,7 @@ MON_OPTS="\

 if [[ "$CONSOLE" != [Yy]* ]]; then

-  MON_OPTS="$MON_OPTS -daemonize -D $QEMU_LOG"
+  MON_OPTS+=" -daemonize -D $QEMU_LOG"

  _trap _graceful_shutdown SIGTERM SIGHUP SIGINT SIGABRT SIGQUIT

--- a/src/print.sh
+++ b/src/print.sh
@ -4,7 +4,7 @@ set -Eeuo pipefail
 : "${DHCP:="N"}"
 : "${NETWORK:="Y"}"

-[[ "$NETWORK" != [Yy1]* ]] && exit 0
+[[ "$NETWORK" == [Nn]* ]] && exit 0

 info () { printf "%b%s%b" "\E[1;34m❯ \E[1;36m" "$1" "\E[0m\n" >&2; }
 error () { printf "%b%s%b" "\E[1;31m❯ " "ERROR: $1" "\E[0m\n" >&2; }
--- a/src/proc.sh
+++ b/src/proc.sh
@ -9,6 +9,24 @@ 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."
@ -19,14 +37,14 @@ if [[ "$KVM" != [Nn]* ]]; then
  KVM_ERR=""

  if [ ! -e /dev/kvm ]; then
-    KVM_ERR="(device file missing)"
+    KVM_ERR="(/dev/kvm is missing)"
  else
    if ! sh -c 'echo -n > /dev/kvm' &> /dev/null; then
-      KVM_ERR="(no write access)"
+      KVM_ERR="(/dev/kvm is unwriteable)"
    else
      flags=$(sed -ne '/^flags/s/^.*: //p' /proc/cpuinfo)
      if ! grep -qw "vmx\|svm" <<< "$flags"; then
-        KVM_ERR="(vmx/svm disabled)"
+        KVM_ERR="(not enabled in BIOS)"
      fi
    fi
  fi
@ -34,15 +52,19 @@ 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."
-    else
-      if grep -qi Microsoft /proc/version; then
-        warn "you are using Windows 10 which has no KVM support, this will cause a major loss of performance."
-      else
-        error "KVM acceleration not available $KVM_ERR, this will cause a major loss of performance."
-        error "See the FAQ on how to enable it, or continue without KVM by setting KVM=N (not recommended)."
-        [[ "$DEBUG" != [Yy1]* ]] && exit 88
-      fi
+      warn "you are using macOS which has no KVM support, this will cause a major loss of performance."
+    else      
+      kernel=$(uname -a)
+      case "${kernel,,}" in
+        *"microsoft"* )
+          error "Please bind '/dev/kvm' as a volume in the optional container settings when using Docker Desktop." ;;
+        *"synology"* )
+          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

@ -50,24 +72,44 @@ fi

 if [[ "$KVM" != [Nn]* ]]; then

-  CPU_FEATURES="kvm=on,l3-cache=on"
+  CPU_FEATURES="kvm=on,l3-cache=on,+hypervisor"
  KVM_OPTS=",accel=kvm -enable-kvm -global kvm-pit.lost_tick_policy=discard"

  if ! grep -qw "sse4_2" <<< "$flags"; then
    info "Your CPU does not have the SSE4 instruction set that Virtual DSM requires, it will be emulated..."
    [ -z "$CPU_MODEL" ] && CPU_MODEL="$DEF_MODEL"
-    CPU_FEATURES="$CPU_FEATURES,+ssse3,+sse4.1,+sse4.2"
+    CPU_FEATURES+=",+ssse3,+sse4.1,+sse4.2"
  fi

  if [ -z "$CPU_MODEL" ]; then
    CPU_MODEL="host"
-    CPU_FEATURES="$CPU_FEATURES,migratable=no"
+    CPU_FEATURES+=",migratable=no"
+  fi
+
+  if grep -qw "svm" <<< "$flags"; then
+
+    # AMD processor
+
+    if grep -qw "tsc_scale" <<< "$flags"; then
+      CPU_FEATURES+=",+invtsc"
+    fi
+
+  else
+
+    # Intel processor
+
+    vmx=$(sed -ne '/^vmx flags/s/^.*: //p' /proc/cpuinfo)
+
+    if grep -qw "tsc_scaling" <<< "$vmx"; then
+      CPU_FEATURES+=",+invtsc"
+    fi
+
  fi

 else

  KVM_OPTS=""
-  CPU_FEATURES="l3-cache=on"
+  CPU_FEATURES="l3-cache=on,+hypervisor"

  if [[ "$ARCH" == "amd64" ]]; then
    KVM_OPTS=" -accel tcg,thread=multi"
@ -76,13 +118,13 @@ else
  if [ -z "$CPU_MODEL" ]; then
    if [[ "$ARCH" == "amd64" ]]; then
      CPU_MODEL="max"
-      CPU_FEATURES="$CPU_FEATURES,migratable=no"
+      CPU_FEATURES+=",migratable=no"
    else
      CPU_MODEL="$DEF_MODEL"
    fi
  fi

-  CPU_FEATURES="$CPU_FEATURES,+ssse3,+sse4.1,+sse4.2"
+  CPU_FEATURES+=",+ssse3,+sse4.1,+sse4.2"

 fi

@ -101,7 +143,7 @@ else
 fi

 if [ -z "$HOST_CPU" ]; then
-  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')
+  [[ "${CPU,,}" != "unknown" ]] && HOST_CPU="$CPU"
 fi

 if [ -n "$HOST_CPU" ]; then
@ -109,9 +151,9 @@ if [ -n "$HOST_CPU" ]; then
 else
  HOST_CPU="QEMU, Virtual CPU,"
  if [ "$ARCH" == "amd64" ]; then
-    HOST_CPU="$HOST_CPU X86_64"
+    HOST_CPU+=" X86_64"
  else
-    HOST_CPU="$HOST_CPU $ARCH"
+    HOST_CPU+=" $ARCH"
  fi
 fi

--- a/src/progress.sh
+++ b/src/progress.sh
@ -26,9 +26,9 @@ do
    bytes=$(du -sb "$file" | cut -f1)
    if (( bytes > 1000 )); then
      if [ -z "$total" ] || [[ "$total" == "0" ]]; then
-        size=$(numfmt --to=iec --suffix=B  "$bytes" | sed -r 's/([A-Z])/ \1/')
+        size=$(numfmt --to=iec --suffix=B "$bytes" | sed -r 's/([A-Z])/ \1/')
      else
-        size=$(printf '%.1f\n' "$((bytes*100*100/total))e-2")
+        size="$(echo "$bytes" "$total" | awk '{printf "%.1f", $1 * 100 / $2}')"
        size="$size%"
      fi
      echo "${body//(\[P\])/($size)}"> "$info"
--- a/src/reset.sh
+++ b/src/reset.sh
@ -1,10 +1,6 @@
 #!/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
@ -15,35 +11,44 @@ echo "❯ For support visit $SUPPORT"

 # Docker environment variables

-: "${TZ:=""}"             # System local timezone
-: "${DEBUG:="N"}"         # Disable debugging mode
-: "${COUNTRY:=""}"        # Country code for mirror
-: "${CONSOLE:="N"}"       # Disable console mode
-: "${ALLOCATE:=""}"       # Preallocate diskspace
-: "${ARGUMENTS:=""}"      # Extra QEMU parameters
-: "${CPU_CORES:="1"}"     # Amount of CPU cores
-: "${RAM_SIZE:="1G"}"     # Maximum RAM amount
-: "${RAM_CHECK:="Y"}"     # Check available RAM
-: "${DISK_SIZE:="16G"}"   # Initial data disk size
+: "${TZ:=""}"              # System local timezone
+: "${DEBUG:="N"}"          # Disable debugging mode
+: "${COUNTRY:=""}"         # Country code for mirror
+: "${CONSOLE:="N"}"        # Disable console mode
+: "${ALLOCATE:=""}"        # Preallocate diskspace
+: "${ARGUMENTS:=""}"       # Extra QEMU parameters
+: "${CPU_CORES:="2"}"      # Amount of CPU cores
+: "${RAM_SIZE:="2G"}"      # 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)
 SYS=$(uname -r)
 HOST=$(hostname -s)
 KERNEL=$(echo "$SYS" | cut -b 1)
 MINOR=$(echo "$SYS" | cut -d '.' -f2)
 ARCH=$(dpkg --print-architecture)
-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')
+CORES=$(grep -c '^processor' /proc/cpuinfo)
+
+if ! grep -qi "socket(s)" <<< "$(lscpu)"; then
+  SOCKETS=1
+else
+  SOCKETS=$(lscpu | 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

 # Check system

@ -55,6 +60,11 @@ 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
@ -71,28 +81,39 @@ 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")
-AVAIL_GB=$(( RAM_AVAIL/1073741824 ))
-TOTAL_GB=$(( (RAM_TOTAL + 1073741823)/1073741824 ))
-WANTED_GB=$(( (RAM_WANTED + 1073741823)/1073741824 ))
+[ "$RAM_WANTED" -lt "136314880 " ] && error "RAM_SIZE is too low: $RAM_SIZE" && exit 16

 # 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=$(( (SPACE + 1073741823)/1073741824 ))
+SPACE_GB=$(formatBytes "$SPACE" "down")
+AVAIL_MEM=$(formatBytes "$RAM_AVAIL" "down")
+TOTAL_MEM=$(formatBytes "$RAM_TOTAL" "up")

-echo "❯ CPU: ${CPU} | RAM: $AVAIL_GB/$TOTAL_GB GB | DISK: $SPACE_GB GB (${FS}) | HOST: ${SYS}..."
+echo "❯ CPU: ${CPU} | RAM: ${AVAIL_MEM/ GB/}/$TOTAL_MEM | DISK: $SPACE_GB (${FS}) | KERNEL: ${SYS}..."
 echo

-# Check memory
+# Check available memory

-if [[ "$RAM_CHECK" != [Nn]* ]]; then
-  if (( (RAM_WANTED + RAM_SPARE) > RAM_AVAIL )); then
-    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."
-    exit 17
-  fi
+if [[ "$RAM_CHECK" != [Nn]* ]] && (( (RAM_WANTED + RAM_SPARE) > RAM_AVAIL )); then
+  AVAIL_MEM=$(formatBytes "$RAM_AVAIL")
+  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."
+  [[ "${FS,,}" != "zfs" ]] && error "$msg" && exit 17
+  info "$msg"
 fi

 # Cleanup files
@ -103,91 +124,6 @@ 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
@ -248,6 +184,17 @@ 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/serial.sh
+++ b/src/serial.sh
@ -67,7 +67,7 @@ else
  SERIAL_OPTS="-serial mon:stdio"
 fi

-SERIAL_OPTS="$SERIAL_OPTS \
+SERIAL_OPTS+=" \
        -device virtio-serial-pci,id=virtio-serial0,bus=pcie.0,addr=0x3 \
        -chardev socket,id=charchannel0,host=127.0.0.1,port=12345,reconnect=10 \
        -device virtserialport,bus=virtio-serial0.0,nr=1,chardev=charchannel0,id=channel0,name=vchannel"
--- a/src/utils.sh
+++ b/src/utils.sh
@ -0,0 +1,175 @@
+#!/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/conf/nginx.conf
+++ b/web/conf/nginx.conf
@ -1,5 +1,4 @@
 server {
-    listen 80;
    listen 5000 default_server;

    autoindex on;
--- 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="icon" href="/img/favicon.svg" type="image/x-icon">
+        <link rel="stylesheet" type="text/css" href="css/style.css" />
+        <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 {
Author	SHA1	Message	Date
Kroese	1b8054e847	fix: Podman detection (#990 ) Some checks failed Build / Check (push) Has been cancelled Details Build / Build (push) Has been cancelled Details	2025-05-27 00:50:40 +02:00
Kroese	631a558a9f	feat: Enable IPv6 support for user-mode container networking (#983 ) Some checks failed Build / Check (push) Has been cancelled Details Build / Build (push) Has been cancelled Details	2025-04-27 11:28:54 +02:00
Kroese	d5805b4e08	feat: Check CPU vendor (#982 )	2025-04-27 11:21:37 +02:00
Kroese	1dc15ce2e0	docs: Add input types (#981 )	2025-04-23 12:54:22 +02:00
Kroese	4145e811df	feat: Improve CPU detection (#980 ) Some checks failed Build / Check (push) Has been cancelled Details Build / Build (push) Has been cancelled Details	2025-04-20 21:43:02 +02:00
Kroese	fe8615d7d3	docs: Add quotes around $PWD (#977 ) Some checks failed Build / Check (push) Has been cancelled Details Update / dockerHubDescription (push) Has been cancelled Details Build / Build (push) Has been cancelled Details	2025-04-16 12:10:59 +02:00
Kroese	27ea5506bc	feat: Default to 2 CPU cores and 2GB of RAM (#976 )	2025-04-16 11:56:02 +02:00
Kroese	394131a0d7	feat: Podman detection (#972 ) Some checks failed Build / Check (push) Has been cancelled Details Build / Build (push) Has been cancelled Details	2025-04-09 09:01:01 +02:00
Kroese	4d0d16023f	feat: Podman detection (#971 )	2025-04-09 08:58:02 +02:00
Kroese	60dd794b29	fix: Avoid pipe to head on find (#970 )	2025-04-09 08:03:41 +02:00
Kroese	f13d104968	build: Add root-user-action flag (#968 ) Some checks are pending Build / Check (push) Waiting to run Details Build / Build (push) Blocked by required conditions Details	2025-04-08 07:53:17 +02:00
Kroese	914099fd12	build: Add --root-user-action flag (#967 ) Some checks are pending Build / Check (push) Waiting to run Details Build / Build (push) Blocked by required conditions Details	2025-04-07 18:47:36 +02:00
Kroese	639725957d	fix: Permission errors on QNAP (#966 )	2025-04-07 18:36:47 +02:00
Kroese	64bbe82c4a	fix: KVM warning (#965 )	2025-04-07 17:44:26 +02:00
Kroese	73a13e5697	fix: QNAP permission errors (#964 )	2025-04-07 17:20:14 +02:00
Kroese	e8ec5fb8ed	feat: Support 4k sector sizes (#963 ) Some checks failed Build / Check (push) Waiting to run Details Build / Build (push) Blocked by required conditions Details Update / dockerHubDescription (push) Has been cancelled Details	2025-04-07 13:25:20 +02:00
Kroese	0b500ca377	docs: Disk pass-through (#960 ) Some checks failed Update / dockerHubDescription (push) Has been cancelled Details	2025-04-03 10:22:26 +02:00
Kroese	df58745ed8	fix: Ignore missing custom .pat after install (#959 ) Some checks failed Build / Check (push) Has been cancelled Details Build / Build (push) Has been cancelled Details	2025-04-03 01:13:14 +02:00
Kroese	55e8ab4930	docs: Github Codespaces (#956 ) Some checks failed Update / dockerHubDescription (push) Has been cancelled Details	2025-03-27 01:48:40 +01:00
Kroese	4882fd3bf6	fix: Local file support (#955 ) Some checks failed Build / Check (push) Has been cancelled Details Build / Build (push) Has been cancelled Details	2025-03-26 19:51:58 +01:00
Kroese	3e69f4bcc9	feat: New extraction method (#954 ) Some checks are pending Build / Check (push) Waiting to run Details Build / Build (push) Blocked by required conditions Details	2025-03-26 09:24:13 +01:00
Kroese	39428909d6	docs: Installation (#953 ) Some checks are pending Update / dockerHubDescription (push) Waiting to run Details	2025-03-26 02:47:28 +01:00
Kroese	71d2ed40db	docs: Github Codespaces (#952 ) Some checks are pending Update / dockerHubDescription (push) Waiting to run Details	2025-03-25 14:49:46 +01:00
Kroese	9ad21a28a6	docs: Disk pass-through (#951 ) Some checks are pending Update / dockerHubDescription (push) Waiting to run Details	2025-03-25 12:18:38 +01:00
Kroese	0c7acd6e71	fix: Remove non-printable characters (#949 ) Some checks failed Build / Check (push) Has been cancelled Details Build / Build (push) Has been cancelled Details	2025-03-24 13:52:38 +01:00
Kroese	ad26129375	docs: KVM information (#947 ) Some checks failed Update / dockerHubDescription (push) Has been cancelled Details	2025-03-20 23:21:41 +01:00
Kroese	4e7822fedd	docs: Compatibility chart (#946 )	2025-03-20 23:07:14 +01:00
Kroese	4dfcbe4ab1	docs: Add Podman (#945 )	2025-03-20 20:09:53 +01:00
Kroese	8fb6f1f9ad	feat: Podman detection (#944 ) Some checks failed Build / Check (push) Has been cancelled Details Build / Build (push) Has been cancelled Details	2025-03-20 11:54:26 +01:00
Kroese	11d4fafa6d	fix: User-mode networking (#943 ) Some checks are pending Build / Check (push) Waiting to run Details Build / Build (push) Blocked by required conditions Details	2025-03-20 03:07:01 +01:00
Kroese	be15557798	fix: User-mode networking (#942 )	2025-03-20 03:05:50 +01:00
Kroese	1e83757494	fix: Set user-mode IP address (#941 ) Some checks are pending Build / Check (push) Waiting to run Details Build / Build (push) Blocked by required conditions Details	2025-03-19 12:55:53 +01:00
Kroese	fad463a439	feat: Add devcontainer (#940 ) Some checks are pending Build / Check (push) Waiting to run Details Build / Build (push) Blocked by required conditions Details	2025-03-19 09:17:48 +01:00
Kroese	608563d029	feat: Add devcontainer (#939 ) Some checks are pending Build / Check (push) Waiting to run Details Build / Build (push) Blocked by required conditions Details	2025-03-18 19:25:27 +01:00
Kroese	5fcd22b09f	docs: Formatting (#938 ) Some checks failed Build / Check (push) Waiting to run Details Build / Build (push) Blocked by required conditions Details Update / dockerHubDescription (push) Has been cancelled Details	2025-03-18 14:24:05 +01:00
Kroese	65548da2ef	docs: Github Codespaces (#937 )	2025-03-18 14:10:08 +01:00
Kroese	111e513dac	docs: Github Codespaces (#936 )	2025-03-18 14:09:10 +01:00
Kroese	7fce3a98fe	feat: Refactor helper functions (#935 )	2025-03-18 12:57:52 +01:00
Kroese	4018eeadb4	fix: Remove port 80 (#934 ) Some checks are pending Build / Check (push) Waiting to run Details Build / Build (push) Blocked by required conditions Details Update / dockerHubDescription (push) Waiting to run Details	2025-03-18 05:03:54 +01:00
Kroese	a8e4647fa6	feat: IPv6 support (#933 )	2025-03-18 03:59:58 +01:00
Kroese	36d3fca4fc	fix: Fallback to POSIX fallocate (#932 ) Some checks are pending Build / Check (push) Waiting to run Details Build / Build (push) Blocked by required conditions Details	2025-03-17 11:19:04 +01:00
Kroese	89b28f36d3	docs: Disk pass-through (#930 ) Some checks failed Update / dockerHubDescription (push) Has been cancelled Details	2025-03-16 12:30:06 +01:00
Kroese	b4f7d70a7a	docs: Readme (#929 ) Some checks are pending Update / dockerHubDescription (push) Waiting to run Details	2025-03-16 06:52:14 +01:00
Kroese	902bafbd0c	docs: Readme (#928 )	2025-03-16 06:40:38 +01:00
Kroese	7ad5c7fa70	fix: Display available memory (#926 ) Some checks failed Update / dockerHubDescription (push) Waiting to run Details Build / Check (push) Has been cancelled Details Build / Build (push) Has been cancelled Details	2025-03-15 14:09:17 +01:00
Kroese	4d29f056b7	fix: Format filesizes (#925 ) Some checks are pending Build / Check (push) Waiting to run Details Build / Build (push) Blocked by required conditions Details	2025-03-14 18:53:53 +01:00
Kroese	36af9a3483	feat: Validate configured RAM (#924 ) Some checks are pending Build / Check (push) Waiting to run Details Build / Build (push) Blocked by required conditions Details	2025-03-14 14:42:08 +01:00
Kroese	5e6f931433	feat: Detect clock source (#923 )	2025-03-14 14:16:10 +01:00
Kroese	beadfe720c	feat: Improve CPU detection (#921 ) Some checks are pending Build / Check (push) Waiting to run Details Build / Build (push) Blocked by required conditions Details	2025-03-14 05:23:49 +01:00
Kroese	92b4bfc383	feat: Validate configured RAM (#920 ) Some checks are pending Build / Check (push) Waiting to run Details Build / Build (push) Blocked by required conditions Details	2025-03-13 11:35:08 +01:00
Kroese	092ed23085	feat: Check CPU core configuration (#919 )	2025-03-13 10:47:25 +01:00
Kroese	c70fa3d00a	feat: Validate specified size (#918 ) Some checks are pending Build / Check (push) Waiting to run Details Build / Build (push) Blocked by required conditions Details	2025-03-12 21:17:47 +01:00
Kroese	fea0ba09f6	docs: Use relative paths (#917 ) Some checks failed Update / dockerHubDescription (push) Has been cancelled Details	2025-03-12 12:31:50 +01:00
Kroese	7d2af63eac	docs: Kubernetes deployment (#916 ) Some checks failed Update / dockerHubDescription (push) Has been cancelled Details	2025-03-07 00:42:29 +01:00
Kroese	2e73bf560e	docs: Add link to download (#915 )	2025-03-07 00:22:29 +01:00
Kroese	bfc8d7a9c6	fix: Network shutdown (#912 ) Some checks failed Build / Check (push) Has been cancelled Details Build / Build (push) Has been cancelled Details	2025-03-05 04:59:57 +01:00
Kroese	a1e9936572	fix: Set MTU value (#911 ) Some checks are pending Build / Check (push) Waiting to run Details Build / Build (push) Blocked by required conditions Details	2025-03-04 15:37:37 +01:00
Kroese	3675a50129	fix: Gateway MAC generation (#910 ) Some checks are pending Build / Check (push) Waiting to run Details Build / Build (push) Blocked by required conditions Details	2025-03-03 13:57:53 +01:00
Kroese	91229152bd	feat: Set MTU size for TAP interface (#909 )	2025-03-03 13:40:15 +01:00
Kroese	a1993e590a	feat: Automaticly match MTU size (#908 )	2025-03-03 12:20:16 +01:00
Kroese	52fe712b6f	docs: Readme (#907 ) Some checks failed Update / dockerHubDescription (push) Has been cancelled Details	2025-03-01 14:23:51 +01:00
Kroese	7f400b6b59	feat: Improve CPU detection (#905 ) Some checks failed Build / Check (push) Has been cancelled Details Build / Build (push) Has been cancelled Details	2025-02-27 11:52:48 +01:00
Kroese	9cb88a99e6	feat: Allow bridge networks (#904 )	2025-02-27 11:46:38 +01:00
Kroese	b967a471b5	fix: Add e2fsprogs package (#902 ) Some checks are pending Build / Check (push) Waiting to run Details Build / Build (push) Blocked by required conditions Details	2025-02-26 10:03:46 +01:00
Kroese	f40127df01	feat: Make app name configurable (#900 ) Some checks are pending Build / Check (push) Waiting to run Details Build / Build (push) Blocked by required conditions Details	2025-02-25 15:13:57 +01:00
Kroese	8c5e0ee274	fix: Generate local MAC address (#899 ) Some checks are pending Build / Check (push) Waiting to run Details Build / Build (push) Blocked by required conditions Details	2025-02-24 21:01:55 +01:00
Kroese	2adf0b292b	fix: Preserve gateway MAC address (#898 ) Some checks are pending Build / Check (push) Waiting to run Details Build / Build (push) Blocked by required conditions Details	2025-02-24 03:48:42 +01:00
Kroese	1c9b793c75	fix: Move nginx config (#893 ) Some checks failed Build / Check (push) Has been cancelled Details Build / Build (push) Has been cancelled Details	2025-02-15 02:36:07 +01:00
Kroese	00c4ef7795	feat: Remove existing TAP interface (#892 ) Some checks are pending Build / Check (push) Waiting to run Details Build / Build (push) Blocked by required conditions Details	2025-02-14 20:19:12 +01:00
Kroese	619657adf2	docs: Add restart policy (#888 ) Some checks failed Update / dockerHubDescription (push) Has been cancelled Details	2025-02-10 00:31:32 +01:00
Kroese	41db7c1035	feat: Improve CPU detection (#884 ) Some checks failed Build / Check (push) Has been cancelled Details Build / Build (push) Has been cancelled Details	2025-02-06 02:19:39 +01:00
Kroese	d71834a777	build: Enable ARM64 platform (#873 )	2025-01-10 18:44:37 +01:00
Kroese	d078af0397	fix: TUN device error (#863 )	2024-12-03 11:50:56 +01:00
Kroese	2827d1d375	docs: Add TUN device (#861 )	2024-12-01 17:57:00 +01:00
Kroese	898499a4e3	feat: Make network adapter configurable (#859 )	2024-11-26 20:01:37 +01:00
Kroese	eb010cc215	feat: Improve network error handling (#856 )	2024-11-20 16:24:07 +01:00
Kroese	84440d5159	fix: Use relative URL's (#855 )	2024-11-20 13:21:20 +01:00
Kroese	ff3744ead9	feat: Improve CPU detection (#854 )	2024-11-20 13:13:43 +01:00
Kroese	d00fe4b3eb	docs: Readme (#848 )	2024-11-13 03:45:21 +01:00
Kroese	72a86a5d7f	docs: Add Kubernetes URL (#847 )	2024-11-13 03:35:50 +01:00
Kroese	811ab622df	docs: Add compatibility chart (#846 )	2024-11-13 03:26:15 +01:00
Kroese	e76b72cddf	feat: Disable HTTP keepalives (#845 )	2024-11-13 02:48:27 +01:00
Kroese	e9edacc9c3	feat: Support image commit (#844 )	2024-11-13 00:39:48 +01:00
Kroese	a6694a6b29	feat: Rename host to kernel (#843 )	2024-11-11 16:24:47 +01:00
Kroese	59323cd375	docs: KVM troubleshooting (#842 )	2024-11-11 14:16:21 +01:00
Kroese	6dc714e449	feat: Display unknown filesystem (#841 )	2024-11-10 15:00:38 +01:00
Kroese	5d75a9b039	feat: Improve CPU detection (#840 )	2024-11-10 11:21:51 +01:00
Kroese	92b4cf5997	build: Use latest Debian image (#832 )	2024-10-19 22:09:52 +02:00
Kroese	906e61b1b2	feat: Improve CPU detection (#831 )	2024-10-15 10:27:51 +02:00
Kroese	dab230f9d5	build: Remove ARM64 platform (#830 )	2024-10-15 00:37:28 +02:00
Kroese	5e8bcda9fc	feat: Improve CPU detection (#829 )	2024-10-14 18:06:02 +02:00
Kroese	d4bf83ae86	feat: Add NVME disk type (#828 )	2024-10-13 03:03:32 +02:00
xrh0905	8244a48511	Correct the possible DISK_IO (io_uring) (#827 )	2024-10-06 16:26:35 +02:00
Kroese	43ffa18a5f	fix: Remove scsi parameter from virtio-blk-pci (#824 )	2024-10-01 21:49:31 +02:00
Kroese	b131a32d0c	buid: Pin Debian version (#818 )	2024-09-27 14:40:56 +02:00
D-Jy	c81787b837	feat: Allow custom rendernode (#817 )	2024-09-17 23:30:58 +02:00
Kroese	f9df3c6db6	feat: Update to VirtualDSM 7.2.2 (#815 )	2024-09-11 19:20:43 +02:00
Liang Ying-Ruei	e383ec30e3	fix: Splits $USER_PORTS correctly by commas (#813 )	2024-09-09 15:43:57 +02:00
Kroese	1197c4791e	fix: Port forwarding warning (#809 )	2024-09-05 18:58:23 +02:00
Kroese	106c684389	docs: Update package URL (#808 )	2024-09-03 15:09:33 +02:00
Kroese	a199ced77b	docs: Update package URL (#803 )	2024-08-27 16:07:09 +02:00
Kroese	77ac73666e	fix: Progress calculation (#799 )	2024-08-18 17:55:07 +02:00
Kroese	64975557c2	fix: Validate lscpu output (#798 )	2024-08-18 04:40:20 +02:00
Kroese	b62321806a	docs: Fix badge (#796 )	2024-08-13 20:51:55 +02:00
renovate[bot]	7c392082b1	chore(deps): update docker/build-push-action action to v6 (#775 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2024-06-17 12:45:23 +02:00
Kroese	392e9a6417	docs: Networking (#774 )	2024-06-16 06:09:26 +02:00
Kroese	fb5f684e7e	fix: Don't set script with file descriptor (#772 )	2024-06-14 04:35:40 +02:00
Kroese	0dbc794223	feat: Customize image filenames (#771 )	2024-06-14 03:01:27 +02:00
Kroese	6295ed3b7b	docs: Removed Kubevirt dependancy (#770 )	2024-06-13 19:31:00 +02:00
Kroese	0f2d889858	fix: Assume GB when no unit is present (#769 )	2024-06-13 18:59:13 +02:00
Kroese	60e6b01982	docs: Add markdown alerts (#768 )	2024-06-13 18:31:25 +02:00
Kroese	1dc69f9e22	docs: Add GHCR badge (#767 )	2024-06-11 23:26:38 +02:00
Kroese	fcca41ad93	docs: Readme (#766 )	2024-06-11 21:48:18 +02:00
Kroese	9897747425	docs: Add icons (#765 )	2024-06-11 21:06:38 +02:00
Kroese	4dbe9dcefd	docs: KVM information (#764 )	2024-06-11 19:56:14 +02:00
Kroese	be8bee90f2	feat: Implement usermode networking (#762 )	2024-06-11 02:13:53 +02:00
Kroese	f8879029ec	fix: Do not use IO threading for SATA disks (#760 )	2024-06-09 18:34:55 +02:00
Kroese	7b491b3cee	feat: Verify clocksource is set to TSC (#759 )	2024-06-09 17:44:15 +02:00
Kroese	2ece865417	fix: Download error messages (#756 )	2024-06-05 18:18:29 +02:00
Kroese	0d8c693c65	build: Update qemu-host to v2.05 (#755 )	2024-06-05 14:32:21 +02:00
Kroese	9f7d1396b6	docs: Readme (#753 )	2024-06-03 02:00:04 +02:00
Kroese	5ad323486e	feat: Print QEMU version on boot (#752 )	2024-06-02 23:00:40 +02:00
Kroese	19b4248929	feat: Print QEMU version on boot (#751 )	2024-06-02 21:04:09 +02:00
Kroese	c135c4cac3	feat: Add automatic device type (#749 )	2024-05-27 17:25:52 +02:00
Kroese	fb1751ff26	docs: Updated issue templates (#747 )	2024-05-25 14:07:30 +02:00
Kroese	34f32d4ac6	docs: Docker CLI example (#746 )	2024-05-22 07:55:38 +02:00
Kroese	36f1e47c0a	fix: Check for Podman IP ranges (#745 )	2024-05-21 13:48:05 +02:00