2025-06-08 01:18:32 +08:00
34 changed files with 690 additions and 1687 deletions
--- a/.devcontainer.json
+++ b/.devcontainer.json
@ -1,6 +0,0 @@
 {
  "name": "dsm",
  "service": "dsm",
  "forwardPorts": [5000],
  "dockerComposeFile": "compose.yml"
 }
--- a/.dockerignore
+++ b/.dockerignore
@ -6,10 +6,7 @@
 .gitmodules
 Dockerfile
 Dockerfile.archive
 compose.yml
 compose.yaml
 docker-compose.yml
 docker-compose.yaml
 *.md
--- a/.github/ISSUE_TEMPLATE/1-issue.yml
+++ b/.github/ISSUE_TEMPLATE/1-issue.yml
@ -1,41 +0,0 @@
 name: "\U0001F6A8 Technical issue"
 description: When you're experiencing problems using the container
 body:
  - type: input
    id: os
    attributes:
      label: Operating system
      description: Your Linux distribution (can be shown by `lsb_release -a`).
      placeholder: e.g. Ubuntu 24.04
    validations:
      required: true
  - type: textarea
    id: summary
    attributes:
      label: Description
      description: A clear and concise description of your issue.
    validations:
      required: true
  - type: textarea
    id: compose
    attributes:
      label: Docker compose
      description: The compose file (or otherwise the `docker run` command used).
      render: yaml
    validations:
      required: true
  - type: textarea
    id: log
    attributes:
      label: Docker log
      description: The logfile of the container (as shown by `docker logs dsm`).
      render: shell
    validations:
      required: true
  - type: textarea
    id: screenshot
    attributes:
      label: Screenshots (optional)
      description: Screenshots that might help to make the problem more clear.
    validations:
      required: false
--- a/.github/ISSUE_TEMPLATE/2-feature.yml
+++ b/.github/ISSUE_TEMPLATE/2-feature.yml
@ -1,37 +0,0 @@
 name: "\U0001F680 Feature request"
 description: Suggest an idea for improving the container
 title: "[Feature]: "
 labels: ["enhancement"]
 body:
  - type: textarea
    id: problem
    attributes:
      label: Is your proposal related to a problem?
      description: |
        Provide a clear and concise description of what the problem is.
        For example, "I'm always frustrated when..."
    validations:
      required: true
  - type: textarea
    id: solution
    attributes:
      label: Describe the solution you'd like.
      description: |
        Provide a clear and concise description of what you want to happen.
    validations:
      required: true
  - type: textarea
    id: alternatives
    attributes:
      label: Describe alternatives you've considered.
      description: |
        Let us know about other solutions you've tried or researched.
    validations:
      required: true
  - type: textarea
    id: context
    attributes:
      label: Additional context
      description: |
        Is there anything else you can add about the proposal?
        You might want to link to related issues here, if you haven't already.
--- a/.github/ISSUE_TEMPLATE/3-bug.yml
+++ b/.github/ISSUE_TEMPLATE/3-bug.yml
@ -1,43 +0,0 @@
 name: "\U0001F41E Bug report"
 description: Create a report to help us improve the container
 title: "[Bug]: "
 labels: ["bug"]
 body:
  - type: input
    id: os
    attributes:
      label: Operating system
      description: Your Linux distribution (can be shown by `lsb_release -a`).
      placeholder: e.g. Ubuntu 24.04
    validations:
      required: true
  - type: textarea
    id: summary
    attributes:
      label: Description
      description: Describe the expected behaviour, the actual behaviour, and the steps to reproduce.
    validations:
      required: true
  - type: textarea
    id: compose
    attributes:
      label: Docker compose
      description: The compose file (or otherwise the `docker run` command used).
      render: yaml
    validations:
      required: true
  - type: textarea
    id: log
    attributes:
      label: Docker log
      description: The logfile of the container (as shown by `docker logs dsm`).
      render: shell
    validations:
      required: true
  - type: textarea
    id: screenshot
    attributes:
      label: Screenshots (optional)
      description: Screenshots that might help to make the problem more clear.
    validations:
      required: false
--- a/.github/ISSUE_TEMPLATE/4-question.yml
+++ b/.github/ISSUE_TEMPLATE/4-question.yml
@ -1,26 +0,0 @@
 name: "\U00002753 General question"
 description: Questions about the container not related to an issue
 title: "[Question]: "
 labels: ["question"]
 body:
  - type: checkboxes
    attributes:
      label: Is your question not already answered in the FAQ?
      description: Please read the [FAQ](https://github.com/vdsm/virtual-dsm/blob/master/readme.md) carefully to avoid asking duplicate questions.
      options:
      - label: I made sure the question is not listed in the [FAQ](https://github.com/vdsm/virtual-dsm/blob/master/readme.md).
        required: true
  - type: checkboxes
    attributes:
      label: Is this a general question and not a technical issue?
      description: For questions related to issues you must use the [technical issue](https://github.com/vdsm/virtual-dsm/issues/new?assignees=&labels=&projects=&template=1-issue.yml) form instead. It contains all the right fields (system info, logfiles, etc.) we need in order to be able to help you.
      options:
      - label: I am sure my question is not about a technical issue.
        required: true
  - type: textarea
    id: question
    attributes:
      label: Question
      description: What's the question you have about the container?
    validations:
      required: true
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@ -1 +0,0 @@
 blank_issues_enabled: false
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@ -8,10 +8,6 @@ on:
    paths-ignore:
      - '**/*.md'
      - '**/*.yml'
      - '**/*.js'
      - '**/*.css'
      - '**/*.html'
      - 'web/**'
      - '.gitignore'
      - '.dockerignore'
      - '.github/**'
@ -54,7 +50,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,12 +69,12 @@ jobs:
          password: ${{ secrets.GITHUB_TOKEN }}
      -
        name: Build Docker image
-        uses: docker/build-push-action@v6
+        uses: docker/build-push-action@v5
        with:
          context: .
          push: true
          provenance: false
-          platforms: linux/amd64,linux/arm64
+          platforms: linux/amd64,linux/arm64,linux/arm
          tags: ${{ steps.meta.outputs.tags }}
          labels: ${{ steps.meta.outputs.labels }}
          annotations: ${{ steps.meta.outputs.annotations }}
@ -103,15 +99,3 @@ jobs:
          url: ${{ secrets.GITLAB_URL }}
          token: ${{ secrets.GITLAB_TOKEN }}
          username: ${{ secrets.GITLAB_USERNAME }}
      -
        name: Send mail
        uses: action-pack/send-mail@v1
        with:
          to: ${{secrets.MAILTO}}
          from: Github Actions <${{secrets.MAILTO}}>
          connection_url: ${{secrets.MAIL_CONNECTION}}
          subject: Build of ${{ github.event.repository.name }} v${{ steps.meta.outputs.version }} completed
          body: |
              The build job of ${{ github.event.repository.name }} v${{ steps.meta.outputs.version }} was completed successfully! 
              See https://github.com/${{ github.repository }}/actions for more information.
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@ -7,18 +7,8 @@ jobs:
    name: shellcheck
    runs-on: ubuntu-latest
    steps:
-      - 
+      - uses: actions/checkout@v4
-        name: Checkout
+      - name: Run ShellCheck
        uses: actions/checkout@v4
      -
        name: Run ShellCheck
        uses: ludeeus/action-shellcheck@master
-        env:
+env:
-          SHELLCHECK_OPTS: -x --source-path=src -e SC2001 -e SC2034 -e SC2064 -e SC2317 -e SC2153 -e SC2028
+        SHELLCHECK_OPTS: -x --source-path=src -e SC2001 -e SC2034 -e SC2064 -e SC2317 -e SC2153 -e SC2028
      - 
        name: Lint Dockerfile
        uses: hadolint/hadolint-action@v3.1.0
        with:
          dockerfile: Dockerfile
          ignore: DL3008,DL3003,DL3006,DL3013
          failure-threshold: warning
--- a/.github/workflows/hub.yml
+++ b/.github/workflows/hub.yml
@ -15,7 +15,7 @@ jobs:
    - uses: actions/checkout@v4
    - 
      name: Docker Hub Description
-      uses: peter-evans/dockerhub-description@v4
+      uses: peter-evans/dockerhub-description@v3
      with:
        username: ${{ secrets.DOCKERHUB_USERNAME }}
        password: ${{ secrets.DOCKERHUB_TOKEN }}
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@ -3,7 +3,6 @@ on:
  pull_request:
    paths:
      - '**/*.sh'
      - 'Dockerfile'
      - '.github/workflows/test.yml'
      - '.github/workflows/check.yml'
--- a/57
+++ b/57
@ -1,4 +1,4 @@
-FROM qemux/qemu-host:2.05 AS builder
+FROM qemux/qemu-host as builder
 #  FROM golang as builder
 #  WORKDIR /
@ -10,26 +10,22 @@ FROM qemux/qemu-host:2.05 AS builder
 FROM debian:trixie-slim
 ARG TARGETPLATFORM
-ARG VERSION_ARG="0.0"
+ARG DEBCONF_NOWARNINGS "yes"
-ARG DEBCONF_NOWARNINGS="yes"
+ARG DEBIAN_FRONTEND "noninteractive"
-ARG DEBIAN_FRONTEND="noninteractive"
+ARG DEBCONF_NONINTERACTIVE_SEEN "true"
 ARG DEBCONF_NONINTERACTIVE_SEEN="true"
-RUN set -eu && \
+RUN if [ "$TARGETPLATFORM" != "linux/amd64" ]; then extra="qemu-user"; fi \
-    apt-get update && \
+    && apt-get update \
-    apt-get --no-install-recommends -y install \
+    && apt-get --no-install-recommends -y install \
        jq \
        tini \
        curl \
        cpio \
        wget \
        fdisk \
        unzip \
        nginx \
        procps \
        python3 \
        python3-pip \
        python3-msgpack \
        python3-pysodium \
        xz-utils \
        iptables \
        iproute2 \
@ -37,33 +33,32 @@ RUN set -eu && \
        dnsmasq \
        fakeroot \
        net-tools \
        e2fsprogs \
        qemu-utils \
        iputils-ping \
        ca-certificates \
        netcat-openbsd \
-        qemu-system-x86 && \
+        qemu-system-x86 \
-    apt-get clean && \
+        "$extra" \
-    pip3 install --no-cache-dir --break-system-packages --root-user-action=ignore dissect.cstruct && \
+    && apt-get clean \
-    mkdir -p /etc/qemu && \
+    && unlink /etc/nginx/sites-enabled/default \
-    echo "allow br0" > /etc/qemu/bridge.conf && \
+    && sed -i 's/^worker_processes.*/worker_processes 1;/' /etc/nginx/nginx.conf \
-    unlink /etc/nginx/sites-enabled/default && \
+    && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
    sed -i 's/^worker_processes.*/worker_processes 1;/' /etc/nginx/nginx.conf && \
    echo "$VERSION_ARG" > /run/version && \
    rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
-COPY --chmod=755 ./src /run/
+COPY ./src /run/
-COPY --chmod=755 ./web /var/www/
+COPY ./web /var/www/
-COPY --chmod=755 --from=builder /qemu-host.bin /run/host.bin
+COPY --from=builder /qemu-host.bin /run/host.bin
-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
+RUN chmod +x /run/*.sh && chmod +x /run/*.bin
 RUN mv /var/www/nginx.conf /etc/nginx/sites-enabled/web.conf 
 VOLUME /storage
 EXPOSE 22 139 445 5000
-ENV RAM_SIZE="2G"
+ENV RAM_SIZE "1G"
-ENV CPU_CORES="2"
+ENV DISK_SIZE "16G"
-ENV DISK_SIZE="16G"
+ENV CPU_CORES "1"
 ARG VERSION_ARG "0.0"
 RUN echo "$VERSION_ARG" > /run/version
 HEALTHCHECK --interval=60s --start-period=45s --retries=2 CMD /run/check.sh
--- a/compose.yml
+++ b/compose.yml
@ -1,17 +0,0 @@
 services:
  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/docker-compose.yml
+++ b/docker-compose.yml
@ -0,0 +1,21 @@
 version: "3"
 services:
    dsm:
        container_name: dsm
        image: vdsm/virtual-dsm:latest
        environment:
            DISK_SIZE: "16G"
            RAM_SIZE: "1G"
            CPU_CORES: "1"
        devices:
            - /dev/kvm
        device_cgroup_rules:
            - 'c *:* rwm'
        cap_add:
            - NET_ADMIN
        ports:
            - 5000:5000
        volumes:
            - /var/dsm:/storage
        restart: on-failure
        stop_grace_period: 2m
--- a/kubernetes.yml
+++ b/kubernetes.yml
@ -1,77 +0,0 @@
 ---
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
  name: dsm-pvc
 spec:
  accessModes:
  - ReadWriteOnce
  resources:
    requests:
      storage: 16Gi
 ---
 apiVersion: apps/v1
 kind: Deployment
 metadata:
  name: dsm
  labels:
    name: dsm
 spec:
  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"
        ports:
          - containerPort: 5000
            name: http
            protocol: TCP
        securityContext:
          capabilities:
            add:
            - NET_ADMIN
          privileged: true
        volumeMounts:
        - mountPath: /storage
          name: storage
        - mountPath: /dev/kvm
          name: dev-kvm
        - mountPath: /dev/net/tun
          name: dev-tun
      terminationGracePeriodSeconds: 120
      volumes:
      - name: storage
        persistentVolumeClaim:
          claimName: dsm-pvc
      - hostPath:
          path: /dev/kvm
        name: dev-kvm
      - hostPath:
          path: /dev/net/tun
          type: CharDevice
        name: dev-tun
 ---
 apiVersion: v1
 kind: Service
 metadata:
  name: dsm
 spec:
  internalTrafficPolicy: Cluster
  ports:
    - name: http
      port: 5000
      protocol: TCP
      targetPort: 5000
  selector:
    app: dsm
  type: ClusterIP
--- a/readme.md
+++ b/readme.md
@ -1,30 +1,31 @@
 <h1 align="center">Virtual DSM<br />
 <div align="center">
-<a href="https://github.com/vdsm/virtual-dsm"><img src="https://github.com/vdsm/virtual-dsm/raw/master/.github/screen.jpg" title="Screenshot" style="max-width:100%;" width="432" /></a>
+<img src="https://github.com/vdsm/virtual-dsm/raw/master/.github/screen.jpg" title="Screenshot" style="max-width:100%;" width="432" />
 </div>
 <div align="center">
 [![Build]][build_url]
 [![Version]][tag_url]
 [![Size]][tag_url]
 [![Package]][pkg_url]
 [![Pulls]][hub_url]
 </div></h1>
-Virtual DSM in a Docker container.
+Virtual DSM in a docker container.
-## Features ✨
+## Features
 - Multiple disks
 - KVM acceleration
 - GPU pass-through
 - Upgrades supported
-## Usage  🐳
+## Usage
-##### Via Docker Compose:
+Via `docker-compose.yml`
 ```yaml
 version: "3"
 services:
  dsm:
    container_name: dsm
@ -33,264 +34,218 @@ services:
      DISK_SIZE: "16G"
    devices:
      - /dev/kvm
      - /dev/net/tun
    cap_add:
      - NET_ADMIN
    ports:
      - 5000:5000
    volumes:
-      - ./dsm:/storage
+      - /var/dsm:/storage
-    restart: always
+    restart: on-failure
    stop_grace_period: 2m
 ```
-##### Via Docker CLI:
+Via `docker run`
 ```bash
-docker run -it --rm --name dsm -p 5000:5000 --device=/dev/kvm --device=/dev/net/tun --cap-add NET_ADMIN -v "${PWD:-.}/dsm:/storage" --stop-timeout 120 vdsm/virtual-dsm
+docker run -it --rm -p 5000:5000 --device=/dev/kvm --cap-add NET_ADMIN --stop-timeout 120 vdsm/virtual-dsm
 ```
-##### Via Kubernetes:
+## FAQ
-```shell
+  * ### How do I use it?
 kubectl apply -f https://raw.githubusercontent.com/vdsm/virtual-dsm/refs/heads/master/kubernetes.yml
 ```
-##### Via Github Codespaces:
+    Very simple! These are the steps:
    - Start the container and get some coffee.
-[![Open in GitHub Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/vdsm/virtual-dsm)
+    - Connect to [port 5000](http://localhost:5000) of the container in your web browser.
-## FAQ 💬
+    - Wait until DSM is ready, choose an username and password, and you will be taken to the desktop.
-### How do I use it?
+    - Enjoy your brand new machine, and don't forget to star this repo!
-  Very simple! These are the steps:
+  * ### How do I change the size of the disk?
  - Start the container and connect to [port 5000](http://127.0.0.1:5000/) using your web browser.
-  - Wait until DSM finishes its installation
+    To expand the default size of 16 GB, locate the `DISK_SIZE` setting in your compose file and modify it to your preferred capacity:
  - Choose an username and password, and you will be taken to the desktop.
  Enjoy your brand new NAS, and don't forget to star this repo!
-### How do I change the storage location?
+    ```yaml
    environment:
      DISK_SIZE: "128G"
    ```
    This can also be used to resize the existing disk to a larger capacity without any data loss. 
-  To change the storage location, include the following bind mount in your compose file:
+  * ### How do I change the storage location?
-  ```yaml
+    To change the storage location, include the following bind mount in your compose file:
  volumes:
    - ./dsm:/storage
  ```
-  Replace the example path `./dsm` with the desired storage folder or named volume.
+    ```yaml
- 
+    volumes:
-### How do I change the size of the disk?
+      - /var/dsm:/storage
    ```
-  To expand the default size of 16 GB, locate the `DISK_SIZE` setting in your compose file and modify it to your preferred capacity:
+    Replace the example path `/var/dsm` with the desired storage folder.
-  ```yaml
+  * ### How do I create a growable disk?
  environment:
    DISK_SIZE: "128G"
  ```
 > [!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?
+    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:
-  To create a growable disk that only allocates space that is actually used, add the following environment variable:
+    ```yaml
    environment:
      DISK_FMT: "qcow2"
    ```
-  ```yaml
+    Please note that this may reduce the write performance of the disk.
  environment:
    DISK_FMT: "qcow2"
  ```
-### How do I add multiple disks?
+  * ### How do I add multiple disks?
-  To create additional disks, modify your compose file like this:
+    To create additional disks, modify your compose file like this:
-  
+    
-  ```yaml
+    ```yaml
-  environment:
+    environment:
-    DISK2_SIZE: "32G"
+      DISK2_SIZE: "32G"
-    DISK3_SIZE: "64G"
+      DISK3_SIZE: "64G"
-  volumes:
+    volumes:
-    - ./example2:/storage2
+      - /home/example:/storage2
-    - ./example3:/storage3
+      - /mnt/data/example:/storage3
-  ```
+    ```
-### How do I pass-through a disk?
+  * ### How do I pass-through a disk?
-   It is possible to pass-through disk devices or partitions directly by adding them to your compose file in this way:
+     It is possible to pass-through disk devices directly by adding them to your compose file in this way:
-  ```yaml
+    ```yaml
-  devices:
+    environment:
-    - /dev/sdb:/disk1
+      DEVICE2: "/dev/sda"
-    - /dev/sdc1:/disk2
+      DEVICE3: "/dev/sdb"
-  ```
+    devices:
      - /dev/sda
      - /dev/sdb
    ```
-  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?
-  If you want to adjust this, you can specify the desired amount using the following environment variables:
+    By default, a single CPU core and 1 GB of RAM are allocated to the container.
-  ```yaml
+    To increase this, add the following environment variables:
  environment:
    RAM_SIZE: "4G"
    CPU_CORES: "4"
  ```
-### How do I verify if my system supports KVM?
+    ```yaml
    environment:
      RAM_SIZE: "4G"
      CPU_CORES: "4"
    ```
-  First check if your software is compatible using this chart:
+  * ### How do I verify if my system supports KVM?
-  | **Product**  | **Linux** | **Win11** | **Win10** | **macOS** |
+    To verify if your system supports KVM, run the following commands:
  |---|---|---|---|---|
  | 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
    ```
-  ```bash
+    If you receive an error from `kvm-ok` indicating that KVM acceleration can't be used, check the virtualization settings in the BIOS.
  sudo apt install cpu-checker
  sudo kvm-ok
  ```
-  If you receive an error from `kvm-ok` indicating that KVM cannot be used, please check whether:
+  * ### 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.
+    By default, the container uses bridge networking, which shares the IP address with the host. 
-  - you enabled "nested virtualization" if you are running the container inside a virtual machine.
+    If you want to assign an individual IP address to the container, you can create a macvlan network as follows:
-  - you are not using a cloud provider, as most of them do not allow nested virtualization for their VPS's.
+    ```bash
    docker network create -d macvlan \
        --subnet=192.168.0.0/24 \
        --gateway=192.168.0.1 \
        --ip-range=192.168.0.100/28 \
        -o parent=eth0 vdsm
    ```
    Be sure to modify these values to match your local subnet. 
-  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.
+    Once you have created the network, change your compose file to look as follows:
-### How do I assign an individual IP address to the container?
+    ```yaml
    services:
      dsm:
        container_name: dsm
        ..<snip>..
        networks:
          vdsm:
            ipv4_address: 192.168.0.100
-  By default, the container uses bridge networking, which shares the IP address with the host. 
+    networks:
      vdsm:
        external: true
    ```
    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.
-  If you want to assign an individual IP address to the container, you can create a macvlan network as follows:
+    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.
-  ```bash
+  * ### How can DSM acquire an IP address from my router?
  docker network create -d macvlan \
      --subnet=192.168.0.0/24 \
      --gateway=192.168.0.1 \
      --ip-range=192.168.0.100/28 \
      -o parent=eth0 vdsm
  ```
  Be sure to modify these values to match your local subnet. 
-  Once you have created the network, change your compose file to look as follows:
+    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.
-  ```yaml
+    To enable this feature, add the following lines to your compose file:
  services:
    dsm:
      container_name: dsm
      ..<snip>..
      networks:
        vdsm:
          ipv4_address: 192.168.0.100
-  networks:
+    ```yaml
-    vdsm:
+    environment:
-      external: true
+      DHCP: "Y"
-  ```
+    device_cgroup_rules:
- 
+      - 'c *:* rwm'
-  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.
+    ```
-> [!IMPORTANT]
+    Please note that even if you don't want DHCP, it's still recommended to enable this feature, as it prevents NAT issues and increases performance by using a `macvtap` interface. In that case, just set a static IP from the DSM control panel after you enabled this mode.
 > 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 do I pass-through the GPU?
-  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 pass-through your Intel GPU, 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:
      GPU: "Y"
    devices:
      - /dev/dri
    ```
-  ```yaml
+    This can be used to enable the facial recognition function in Synology Photos for example.
  environment:
    DHCP: "Y"
  devices:
    - /dev/vhost-net
  device_cgroup_rules:
    - 'c *:* rwm'
  ```
-### How do I pass-through the GPU?
+  * ### How do I install a specific version of vDSM?
-  To pass-through your Intel GPU, add the following lines to your compose file:
+    By default, version 7.2 will be installed, but if you prefer an older version, you can add its download URL to your compose file as follows:
-  ```yaml
+    ```yaml
-  environment:
+    environment:
-    GPU: "Y"
+      URL: "https://global.synologydownload.com/download/DSM/release/7.0.1/42218/DSM_VirtualDSM_42218.pat"
-  devices:
+    ```
    - /dev/dri
  ```
-> [!NOTE]
+    With this method, it is even possible to switch between different versions while keeping all your file data intact.
 > 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?
+  * ### What are the differences compared to the standard DSM?
-  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:
+    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?
-  ```yaml
+    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. 
-  environment:
+    
-    URL: "https://global.synologydownload.com/download/DSM/release/7.0.1/42218/DSM_VirtualDSM_42218.pat"
+    However, by installing Synology's Virtual DSM, you must accept their end-user license agreement, which does not permit installation on non-Synology hardware. So only run this project on an official Synology NAS, as any other use will be a violation of their terms and conditions.
  ```
-  With this method, it is even possible to switch back and forth between versions while keeping your file data intact.
+## Disclaimer
-  Alternatively, you can also skip the download and use a local file instead, by binding it in your compose file in this way:
+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.
  ```yaml
  volumes:
    - ./DSM_VirtualDSM_42218.pat:/boot.pat
  ```
  Replace the example path `./DSM_VirtualDSM_42218.pat` with the filename of your desired `.pat` file. The value of `URL` will be ignored in this case.
 ### What are the differences compared to the standard DSM?
  There are only two minor differences: the Virtual Machine Manager package is not available, and Surveillance Station will not include any free licenses.
 ### How do I run Windows in a container?
  You can use [dockur/windows](https://github.com/dockur/windows) for that. It shares many of the same features, and even has completely automatic installation.
 ### How do I run a Linux desktop in a container?
  You can use [qemus/qemu](https://github.com/qemus/qemu) in that case.
 ### Is this project legal?
  Yes, this project contains only open-source code and does not distribute any copyrighted material. Neither does it try to circumvent any copyright protection measures. So under all applicable laws, this project will be considered legal. 
  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](https://starchart.cc/vdsm/virtual-dsm.svg?variant=adaptive)](https://starchart.cc/vdsm/virtual-dsm)
 ## Disclaimer ⚖️
 *Only run this container on Synology hardware, any other use is not permitted by their EULA. The product names, logos, brands, and other trademarks referred to within this project are the property of their respective trademark holders. This project is not affiliated, sponsored, or endorsed by Synology, Inc.*
 [build_url]: https://github.com/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
+[Pulls]: https://img.shields.io/docker/pulls/kroese/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
@ -1,16 +1,13 @@
 #!/usr/bin/env bash
 set -Eeuo pipefail
 : "${NETWORK:="Y"}"
 [ -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
+[ ! -f "/run/shm/qemu.pid" ] && echo "QEMU is not running yet.." && exit 0
 [[ "$NETWORK" == [Nn]* ]] && echo "Networking is disabled.." && exit 0
 file="/run/shm/dsm.url"
 address="/run/shm/qemu.ip"
-[ ! -s  "$file" ] && echo "DSM has not enabled networking yet.." && exit 1
+[ ! -f  "$file" ] && echo "DSM has not enabled networking yet.." && exit 1
 location=$(<"$file")
--- a/src/config.sh
+++ b/src/config.sh
@ -2,42 +2,14 @@
 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')
+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,smm=off,usb=off,vmport=off,dump-guest-core=off,hpet=off${KVM_OPTS}"
+MAC_OPTS="-machine type=q35,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+=" -object rng-random,id=objrng0,filename=/dev/urandom"
+DEV_OPTS="$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"
+DEV_OPTS="$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 ' ')
 # Check available memory as the very last step
 if [[ "$RAM_CHECK" != [Nn]* ]]; then
  RAM_AVAIL=$(free -b | grep -m 1 Mem: | awk '{print $7}')
  AVAIL_MEM=$(formatBytes "$RAM_AVAIL")
  if (( (RAM_WANTED + RAM_SPARE) > RAM_AVAIL )); then
    msg="Your configured RAM_SIZE of ${RAM_SIZE/G/ GB} is too high for the $AVAIL_MEM of memory available, please set a lower value."
    [[ "${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\n\n" "${ARGS// -/$'\n-'}"
 fi
 return 0
--- a/src/disk.sh
+++ b/src/disk.sh
@ -3,9 +3,8 @@ set -Eeuo pipefail
 # Docker environment variables
-: "${DISK_IO:="native"}"          # I/O Mode, can be set to 'native', 'threads' or 'io_uring'
+: "${DISK_IO:="native"}"          # I/O Mode, can be set to 'native', 'threads' or 'io_turing'
 : "${DISK_FMT:="raw"}"            # Disk file format, 'raw' by default for best performance
 : "${DISK_TYPE:=""}"              # Device type to be used, "sata", "nvme", "blk" or "scsi"
 : "${DISK_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.
@ -14,8 +13,17 @@ set -Eeuo pipefail
 BOOT="$STORAGE/$BASE.boot.img"
 SYSTEM="$STORAGE/$BASE.system.img"
-[ ! -s "$BOOT" ] && error "Virtual DSM boot-image does not exist ($BOOT)" && exit 81
+[ ! -f "$BOOT" ] && error "Virtual DSM boot-image does not exist ($BOOT)" && exit 81
-[ ! -s "$SYSTEM" ] && error "Virtual DSM system-image does not exist ($SYSTEM)" && exit 82
+[ ! -f "$SYSTEM" ] && error "Virtual DSM system-image does not exist ($SYSTEM)" && exit 82
 DISK_OPTS="\
    -object iothread,id=io2 \
    -device virtio-scsi-pci,id=hw-synoboot,iothread=io2,bus=pcie.0,addr=0xa \
    -drive file=$BOOT,if=none,id=drive-synoboot,format=raw,cache=$DISK_CACHE,aio=$DISK_IO,discard=$DISK_DISCARD,detect-zeroes=on \
    -device scsi-hd,bus=hw-synoboot.0,channel=0,scsi-id=0,lun=0,drive=drive-synoboot,id=synoboot0,rotation_rate=$DISK_ROTATION,bootindex=1 \
    -device virtio-scsi-pci,id=hw-synosys,iothread=io2,bus=pcie.0,addr=0xb \
    -drive file=$SYSTEM,if=none,id=drive-synosys,format=raw,cache=$DISK_CACHE,aio=$DISK_IO,discard=$DISK_DISCARD,detect-zeroes=on \
    -device scsi-hd,bus=hw-synosys.0,channel=0,scsi-id=0,lun=0,drive=drive-synosys,id=synosys0,rotation_rate=$DISK_ROTATION,bootindex=2"
 fmt2ext() {
  local DISK_FMT=$1
@ -72,31 +80,20 @@ getSize() {
 isCow() {
  local FS=$1
-  if [[ "${FS,,}" == "btrfs" ]]; then
+  if [[ "${FS,,}" == "xfs" || "${FS,,}" == "zfs" || "${FS,,}" == "btrfs" || "${FS,,}" == "bcachefs" ]]; then
    return 0
  fi
  return 1
 }
 supportsDirect() {
  local FS=$1
  if [[ "${FS,,}" == "ecryptfs" ]] || [[ "${FS,,}" == "tmpfs" ]]; then
    return 1
  fi
  return 0
 }
 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 GB FA
+  local DATA_SIZE DIR SPACE FA
  DATA_SIZE=$(numfmt --from=iec "$DISK_SPACE")
@ -109,16 +106,16 @@ createDisk() {
    SPACE=$(df --output=avail -B 1 "$DIR" | tail -n 1)
    if (( DATA_SIZE > SPACE )); then
-      GB=$(formatBytes "$SPACE")
+      local SPACE_GB=$(( (SPACE + 1073741823)/1073741824 ))
-      error "Not enough free space to create a $DISK_DESC of ${DISK_SPACE/G/ GB} in $DIR, it has only $GB available..."
+      error "Not enough free space to create a $DISK_DESC of $DISK_SPACE in $DIR, it has only $SPACE_GB GB available..."
      error "Please specify a smaller ${DISK_DESC^^}_SIZE or disable preallocation by setting ALLOCATE=N." && exit 76
    fi
  fi
  html "Creating a $DISK_DESC image..."
-  info "Creating a ${DISK_SPACE/G/ GB} $DISK_STYLE $DISK_DESC image in $DISK_FMT format..."
+  info "Creating a $DISK_TYPE $DISK_DESC image in $DISK_FMT format with a size of $DISK_SPACE..."
-  local FAIL="Could not create a $DISK_STYLE $DISK_FMT $DISK_DESC image of ${DISK_SPACE/G/ GB} ($DISK_FILE)"
+  local FAIL="Could not create a $DISK_TYPE $DISK_FMT $DISK_DESC image of $DISK_SPACE ($DISK_FILE)"
  case "${DISK_FMT,,}" in
    raw)
@ -141,12 +138,10 @@ createDisk() {
      else
        # Create an empty file
-        if ! fallocate -l "$DATA_SIZE" "$DISK_FILE" &>/dev/null; then
+        if ! fallocate -l "$DATA_SIZE" "$DISK_FILE"; then
-          if ! fallocate -l -x "$DATA_SIZE" "$DISK_FILE"; then
+          if ! truncate -s "$DATA_SIZE" "$DISK_FILE"; then
-            if ! truncate -s "$DATA_SIZE" "$DISK_FILE"; then
+            rm -f "$DISK_FILE"
-              rm -f "$DISK_FILE"
+            error "$FAIL" && exit 77
              error "$FAIL" && exit 77
            fi
          fi
        fi
@ -155,8 +150,8 @@ createDisk() {
    qcow2)
      local DISK_PARAM="$DISK_ALLOC"
-      isCow "$FS" && DISK_PARAM+=",nocow=on"
+      isCow "$FS" && DISK_PARAM="$DISK_PARAM,nocow=on"
-      [ -n "$DISK_FLAGS" ] && DISK_PARAM+=",$DISK_FLAGS"
+      [ -n "$DISK_FLAGS" ] && DISK_PARAM="$DISK_PARAM,$DISK_FLAGS"
      if ! qemu-img create -f "$DISK_FMT" -o "$DISK_PARAM" -- "$DISK_FILE" "$DATA_SIZE" ; then
        rm -f "$DISK_FILE"
@ -176,13 +171,12 @@ 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 GB
+  local CUR_SIZE DATA_SIZE DIR SPACE
  CUR_SIZE=$(getSize "$DISK_FILE")
  DATA_SIZE=$(numfmt --from=iec "$DISK_SPACE")
@ -196,17 +190,17 @@ resizeDisk() {
    SPACE=$(df --output=avail -B 1 "$DIR" | tail -n 1)
    if (( REQ > SPACE )); then
-      GB=$(formatBytes "$SPACE")
+      local SPACE_GB=$(( (SPACE + 1073741823)/1073741824 ))
-      error "Not enough free space to resize $DISK_DESC to ${DISK_SPACE/G/ GB} in $DIR, it has only $GB available.."
+      error "Not enough free space to resize $DISK_DESC to $DISK_SPACE in $DIR, it has only $SPACE_GB GB available.."
      error "Please specify a smaller ${DISK_DESC^^}_SIZE or disable preallocation by setting ALLOCATE=N." && exit 74
    fi
  fi
-  GB=$(formatBytes "$CUR_SIZE")
+  local GB=$(( (CUR_SIZE + 1073741823)/1073741824 ))
-  MSG="Resizing $DISK_DESC from $GB to ${DISK_SPACE/G/ GB}..."
+  MSG="Resizing $DISK_DESC from ${GB}G to $DISK_SPACE..."
  info "$MSG" && html "$MSG"
-  local FAIL="Could not resize the $DISK_STYLE $DISK_FMT $DISK_DESC image from ${GB} to ${DISK_SPACE/G/ GB} ($DISK_FILE)"
+  local FAIL="Could not resize the $DISK_TYPE $DISK_FMT $DISK_DESC image from ${GB}G to $DISK_SPACE ($DISK_FILE)"
  case "${DISK_FMT,,}" in
    raw)
@ -221,11 +215,9 @@ resizeDisk() {
      else
        # Resize file by allocating more space
-        if ! fallocate -l "$DATA_SIZE" "$DISK_FILE" &>/dev/null; then
+        if ! fallocate -l "$DATA_SIZE" "$DISK_FILE"; then
-          if ! fallocate -l -x "$DATA_SIZE" "$DISK_FILE"; then
+          if ! truncate -s "$DATA_SIZE" "$DISK_FILE"; then
-            if ! truncate -s "$DATA_SIZE" "$DISK_FILE"; then
+            error "$FAIL" && exit 75
              error "$FAIL" && exit 75
            fi
          fi
        fi
@ -244,7 +236,6 @@ resizeDisk() {
 }
 convertDisk() {
  local SOURCE_FILE=$1
  local SOURCE_FMT=$2
  local DST_FILE=$3
@ -261,7 +252,7 @@ convertDisk() {
  if [[ "$ALLOCATE" != [Nn]* ]]; then
-    local DIR CUR_SIZE SPACE GB
+    local DIR CUR_SIZE SPACE
    # Check free diskspace
    DIR=$(dirname "$TMP_FILE")
@ -269,43 +260,40 @@ convertDisk() {
    SPACE=$(df --output=avail -B 1 "$DIR" | tail -n 1)
    if (( CUR_SIZE > SPACE )); then
-      GB=$(formatBytes "$SPACE")
+      local SPACE_GB=$(( (SPACE + 1073741823)/1073741824 ))
-      error "Not enough free space to convert $DISK_DESC to $DST_FMT in $DIR, it has only $GB available..."
+      error "Not enough free space to convert $DISK_DESC to $DST_FMT in $DIR, it has only $SPACE_GB GB available..."
      error "Please free up some disk space or disable preallocation by setting ALLOCATE=N." && exit 76
    fi
  fi
-  local msg="Converting $DISK_DESC to $DST_FMT"
+  html "Converting $DISK_DESC to $DST_FMT..."
-  html "$msg..."
+  info "Converting $DISK_DESC to $DST_FMT, please wait until completed..."
  info "$msg, please wait until completed..."
  local CONV_FLAGS="-p"
  local DISK_PARAM="$DISK_ALLOC"
-  isCow "$FS" && DISK_PARAM+=",nocow=on"
+  isCow "$FS" && DISK_PARAM="$DISK_PARAM,nocow=on"
  if [[ "$DST_FMT" != "raw" ]]; then
-    if [[ "$ALLOCATE" == [Nn]* ]]; then
+      if [[ "$ALLOCATE" == [Nn]* ]]; then
-      CONV_FLAGS+=" -c"
+        CONV_FLAGS="$CONV_FLAGS -c"
-    fi
+      fi
-    [ -n "$DISK_FLAGS" ] && DISK_PARAM+=",$DISK_FLAGS"
+      [ -n "$DISK_FLAGS" ] && DISK_PARAM="$DISK_PARAM,$DISK_FLAGS"
  fi
  # shellcheck disable=SC2086
  if ! qemu-img convert -f "$SOURCE_FMT" $CONV_FLAGS -o "$DISK_PARAM" -O "$DST_FMT" -- "$SOURCE_FILE" "$TMP_FILE"; then
    rm -f "$TMP_FILE"
-    error "Failed to convert $DISK_STYLE $DISK_DESC image to $DST_FMT format in $DIR, is there enough space available?" && exit 79
+    error "Failed to convert $DISK_TYPE $DISK_DESC image to $DST_FMT format in $DIR, is there enough space available?" && exit 79
  fi
  if [[ "$DST_FMT" == "raw" ]]; then
-    if [[ "$ALLOCATE" != [Nn]* ]]; then
+      if [[ "$ALLOCATE" != [Nn]* ]]; then
-      # Work around qemu-img bug
+        # Work around qemu-img bug
-      CUR_SIZE=$(stat -c%s "$TMP_FILE")
+        CUR_SIZE=$(stat -c%s "$TMP_FILE")
-      if ! fallocate -l "$CUR_SIZE" "$TMP_FILE" &>/dev/null; then
+        if ! fallocate -l "$CUR_SIZE" "$TMP_FILE"; then
-        if ! fallocate -l -x "$CUR_SIZE" "$TMP_FILE"; then
+            error "Failed to allocate $CUR_SIZE bytes for $DISK_DESC image $TMP_FILE"
          error "Failed to allocate $CUR_SIZE bytes for $DISK_DESC image $TMP_FILE"
        fi
      fi
    fi
  fi
  rm -f "$SOURCE_FILE"
@ -318,15 +306,13 @@ convertDisk() {
    fi
  fi
-  msg="Conversion of $DISK_DESC"
+  html "Conversion of $DISK_DESC completed..."
-  html "$msg completed..."
+  info "Conversion of $DISK_DESC to $DST_FMT completed succesfully!"
  info "$msg to $DST_FMT completed successfully!"
  return 0
 }
 checkFS () {
  local FS=$1
  local DISK_FILE=$2
  local DISK_DESC=$3
@ -343,10 +329,6 @@ checkFS () {
    info "Warning: the filesystem of $DIR is FUSE, this extra layer will negatively affect performance!"
  fi
  if ! supportsDirect "$FS"; then
    info "Warning: the filesystem of $DIR is $FS, which does not support O_DIRECT mode, adjusting settings..."
  fi
  if isCow "$FS"; then
    if [ -f "$DISK_FILE" ]; then
      FA=$(lsattr "$DISK_FILE")
@ -359,180 +341,94 @@ checkFS () {
  return 0
 }
 createDevice () {
  local DISK_FILE=$1
  local DISK_TYPE=$2
  local DISK_INDEX=$3
  local DISK_ADDRESS=$4
  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,format=$DISK_FMT,cache=$DISK_CACHE,aio=$DISK_IO,discard=$DISK_DISCARD,detect-zeroes=on"
  case "${DISK_TYPE,,}" in
    "none" ) ;;
    "auto" )
      echo "$result"
      ;;
    "usb" )
      result+=",if=none \
      -device usb-storage,drive=${DISK_ID}${index}${DISK_SERIAL}${DISK_SECTORS}"
      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+=",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+=",if=none \
      -device virtio-scsi-pci,id=${DISK_ID}b,bus=pcie.0,addr=$DISK_ADDRESS,iothread=io2 \
      -device scsi-hd,drive=${DISK_ID},bus=${DISK_ID}b.0,channel=0,scsi-id=0,lun=0,rotation_rate=$DISK_ROTATION${index}${DISK_SERIAL}${DISK_SECTORS}"
      echo "$result"
      ;;
  esac
  return 0
 }
 addDisk () {
-
+  local DISK_ID=$1
-  local DISK_BASE=$1
+  local DISK_BASE=$2
-  local DISK_TYPE=$2
+  local DISK_EXT=$3
-  local DISK_DESC=$3
+  local DISK_DESC=$4
-  local DISK_SPACE=$4
+  local DISK_SPACE=$5
-  local DISK_INDEX=$5
+  local DISK_INDEX=$6
-  local DISK_ADDRESS=$6
+  local DISK_ADDRESS=$7
-  local DISK_FMT=$7
+  local DISK_FMT=$8
  local DISK_IO=$8
  local DISK_CACHE=$9
  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"
  local DIR DATA_SIZE FS PREV_FMT PREV_EXT CUR_SIZE
  DIR=$(dirname "$DISK_FILE")
  [ ! -d "$DIR" ] && return 0
-  SPACE="${DISK_SPACE// /}"
+  [ -z "$DISK_SPACE" ] && DISK_SPACE="16G"
-  [ -z "$SPACE" ] && SPACE="16G"
+  DISK_SPACE=$(echo "${DISK_SPACE^^}" | sed 's/MB/M/g;s/GB/G/g;s/TB/T/g')
-  [ -z "${SPACE//[0-9. ]}" ] && SPACE="${SPACE}G"
+  DATA_SIZE=$(numfmt --from=iec "$DISK_SPACE")
  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
-    error "Please increase ${DISK_DESC^^}_SIZE to at least 6 GB." && exit 73
+    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
  fi
  FS=$(stat -f -c %T "$DIR")
  checkFS "$FS" "$DISK_FILE" "$DISK_DESC" || exit $?
-  if ! supportsDirect "$FS"; then
+  if ! [ -f "$DISK_FILE" ] ; then
    DISK_IO="threads"
    DISK_CACHE="writeback"
  fi
  if ! [ -s "$DISK_FILE" ] ; then
    if [[ "${DISK_FMT,,}" != "raw" ]]; then
      PREV_FMT="raw"
    else
      PREV_FMT="qcow2"
    fi
    PREV_EXT=$(fmt2ext "$PREV_FMT")
-    if [ -s "$DISK_BASE.$PREV_EXT" ] ; then
+    if [ -f "$DISK_BASE.$PREV_EXT" ] ; then
      convertDisk "$DISK_BASE.$PREV_EXT" "$PREV_FMT" "$DISK_FILE" "$DISK_FMT" "$DISK_BASE" "$DISK_DESC" "$FS" || exit $?
    fi
  fi
-  if [ -s "$DISK_FILE" ]; then
+  if [ -f "$DISK_FILE" ]; then
    CUR_SIZE=$(getSize "$DISK_FILE")
    if (( DATA_SIZE > CUR_SIZE )); then
-      resizeDisk "$DISK_FILE" "$SPACE" "$DISK_DESC" "$DISK_FMT" "$FS" || exit $?
+      resizeDisk "$DISK_FILE" "$DISK_SPACE" "$DISK_DESC" "$DISK_FMT" "$FS" || exit $?
    fi
  else
-    createDisk "$DISK_FILE" "$SPACE" "$DISK_DESC" "$DISK_FMT" "$FS" || exit $?
+    createDisk "$DISK_FILE" "$DISK_SPACE" "$DISK_DESC" "$DISK_FMT" "$FS" || exit $?
  fi
-  DISK_OPTS+=$(createDevice "$DISK_FILE" "$DISK_TYPE" "$DISK_INDEX" "$DISK_ADDRESS" "$DISK_FMT" "$DISK_IO" "$DISK_CACHE" "" "")
+  DISK_OPTS="$DISK_OPTS \
    -device virtio-scsi-pci,id=hw-$DISK_ID,iothread=io2,bus=pcie.0,addr=$DISK_ADDRESS \
    -drive file=$DISK_FILE,if=none,id=drive-$DISK_ID,format=$DISK_FMT,cache=$DISK_CACHE,aio=$DISK_IO,discard=$DISK_DISCARD,detect-zeroes=on \
    -device scsi-hd,bus=hw-$DISK_ID.0,channel=0,scsi-id=0,lun=0,drive=drive-$DISK_ID,id=$DISK_ID,rotation_rate=$DISK_ROTATION,bootindex=$DISK_INDEX"
  return 0
 }
 addDevice () {
-  local DISK_DEV=$1
+  local DISK_ID=$1
-  local DISK_TYPE=$2
+  local DISK_DEV=$2
-  local DISK_INDEX=$3
+  local DISK_DESC=$3
-  local DISK_ADDRESS=$4
+  local DISK_INDEX=$4
  local DISK_ADDRESS=$5
  [ -z "$DISK_DEV" ] && return 0
  [ ! -b "$DISK_DEV" ] && error "Device $DISK_DEV cannot be found! Please add it to the 'devices' section of your compose file." && exit 55
-  local sectors=""
+  DISK_OPTS="$DISK_OPTS \
-  local result logical physical
+    -device virtio-scsi-pci,id=hw-$DISK_ID,iothread=io2,bus=pcie.0,addr=$DISK_ADDRESS \
-  result=$(fdisk -l "$DISK_DEV" | grep -m 1 -o "(logical/physical): .*" | cut -c 21-)
+    -drive file=$DISK_DEV,if=none,id=drive-$DISK_ID,format=raw,cache=$DISK_CACHE,aio=$DISK_IO,discard=$DISK_DISCARD,detect-zeroes=on \
-  logical="${result%% *}"
+    -device scsi-hd,bus=hw-$DISK_ID.0,channel=0,scsi-id=0,lun=0,drive=drive-$DISK_ID,id=$DISK_ID,rotation_rate=$DISK_ROTATION,bootindex=$DISK_INDEX"
  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=""
+DISK_EXT=$(fmt2ext "$DISK_FMT")
 [ -z "${DISK_TYPE:-}" ] && DISK_TYPE="scsi"
 [ -z "${DISK_NAME:-}" ] && DISK_NAME="data"
 case "${DISK_TYPE,,}" in
  "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
  if [[ "${DISK_FMT,,}" == "raw" ]]; then
@ -543,23 +439,20 @@ if [ -z "$ALLOCATE" ]; then
 fi
 if [[ "$ALLOCATE" == [Nn]* ]]; then
-  DISK_STYLE="growable"
+  DISK_TYPE="growable"
  DISK_ALLOC="preallocation=off"
 else
-  DISK_STYLE="preallocated"
+  DISK_TYPE="preallocated"
  DISK_ALLOC="preallocation=falloc"
 fi
-DISK_OPTS+=$(createDevice "$BOOT" "$DISK_TYPE" "1" "0xa" "raw" "$DISK_IO" "$DISK_CACHE" "" "")
+DISK1_FILE="$STORAGE/data"
 DISK_OPTS+=$(createDevice "$SYSTEM" "$DISK_TYPE" "2" "0xb" "raw" "$DISK_IO" "$DISK_CACHE" "" "")
 DISK1_FILE="$STORAGE/${DISK_NAME}"
 if [[ ! -f "$DISK1_FILE.img" ]] && [[ -f "$STORAGE/data${DISK_SIZE}.img" ]]; then
  # Fallback for legacy installs
  mv "$STORAGE/data${DISK_SIZE}.img" "$DISK1_FILE.img"
 fi
-DISK2_FILE="/storage2/${DISK_NAME}2"
+DISK2_FILE="/storage2/data2"
 if [ ! -f "$DISK2_FILE.img" ]; then
  # Fallback for legacy installs
  FALLBACK="/storage2/data.img"
@ -572,7 +465,7 @@ if [ ! -f "$DISK2_FILE.img" ]; then
  fi
 fi
-DISK3_FILE="/storage3/${DISK_NAME}3"
+DISK3_FILE="/storage3/data3"
 if [ ! -f "$DISK3_FILE.img" ]; then
  # Fallback for legacy installs
  FALLBACK="/storage3/data.img"
@ -585,7 +478,7 @@ if [ ! -f "$DISK3_FILE.img" ]; then
  fi
 fi
-DISK4_FILE="/storage4/${DISK_NAME}4"
+DISK4_FILE="/storage4/data4"
 : "${DISK2_SIZE:=""}"
 : "${DISK3_SIZE:=""}"
@ -596,42 +489,29 @@ DISK4_FILE="/storage4/${DISK_NAME}4"
 : "${DEVICE3:=""}"
 : "${DEVICE4:=""}"
 [ -z "$DEVICE" ] && [ -b "/disk" ] && DEVICE="/disk"
 [ -z "$DEVICE" ] && [ -b "/disk1" ] && DEVICE="/disk1"
 [ -z "$DEVICE2" ] && [ -b "/disk2" ] && DEVICE2="/disk2"
 [ -z "$DEVICE3" ] && [ -b "/disk3" ] && DEVICE3="/disk3"
 [ -z "$DEVICE4" ] && [ -b "/disk4" ] && DEVICE4="/disk4"
 [ -z "$DEVICE" ] && [ -b "/dev/disk1" ] && DEVICE="/dev/disk1"
 [ -z "$DEVICE2" ] && [ -b "/dev/disk2" ] && DEVICE2="/dev/disk2"
 [ -z "$DEVICE3" ] && [ -b "/dev/disk3" ] && DEVICE3="/dev/disk3"
 [ -z "$DEVICE4" ] && [ -b "/dev/disk4" ] && DEVICE4="/dev/disk4"
 if [ -n "$DEVICE" ]; then
-  addDevice "$DEVICE" "$DISK_TYPE" "3" "0xc" || exit $?
+  addDevice "userdata" "$DEVICE" "device" "3" "0xc" || exit $?
 else
-  addDisk "$DISK1_FILE" "$DISK_TYPE" "disk" "$DISK_SIZE" "3" "0xc" "$DISK_FMT" "$DISK_IO" "$DISK_CACHE" || exit $?
+  addDisk "userdata" "$DISK1_FILE" "$DISK_EXT" "disk" "$DISK_SIZE" "3" "0xc" "$DISK_FMT" || exit $?
 fi
 if [ -n "$DEVICE2" ]; then
-  addDevice "$DEVICE2" "$DISK_TYPE" "4" "0xd" || exit $?
+  addDevice "userdata2" "$DEVICE2" "device2" "4" "0xd" || exit $?
 else
-  addDisk "$DISK2_FILE" "$DISK_TYPE" "disk2" "$DISK2_SIZE" "4" "0xd" "$DISK_FMT" "$DISK_IO" "$DISK_CACHE" || exit $?
+  addDisk "userdata2" "$DISK2_FILE" "$DISK_EXT" "disk2" "$DISK2_SIZE" "4" "0xd" "$DISK_FMT" || exit $?
 fi
 if [ -n "$DEVICE3" ]; then
-  addDevice "$DEVICE3" "$DISK_TYPE" "5" "0xe" || exit $?
+  addDevice "userdata3" "$DEVICE3" "device3" "5" "0xe" || exit $?
 else
-  addDisk "$DISK3_FILE" "$DISK_TYPE" "disk3" "$DISK3_SIZE" "5" "0xe" "$DISK_FMT" "$DISK_IO" "$DISK_CACHE" || exit $?
+  addDisk "userdata3" "$DISK3_FILE" "$DISK_EXT" "disk3" "$DISK3_SIZE" "5" "0xe" "$DISK_FMT" || exit $?
 fi
 if [ -n "$DEVICE4" ]; then
-  addDevice "$DEVICE4" "$DISK_TYPE" "6" "0xf" || exit $?
+  addDevice "userdata4" "$DEVICE4" "device4" "6" "0xf" || exit $?
 else
-  addDisk "$DISK4_FILE" "$DISK_TYPE" "disk4" "$DISK4_SIZE" "6" "0xf" "$DISK_FMT" "$DISK_IO" "$DISK_CACHE" || exit $?
+  addDisk "userdata4" "$DISK4_FILE" "$DISK_EXT" "disk4" "$DISK4_SIZE" "6" "0xf" "$DISK_FMT" || exit $?
 fi
 DISK_OPTS+=" -object iothread,id=io2"
 html "Initialized disks successfully..."
 return 0
--- a/src/display.sh
+++ b/src/display.sh
@ -6,11 +6,8 @@ set -Eeuo pipefail
 : "${GPU:="N"}"         # GPU passthrough
 : "${VGA:="virtio"}"    # VGA adaptor
 : "${DISPLAY:="none"}"  # Display type
 : "${RENDERNODE:="/dev/dri/renderD128"}"  # Render node
-CPU_VENDOR=$(lscpu | awk '/Vendor ID/{print $3}')
+if [[ "$GPU" != [Yy1]* ]] || [[ "$ARCH" != "amd64" ]]; then
 if [[ "$GPU" != [Yy1]* ]] || [[ "$CPU_VENDOR" != "GenuineIntel" ]] || [[ "$ARCH" != "amd64" ]]; then
  [[ "${DISPLAY,,}" == "none" ]] && VGA="none"
  DISPLAY_OPTS="-display $DISPLAY -vga $VGA"
@ -18,24 +15,19 @@ if [[ "$GPU" != [Yy1]* ]] || [[ "$CPU_VENDOR" != "GenuineIntel" ]] || [[ "$ARCH"
 fi
-DISPLAY_OPTS="-display egl-headless,rendernode=$RENDERNODE"
+DISPLAY_OPTS="-display egl-headless,rendernode=/dev/dri/renderD128 -vga $VGA"
 DISPLAY_OPTS+=" -vga $VGA"
 [ ! -d /dev/dri ] && mkdir -m 755 /dev/dri
-# Extract the card number from the render node
+if [ ! -c /dev/dri/card0 ]; then
-CARD_NUMBER=$(echo "$RENDERNODE" | grep -oP '(?<=renderD)\d+')
+  if mknod /dev/dri/card0 c 226 0; then
-CARD_DEVICE="/dev/dri/card$((CARD_NUMBER - 128))"
+    chmod 666 /dev/dri/card0
 if [ ! -c "$CARD_DEVICE" ]; then
  if mknod "$CARD_DEVICE" c 226 $((CARD_NUMBER - 128)); then
    chmod 666 "$CARD_DEVICE"
  fi
 fi
-if [ ! -c "$RENDERNODE" ]; then
+if [ ! -c /dev/dri/renderD128 ]; then
-  if mknod "$RENDERNODE" c 226 "$CARD_NUMBER"; then
+  if mknod /dev/dri/renderD128 c 226 128; then
-    chmod 666 "$RENDERNODE"
+    chmod 666 /dev/dri/renderD128
  fi
 fi
--- a/src/entry.sh
+++ b/src/entry.sh
@ -1,12 +1,11 @@
 #!/usr/bin/env bash
 set -Eeuo pipefail
-: "${APP:="Virtual DSM"}"
+APP="Virtual DSM"
-: "${SUPPORT:="https://github.com/vdsm/virtual-dsm"}"
+SUPPORT="https://github.com/vdsm/virtual-dsm"
 cd /run
 . utils.sh      # Load functions
 . reset.sh      # Initialize system
 . install.sh    # Run installation
 . disk.sh       # Initialize disks
@ -19,8 +18,8 @@ cd /run
 trap - ERR
-version=$(qemu-system-x86_64 --version | head -n 1 | cut -d '(' -f 1 | awk '{ print $NF }')
+info "Booting $APP using $VERS..."
-info "Booting $APP using QEMU v$version..."
+[[ "$DEBUG" == [Yy1]* ]] && echo "Arguments: $ARGS" && echo
 if [[ "$CONSOLE" == [Yy]* ]]; then
  exec qemu-system-x86_64 ${ARGS:+ $ARGS}
@ -33,5 +32,4 @@ terminal
 tail -fn +0 "$QEMU_LOG" 2>/dev/null &
 cat "$QEMU_TERM" 2>/dev/null & wait $! || :
-sleep 1 & wait $!
+sleep 1 && finish 0
 [ ! -f "$QEMU_END" ] && finish 0
--- a/src/install.sh
+++ b/src/install.sh
@ -5,42 +5,21 @@ set -Eeuo pipefail
 if [ -f "$STORAGE/dsm.ver" ]; then
  BASE=$(<"$STORAGE/dsm.ver")
  BASE="${BASE//[![:print:]]/}"
  [ -z "$BASE" ] && BASE="DSM_VirtualDSM_69057"
 else
  # Fallback for old installs
  BASE="DSM_VirtualDSM_42962"
 fi
-FN="boot.pat"
+if [ -n "$URL" ]; then
 DIR=$(find / -maxdepth 1 -type d -iname "$FN" -print -quit)
 [ ! -d "$DIR" ] && DIR=$(find "$STORAGE" -maxdepth 1 -type d -iname "$FN" -print -quit)
 if [ -d "$DIR" ]; then
  BASE="DSM_VirtualDSM" && URL="file://$DIR" 
  if [[ ! -s "$STORAGE/$BASE.boot.img" ]] || [[ ! -s "$STORAGE/$BASE.system.img" ]]; then
    error "The bind $DIR maps to a file that does not exist!" && exit 65
  fi
 fi
 FILE=$(find / -maxdepth 1 -type f -iname "$FN" -print -quit)
 [ ! -s "$FILE" ] && FILE=$(find "$STORAGE" -maxdepth 1 -type f -iname "$FN" -print -quit)
 [ -s "$FILE" ] && BASE="DSM_VirtualDSM" && URL="file://$FILE" 
 if [ -n "$URL" ] && [ ! -s "$FILE" ] && [ ! -d "$DIR" ]; then
  BASE=$(basename "$URL" .pat)
-  if [ ! -s "$STORAGE/$BASE.system.img" ]; then
+  if [ ! -f "$STORAGE/$BASE.system.img" ]; then
    BASE=$(basename "${URL%%\?*}" .pat)
    : "${BASE//+/ }"; printf -v BASE '%b' "${_//%/\\x}"
    BASE=$(echo "$BASE" | sed -e 's/[^A-Za-z0-9._-]/_/g')
  fi
  if [[ "${URL,,}" != "http"* ]] && [[ "${URL,,}" != "file:"* ]] ; then
    [ ! -s "$STORAGE/$BASE.pat" ] && error "Invalid URL:  $URL" && exit 65
    URL="file://$STORAGE/$BASE.pat"
  fi
 fi
-if [[ -s "$STORAGE/$BASE.boot.img" ]] && [[ -s "$STORAGE/$BASE.system.img" ]]; then
+if [[ -f "$STORAGE/$BASE.boot.img" ]] && [[ -f "$STORAGE/$BASE.system.img" ]]; then
  return 0  # Previous installation found
 fi
@ -59,15 +38,11 @@ if [ -z "$DL" ]; then
  [[ "${COUNTRY^^}" == "CN" ]] && DL="$DL_CHINA" || DL="$DL_GLOBAL"
 fi
-if [ -z "$URL" ]; then
+[ -z "$URL" ] && URL="$DL/release/7.2.1/69057-1/DSM_VirtualDSM_69057.pat"
  URL="$DL/release/7.2.2/72806/DSM_VirtualDSM_72806.pat"
 fi
-if [ ! -s "$FILE" ]; then
+BASE=$(basename "${URL%%\?*}" .pat)
-  BASE=$(basename "${URL%%\?*}" .pat)
+: "${BASE//+/ }"; printf -v BASE '%b' "${_//%/\\x}"
-  : "${BASE//+/ }"; printf -v BASE '%b' "${_//%/\\x}"
+BASE=$(echo "$BASE" | sed -e 's/[^A-Za-z0-9._-]/_/g')
  BASE=$(echo "$BASE" | sed -e 's/[^A-Za-z0-9._-]/_/g')
 fi
 if [[ "$URL" != "file://$STORAGE/$BASE.pat" ]]; then
  rm -f "$STORAGE/$BASE.pat"
@ -77,6 +52,8 @@ rm -f "$STORAGE/$BASE.agent"
 rm -f "$STORAGE/$BASE.boot.img"
 rm -f "$STORAGE/$BASE.system.img"
 [[ "$DEBUG" == [Yy1]* ]] && set -x
 # Check filesystem
 FS=$(stat -f -c %T "$STORAGE")
@ -88,23 +65,15 @@ if [[ "${FS,,}" == "fuse"* ]]; then
  info "Warning: the filesystem of $STORAGE is FUSE, this extra layer will negatively affect performance!"
 fi
-if [[ "${FS,,}" == "ecryptfs" ]] || [[ "${FS,,}" == "tmpfs" ]]; then
+if [[ "${FS,,}" != "fat"* && "${FS,,}" != "vfat"* && "${FS,,}" != "exfat"* && "${FS,,}" != "ntfs"* && "${FS,,}" != "msdos"* ]]; then
  info "Warning: the filesystem of $STORAGE is $FS, which does not support O_DIRECT mode, adjusting settings..."
 fi
 if [[ "${FS,,}" == "fat"* || "${FS,,}" == "vfat"* || "${FS,,}" == "msdos"* ]]; then
  error "Unable to install on $FS filesystems, please use a different filesystem for /storage." && exit 61
 fi
 if [[ "${FS,,}" != "exfat"* && "${FS,,}" != "ntfs"* && "${FS,,}" != "unknown"* ]]; then
  TMP="$STORAGE/tmp"
 else
  TMP="/tmp/dsm"
  TMP_SPACE=2147483648
  SPACE=$(df --output=avail -B 1 /tmp | tail -n 1)
-  SPACE_MB=$(formatBytes "$SPACE")
+  SPACE_MB=$(( (SPACE + 1048575)/1048576 ))
  if (( TMP_SPACE > SPACE )); then
-    error "Not enough free space inside the container, have $SPACE_MB available but need at least 2 GB." && exit 93
+    error "Not enough free space inside the container, have $SPACE_MB MB available but need at least 2 GB." && exit 93
  fi
 fi
@ -113,13 +82,13 @@ rm -rf "$TMP" && mkdir -p "$TMP"
 # Check free diskspace
 ROOT_SPACE=536870912
 SPACE=$(df --output=avail -B 1 / | tail -n 1)
-SPACE_MB=$(formatBytes "$SPACE" "down")
+SPACE_MB=$(( (SPACE + 1048575)/1048576 ))
-(( ROOT_SPACE > SPACE )) && error "Not enough free space inside the container, have $SPACE_MB available but need at least 500 MB." && exit 96
+(( ROOT_SPACE > SPACE )) && error "Not enough free space inside the container, have $SPACE_MB MB available but need at least 500 MB." && exit 96
-MIN_SPACE=15032385536
+MIN_SPACE=8589934592
 SPACE=$(df --output=avail -B 1 "$STORAGE" | tail -n 1)
-SPACE_GB=$(formatBytes "$SPACE")
+SPACE_GB=$(( (SPACE + 1073741823)/1073741824 ))
-(( MIN_SPACE > SPACE )) && error "Not enough free space for installation in $STORAGE, have $SPACE_GB available but need at least 14 GB." && exit 94
+(( MIN_SPACE > SPACE )) && error "Not enough free space for installation in $STORAGE, have $SPACE_GB GB available but need at least 8 GB." && exit 94
 # Check if output is to interactive TTY
 if [ -t 1 ]; then
@ -128,50 +97,101 @@ else
  PROGRESS="--progress=dot:giga"
 fi
-if [[ "$URL" == "file://"* ]]; then
+# Download the required files from the Synology website
-  MSG="Copying DSM"
+
-  ERR="Failed to copy ${URL:7}"
+ROOT="Y"
-  info "Install: Copying installation image..."
+RDC="$STORAGE/dsm.rd"
-else
+
-  MSG="Downloading DSM"
+if [ ! -f "$RDC" ]; then
-  ERR="Failed to download $URL"
+
-  info "Install: Downloading $BASE.pat..."
+  MSG="Downloading installer..."
  info "Install: $MSG" && html "$MSG"
  RD="$TMP/rd.gz"
  POS="65627648-71021835"
  VERIFY="b4215a4b213ff5154db0488f92c87864"
  LOC="$DL/release/7.0.1/42218/DSM_VirtualDSM_42218.pat"
  { curl -r "$POS" -sfk -S -o "$RD" "$LOC"; rc=$?; } || :
  (( rc != 0 )) && error "Failed to download $LOC, reason: $rc" && exit 60
  SUM=$(md5sum "$RD" | cut -f 1 -d " ")
  if [ "$SUM" != "$VERIFY" ]; then
    PAT="/install.pat"
    rm "$RD"
    rm -f "$PAT"
    { wget "$LOC" -O "$PAT" -q --no-check-certificate --show-progress "$PROGRESS"; rc=$?; } || :
    (( rc != 0 )) && error "Failed to download $LOC, reason: $rc" && exit 60
    tar --extract --file="$PAT" --directory="$(dirname "$RD")"/. "$(basename "$RD")"
    rm "$PAT"
  fi
  cp "$RD" "$RDC"
 fi
-html "$MSG..."
+if [ -f "$RDC" ]; then
  { xz -dc <"$RDC" >"$TMP/rd" 2>/dev/null; rc=$?; } || :
  (( rc != 1 )) && error "Failed to unxz $RDC, reason $rc" && exit 91
  { (cd "$TMP" && cpio -idm <"$TMP/rd" 2>/dev/null); rc=$?; } || :
  if (( rc != 0 )); then
    ROOT="N"
    { (cd "$TMP" && fakeroot cpio -idmu <"$TMP/rd" 2>/dev/null); rc=$?; } || :
    (( rc != 0 )) && error "Failed to extract $RDC, 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..."
 html "Install: Downloading DSM from Synology..."
 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
+  { wget "$URL" -O "$PAT" -q --no-check-certificate --show-progress "$PROGRESS"; rc=$?; } || :
-  [[ "${URL,,}" == *"_72806.pat" ]] && SIZE=361010261
+  (( rc != 0 )) && error "Failed to download $URL, reason: $rc" && exit 69
  [[ "${URL,,}" == *"_69057.pat" ]] && SIZE=363837333
  [[ "${URL,,}" == *"_42218.pat" ]] && SIZE=379637760
  /run/progress.sh "$PAT" "$SIZE" "$MSG ([P])..." &
  { wget "$URL" -O "$PAT" -q --no-check-certificate --timeout=10 --no-http-keep-alive --show-progress "$PROGRESS"; rc=$?; } || :
  fKill "progress.sh"
  (( 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 "$ERR" && exit 69
+[ ! -f "$PAT" ] && error "Failed to download $URL" && exit 69
 SIZE=$(stat -c%s "$PAT")
@ -179,7 +199,7 @@ if ((SIZE<250000000)); then
  error "The specified PAT file is probably an update pack as it's too small." && exit 62
 fi
-MSG="Extracting installation image..."
+MSG="Extracting downloaded image..."
 info "Install: $MSG" && html "$MSG"
 if { tar tf "$PAT"; } >/dev/null 2>&1; then
@ -188,20 +208,27 @@ if { tar tf "$PAT"; } >/dev/null 2>&1; then
 else
-  { (cd "$TMP" && python3 /run/extract.py -i "$PAT" -d 2>/run/extract.log); rc=$?; } || :
+  export LD_LIBRARY_PATH="/run/extract"
-  if (( rc != 0 )); then
+  if [ "$ARCH" == "amd64" ]; then
-    cat /run/extract.log
+    { /run/extract/syno_extract_system_patch "$PAT" "$TMP/."; rc=$?; } || :
-    error "Failed to extract PAT file, reason $rc" && exit 63
+  else
    { qemu-x86_64 /run/extract/syno_extract_system_patch "$PAT" "$TMP/."; rc=$?; } || :
  fi
  export LD_LIBRARY_PATH=""
  (( rc != 0 )) && error "Failed to extract PAT file, reason $rc" && exit 63
 fi
 rm -rf /run/extract
 MSG="Preparing system partition..."
 info "Install: $MSG" && html "$MSG"
 BOOT=$(find "$TMP" -name "*.bin.zip")
-[ ! -s "$BOOT" ] && error "The PAT file contains no boot image." && exit 67
+[ ! -f "$BOOT" ] && error "The PAT file contains no boot image." && exit 67
 BOOT=$(echo "$BOOT" | head -c -5)
 unzip -q -o "$BOOT".zip -d "$TMP"
@ -210,32 +237,30 @@ SYSTEM="$STORAGE/$BASE.system.img"
 rm -f "$SYSTEM"
 # Check free diskspace
-SYSTEM_SIZE=10738466816
+SYSTEM_SIZE=4954537983
 SPACE=$(df --output=avail -B 1 "$STORAGE" | tail -n 1)
-SPACE_MB=$(formatBytes "$SPACE")
+SPACE_MB=$(( (SPACE + 1048575)/1048576 ))
 if (( SYSTEM_SIZE > SPACE )); then
-  error "Not enough free space in $STORAGE to create a 10 GB system disk, have only $SPACE_MB available." && exit 97
+  error "Not enough free space in $STORAGE to create a 5 GB system disk, have only $SPACE_MB MB available." && exit 97
 fi
 if ! touch "$SYSTEM"; then
  error "Could not create file $SYSTEM for the system disk." && exit 98
 fi
-if [[ "${FS,,}" == "btrfs" ]]; then
+if [[ "${FS,,}" == "xfs" || "${FS,,}" == "zfs" || "${FS,,}" == "btrfs" || "${FS,,}" == "bcachefs" ]]; then
  { chattr +C "$SYSTEM"; } || :
  FA=$(lsattr "$SYSTEM")
  if [[ "$FA" != *"C"* ]]; then
-    error "Failed to disable COW for system image $SYSTEM on ${FS^^} filesystem."
+    error "Failed to disable COW for system image $SYSTEM on ${FS^^} filesystem (returned $FA)"
  fi
 fi
-if ! fallocate -l "$SYSTEM_SIZE" "$SYSTEM" &>/dev/null; then
+if ! fallocate -l "$SYSTEM_SIZE" "$SYSTEM"; then
-  if ! fallocate -l -x "$SYSTEM_SIZE" "$SYSTEM"; then
+  if ! truncate -s "$SYSTEM_SIZE" "$SYSTEM"; then
-    if ! truncate -s "$SYSTEM_SIZE" "$SYSTEM"; then
+    rm -f "$SYSTEM"
-      rm -f "$SYSTEM"
+    error "Could not allocate file $SYSTEM for the system disk." && exit 98
      error "Could not allocate file $SYSTEM for the system disk." && exit 98
    fi
  fi
 fi
@ -247,8 +272,8 @@ PART="$TMP/partition.fdisk"
        echo "unit: sectors"
        echo "sector-size: 512"
        echo ""
-        echo "${SYSTEM}1 : start=        2048, size=    16777216, type=83"
+        echo "${SYSTEM}1 : start=        2048, size=     4980480, type=83"
-        echo "${SYSTEM}2 : start=    16779264, size=     4194304, type=82"
+        echo "${SYSTEM}2 : start=     4982528, size=     4194304, type=82"
 } > "$PART"
 sfdisk -q "$SYSTEM" < "$PART"
@ -264,28 +289,41 @@ IDB="$TMP/indexdb"
 PKG="$TMP/packages"
 HDP="$TMP/synohdpack_img"
-[ ! -s "$HDA.tgz" ] && error "The PAT file contains no OS image." && exit 64
+[ ! -f "$HDA.tgz" ] && error "The PAT file contains no OS image." && exit 64
 mv "$HDA.tgz" "$HDA.txz"
 [ -d "$PKG" ] && mv "$PKG/" "$MOUNT/.SynoUpgradePackages/"
 rm -f "$MOUNT/.SynoUpgradePackages/ActiveInsight-"*
-if [ -s "$IDB.txz" ]; then
+[ -f "$HDP.txz" ] && tar xpfJ "$HDP.txz" --absolute-names -C "$MOUNT/"
-  INDEX_DB="$MOUNT/usr/syno/synoman/indexdb"
+
 if [ -f "$IDB.txz" ]; then
  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
+OFFSET="1048576" # 2048 * 512
-NUMBLOCKS="2097152" # (16777216 * 512) / 4096
+NUMBLOCKS="622560" # (4980480 * 512) / 4096
 MSG="Installing system partition..."
-fakeroot -- bash -c "set -Eeu;\
+if [[ "$ROOT" != [Nn]* ]]; then
-  [ -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/"
-  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';\
+  info "Install: $MSG" && html "$MSG"
-  mke2fs -q -t ext4 -b 4096 -d $MOUNT/ -L $LABEL -F -E offset=$OFFSET $SYSTEM $NUMBLOCKS"
+
  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
 rm -rf "$MOUNT"
 echo "$BASE" > "$STORAGE/dsm.ver"
@ -299,7 +337,8 @@ fi
 mv -f "$BOOT" "$STORAGE/$BASE.boot.img"
 rm -rf "$TMP"
-html "Booting DSM instance..."
+{ set +x; } 2>/dev/null
-sleep 1.2
+[[ "$DEBUG" == [Yy1]* ]] && echo
 html "Installation finished successfully..."
 return 0
--- a/src/network.sh
+++ b/src/network.sh
@ -3,18 +3,12 @@ set -Eeuo pipefail
 # Docker environment variables
 : "${MAC:=""}"
 : "${MTU:=""}"
 : "${DHCP:="N"}"
-: "${NETWORK:="Y"}"
+: "${MAC:="02:11:32:AA:BB:CC"}"
 : "${USER_PORTS:=""}"
 : "${HOST_PORTS:=""}"
 : "${ADAPTER:="virtio-net-pci"}"
 : "${VM_NET_DEV:=""}"
 : "${VM_NET_TAP:="dsm"}"
 : "${VM_NET_MAC:="$MAC"}"
 : "${VM_NET_IP:="20.20.20.21"}"
 : "${VM_NET_HOST:="VirtualDSM"}"
 : "${DNSMASQ_OPTS:=""}"
@ -29,44 +23,17 @@ ADD_ERR="Please add the following setting to your container:"
 configureDHCP() {
  # Create the necessary file structure for /dev/vhost-net
  if [ ! -c /dev/vhost-net ]; then
    if mknod /dev/vhost-net c 10 238; then
      chmod 660 /dev/vhost-net
    fi
  fi
  # Create a macvtap network for the VM guest
  { msg=$(ip link add link "$VM_NET_DEV" name "$VM_NET_TAP" address "$VM_NET_MAC" type macvtap mode bridge 2>&1); rc=$?; } || :
-  case "$msg" in
+  { ip link add link "$VM_NET_DEV" name "$VM_NET_TAP" address "$VM_NET_MAC" type macvtap mode bridge ; rc=$?; } || :
    "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 (( rc != 0 )); then
-    if ! ip link set dev "$VM_NET_TAP" mtu "$MTU"; then
+    error "Cannot create macvtap interface. Please make sure the network type is 'macvlan' and not 'ipvlan',"
-      warn "Failed to set MTU size.."
+    error "and that the NET_ADMIN capability has been added to the container: --cap-add NET_ADMIN" && exit 16
    fi
  fi
  while ! ip link set "$VM_NET_TAP" up; do
-    info "Waiting for MAC address $VM_NET_MAC to become available..."
+    info "Waiting for address to become available..."
    sleep 2
  done
@ -76,25 +43,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" && return 1
+  (( MAJOR < 1)) && error "Cannot find: sys/devices/virtual/net/$VM_NET_TAP" && exit 18
  [[ ! -e "$TAP_PATH" ]] && [[ -e "/dev0/${TAP_PATH##*/}" ]] && ln -s "/dev0/${TAP_PATH##*/}" "$TAP_PATH"
  if [[ ! -e "$TAP_PATH" ]]; then
    { mknod "$TAP_PATH" c "$MAJOR" "$MINOR" ; rc=$?; } || :
-    (( rc != 0 )) && error "Cannot mknod: $TAP_PATH ($rc)" && return 1
+    (( rc != 0 )) && error "Cannot mknod: $TAP_PATH ($rc)" && exit 20
  fi
  { exec 30>>"$TAP_PATH"; rc=$?; } 2>/dev/null || :
  if (( rc != 0 )); then
-    error "Cannot create TAP interface ($rc). $ADD_ERR --device-cgroup-rule='c *:* rwm'" && return 1
+    error "Cannot create TAP interface ($rc). $ADD_ERR --device-cgroup-rule='c *:* rwm'" && exit 21
  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" && return 1
+    error "VHOST can not be found ($rc). $ADD_ERR --device=/dev/vhost-net" && exit 22
  fi
  NET_OPTS="-netdev tap,id=hostnet0,vhost=on,vhostfd=40,fd=30"
@ -104,99 +71,29 @@ 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+=" --dhcp-option=option:netmask,255.255.255.0"
+  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:router,${VM_NET_IP%.*}.1"
  DNSMASQ_OPTS+=" --dhcp-option=option:dns-server,${VM_NET_IP%.*}.1"
  # Add DNS entry for container
  DNSMASQ_OPTS+=" --address=/host.lan/${VM_NET_IP%.*}.1"
  DNSMASQ_OPTS=$(echo "$DNSMASQ_OPTS" | sed 's/\t/ /g' | tr -s ' ' | sed 's/^ *//')
-  if [[ "${DEBUG_DNS:-}" == [Yy1]* ]]; then
+  [[ "$DEBUG" == [Yy1]* ]] && set -x
-   DNSMASQ_OPTS+=" -d"
+  $DNSMASQ ${DNSMASQ_OPTS:+ $DNSMASQ_OPTS}
-   $DNSMASQ ${DNSMASQ_OPTS:+ $DNSMASQ_OPTS} &
+  { set +x; } 2>/dev/null
-   return 0
+  [[ "$DEBUG" == [Yy1]* ]] && echo
  fi
  if ! $DNSMASQ ${DNSMASQ_OPTS:+ $DNSMASQ_OPTS}; then
    error "Failed to start dnsmasq, reason: $?" && return 1
  fi
  return 0
 }
 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
  [ -z "$list" ] && echo "" && return 0
  if [[ "$list" != *","* ]]; then
    echo " ! --dport $list"
  else
    echo " -m multiport ! --dports $list"
  fi
  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
@ -204,237 +101,126 @@ configureNAT() {
  fi
  if [ ! -c /dev/net/tun ]; then
-    error "$tuntap" && return 1
+    error "TUN device missing. $ADD_ERR --cap-add NET_ADMIN" && exit 25
  fi
  # Check port forwarding flag
  if [[ $(< /proc/sys/net/ipv4/ip_forward) -eq 0 ]]; then
-    { sysctl -w net.ipv4.ip_forward=1 > /dev/null 2>&1; rc=$?; } || :
+    { sysctl -w net.ipv4.ip_forward=1 ; rc=$?; } || :
-    if (( rc != 0 )) || [[ $(< /proc/sys/net/ipv4/ip_forward) -eq 0 ]]; then
+    if (( rc != 0 )); then
-      [[ "$PODMAN" == [Yy1]* ]] && return 1
+      error "IP forwarding is disabled. $ADD_ERR --sysctl net.ipv4.ip_forward=1" && exit 24
      error "IP forwarding is disabled. $ADD_ERR --sysctl net.ipv4.ip_forward=1"
      return 1
    fi
  fi
  # Create a bridge with a static IP for the VM guest
  VM_NET_IP='20.20.20.21'
  [[ "$DEBUG" == [Yy1]* ]] && set -x
  { ip link add dev dockerbridge type bridge ; rc=$?; } || :
  if (( rc != 0 )); then
-    error "Failed to create bridge. $ADD_ERR --cap-add NET_ADMIN" && return 1
+    error "Failed to create bridge. $ADD_ERR --cap-add NET_ADMIN" && exit 23
  fi
-  if ! ip address add "${VM_NET_IP%.*}.1/24" broadcast "${VM_NET_IP%.*}.255" dev dockerbridge; then
+  ip address add ${VM_NET_IP%.*}.1/24 broadcast ${VM_NET_IP%.*}.255 dev dockerbridge
    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..."
+    info "Waiting for address to become available..."
    sleep 2
  done
  # QEMU Works with taps, set tap to the bridge created
-  if ! ip tuntap add dev "$VM_NET_TAP" mode tap; then
+  ip tuntap add dev "$VM_NET_TAP" mode tap
    error "$tuntap" && return 1
  fi
  if [[ "$MTU" != "0" ]] && [[ "$MTU" != "1500" ]]; then
    if ! ip link set dev "$VM_NET_TAP" mtu "$MTU"; then
      warn "Failed to set MTU size.."
    fi
  fi
  GATEWAY_MAC=$(echo "$VM_NET_MAC" | md5sum | sed 's/^\(..\)\(..\)\(..\)\(..\)\(..\).*$/02:\1:\2:\3:\4:\5/')
  if ! ip link set dev "$VM_NET_TAP" address "$GATEWAY_MAC"; then
    warn "Failed to set gateway MAC address.."
  fi
  while ! ip link set "$VM_NET_TAP" up promisc on; do
-    info "Waiting for TAP to become available..."
+    info "Waiting for tap to become available..."
    sleep 2
  done
-  if ! ip link set dev "$VM_NET_TAP" master dockerbridge; then
+  ip link set dev "$VM_NET_TAP" master dockerbridge
    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=$(getHostPorts "$HOST_PORTS")
+  iptables -t nat -A POSTROUTING -o "$VM_NET_DEV" -j MASQUERADE
-
+  iptables -t nat -A PREROUTING -i "$VM_NET_DEV" -d "$IP" -p tcp -j DNAT --to "$VM_NET_IP"
-  if ! iptables -t nat -A POSTROUTING -o "$VM_NET_DEV" -j MASQUERADE; then
+  iptables -t nat -A PREROUTING -i "$VM_NET_DEV" -d "$IP" -p udp  -j DNAT --to "$VM_NET_IP"
    error "$tables" && return 1
  fi
  # shellcheck disable=SC2086
  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
+    iptables -A POSTROUTING -t mangle -p udp --dport bootpc -j CHECKSUM --checksum-fill || true
  fi
-  NET_OPTS="-netdev tap,id=hostnet0,ifname=$VM_NET_TAP"
+  { set +x; } 2>/dev/null
  [[ "$DEBUG" == [Yy1]* ]] && echo
-  if [ -c /dev/vhost-net ]; then
+  NET_OPTS="-netdev tap,ifname=$VM_NET_TAP,script=no,downscript=no,id=hostnet0"
    { exec 40>>/dev/vhost-net; rc=$?; } 2>/dev/null || :
    (( rc == 0 )) && NET_OPTS+=",vhost=on,vhostfd=40"
  fi
-  NET_OPTS+=",script=no,downscript=no"
+  { exec 40>>/dev/vhost-net; rc=$?; } 2>/dev/null || :
  (( rc == 0 )) && NET_OPTS="$NET_OPTS,vhost=on,vhostfd=40"
-  configureDNS || return 1
+  configureDNS
  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
 }
 closeNetwork() {
  exec 30<&- || true
  exec 40<&- || true
  if [[ "$DHCP" == [Yy1]* ]]; then
    # Shutdown nginx
    nginx -s stop 2> /dev/null
    fWait "nginx"
-  fi
+    ip link set "$VM_NET_TAP" down || true
    ip link delete "$VM_NET_TAP" || true
-  [[ "$NETWORK" == [Nn]* ]] && return 0
+  else
-  exec 30<&- || true
+    local pid="/var/run/dnsmasq.pid"
-  exec 40<&- || true
+    [ -f "$pid" ] && pKill "$(<"$pid")"
-  if [[ "$DHCP" != [Yy1]* ]]; then
+    ip link set "$VM_NET_TAP" down promisc off || true
    ip link delete "$VM_NET_TAP" || true
-    closeBridge
+    ip link set dockerbridge down || true
-    return 0
+    ip link delete dockerbridge || true
  fi
  ip link set "$VM_NET_TAP" down || true
  ip link delete "$VM_NET_TAP" || true
  return 0
 }
 checkOS() {
  local kernel
  local os=""
  local if="macvlan"
  kernel=$(uname -a)
  [[ "${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
    warn "you are using $os which does not support $if, please revert to bridge networking!"
  fi
  return 0
 }
 getInfo() {
  if [ -z "$VM_NET_DEV" ]; then
    # Give Kubernetes priority over the default interface
    [ -d "/sys/class/net/net0" ] && VM_NET_DEV="net0"
    [ -d "/sys/class/net/net1" ] && VM_NET_DEV="net1"
    [ -d "/sys/class/net/net2" ] && VM_NET_DEV="net2"
    [ -d "/sys/class/net/net3" ] && VM_NET_DEV="net3"
    # Automaticly detect the default network interface
-    [ -z "$VM_NET_DEV" ] && VM_NET_DEV=$(awk '$2 == 00000000 { print $1 }' /proc/net/route)
+    VM_NET_DEV=$(awk '$2 == 00000000 { print $1 }' /proc/net/route)
    [ -z "$VM_NET_DEV" ] && VM_NET_DEV="eth0"
  fi
  if [ ! -d "/sys/class/net/$VM_NET_DEV" ]; then
    error "Network interface '$VM_NET_DEV' does not exist inside the container!"
-    error "$ADD_ERR -e \"VM_NET_DEV=NAME\" to specify another interface name." && exit 26
+    error "$ADD_ERR -e \"VM_NET_DEV=NAME\" to specify another interface name." && exit 27
  fi
  BASE_IP="${VM_NET_IP%.*}."
  if [ "${VM_NET_IP/$BASE_IP/}" -lt "3" ]; then
    error "Invalid VM_NET_IP, must end in a higher number than .3" && exit 27
  fi
  if [ -z "$MTU" ]; then
    MTU=$(cat "/sys/class/net/$VM_NET_DEV/mtu")
  fi
  if [ "$MTU" -gt "1500" ]; then
    info "MTU size is too large: $MTU, ignoring..." && MTU="0"
  fi
  if [[ "${ADAPTER,,}" != "virtio-net-pci" ]]; then
    if [[ "$MTU" != "0" ]] && [[ "$MTU" != "1500" ]]; then
      warn "MTU size is $MTU, but cannot be set for $ADAPTER adapters!" && MTU="0"
    fi
  fi
  if [ -z "$VM_NET_MAC" ]; then
    local file="$STORAGE/dsm.mac"
    [ -s "$file" ] && VM_NET_MAC=$(<"$file")
    VM_NET_MAC="${VM_NET_MAC//[![:print:]]/}"
    if [ -z "$VM_NET_MAC" ]; then
      # Generate MAC address based on Docker container ID in hostname
      VM_NET_MAC=$(echo "$HOST" | md5sum | sed 's/^\(..\)\(..\)\(..\)\(..\)\(..\).*$/02:11:32:\3:\4:\5/')
      echo "${VM_NET_MAC^^}" > "$file"
    fi
  fi
  VM_NET_MAC="${VM_NET_MAC^^}"
  VM_NET_MAC="${VM_NET_MAC//-/:}"
  if [[ ${#VM_NET_MAC} == 12 ]]; then
    m="$VM_NET_MAC"
    VM_NET_MAC="${m:0:2}:${m:2:2}:${m:4:2}:${m:6:2}:${m:8:2}:${m:10:2}"
  fi
  if [[ ${#VM_NET_MAC} != 17 ]]; then
-    error "Invalid MAC address: '$VM_NET_MAC', should be 12 or 17 digits long!" && exit 28
+    error "Invalid mac address: '$VM_NET_MAC', should be 12 or 17 digits long!" && exit 28
  fi
-  GATEWAY=$(ip route list dev "$VM_NET_DEV" | awk ' /^default/ {print $3}' | head -n 1)
+  GATEWAY=$(ip r | grep default | awk '{print $3}')
-  IP=$(ip address show dev "$VM_NET_DEV" | grep inet | awk '/inet / { print $2 }' | cut -f1 -d/ | head -n 1)
+  IP=$(ip address show dev "$VM_NET_DEV" | grep inet | awk '/inet / { print $2 }' | cut -f1 -d/)
  IP6=""
  # shellcheck disable=SC2143
  if [ -f /proc/net/if_inet6 ] && [ -n "$(ifconfig -a | grep inet6)" ]; then
    IP6=$(ip -6 addr show dev "$VM_NET_DEV" scope global up)
    [ -n "$IP6" ] && IP6=$(echo "$IP6" | sed -e's/^.*inet6 \([^ ]*\)\/.*$/\1/;t;d' | head -n 1)
  fi
  [ -f "/run/.containerenv" ] && PODMAN="Y" || PODMAN="N"
  echo "$IP" > /run/shm/qemu.ip
  return 0
@ -444,89 +230,44 @@ getInfo() {
 #  Configure Network
 # ######################################
-if [[ "$NETWORK" == [Nn]* ]]; then
+if [ ! -c /dev/vhost-net ]; then
-  NET_OPTS=""
+  if mknod /dev/vhost-net c 10 238; then
-  return 0
+    chmod 660 /dev/vhost-net
  fi
 fi
 getInfo
 html "Initializing network..."
 if [[ "$DEBUG" == [Yy1]* ]]; then
-  mtu=$(cat "/sys/class/net/$VM_NET_DEV/mtu")
+  info "Container IP is $IP with gateway $GATEWAY on interface $VM_NET_DEV" && echo
  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
 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
+  if [[ "$GATEWAY" == "172."* ]]; then
-
+    if [[ "$DEBUG" != [Yy1]* ]]; then
-  if [[ "$IP" == "172."* ]]; then
+      error "You can only enable DHCP while the container is on a macvlan network!" && exit 26
-    warn "container IP starts with 172.* which is often a sign that you are not on a macvlan network (required for DHCP)!"
+    fi
  fi
-  # Configure for macvtap interface
+  # Configuration for DHCP IP
-  configureDHCP || exit 20
+  configureDHCP
  MSG="Booting DSM instance..."
  html "$MSG"
 else
  if [[ "$IP" != "172."* ]] && [[ "$IP" != "10.8"* ]] && [[ "$IP" != "10.9"* ]]; then
    checkOS
  fi
  # Shutdown nginx
  nginx -s stop 2> /dev/null
  fWait "nginx"
-  if [[ "${NETWORK,,}" != "user"* ]]; then
+  # Configuration for static IP
-
+  configureNAT
    # 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+=" -device $ADAPTER,id=net0,netdev=hostnet0,romfile=,mac=$VM_NET_MAC"
+NET_OPTS="$NET_OPTS -device virtio-net-pci,romfile=,netdev=hostnet0,mac=$VM_NET_MAC,id=net0"
 [[ "$MTU" != "0" ]] && [[ "$MTU" != "1500" ]] && NET_OPTS+=",host_mtu=$MTU"
 return 0
--- a/src/power.sh
+++ b/src/power.sh
@ -10,11 +10,10 @@ API_HOST="127.0.0.1:2210"
 QEMU_TERM=""
 QEMU_PORT=7100
 QEMU_TIMEOUT=50
-QEMU_DIR="/run/shm"
+QEMU_PID="/run/shm/qemu.pid"
-QEMU_PID="$QEMU_DIR/qemu.pid"
+QEMU_LOG="/run/shm/qemu.log"
-QEMU_LOG="$QEMU_DIR/qemu.log"
+QEMU_OUT="/run/shm/qemu.out"
-QEMU_OUT="$QEMU_DIR/qemu.out"
+QEMU_END="/run/shm/qemu.end"
 QEMU_END="$QEMU_DIR/qemu.end"
 if [[ "$KVM" == [Nn]* ]]; then
  API_TIMEOUT=$(( API_TIMEOUT*2 ))
@ -35,9 +34,7 @@ finish() {
  local pid
  local reason=$1
-  touch "$QEMU_END"
+  if [ -f "$QEMU_PID" ]; then
  if [ -s "$QEMU_PID" ]; then
    pid=$(<"$QEMU_PID")
    echo && error "Forcefully terminating QEMU process, reason: $reason..."
@ -46,7 +43,7 @@ finish() {
    while isAlive "$pid"; do
      sleep 1
      # Workaround for zombie pid
-      [ ! -s "$QEMU_PID" ] && break
+      [ ! -f "$QEMU_PID" ] && break
    done
  fi
@ -65,7 +62,7 @@ terminal() {
  local dev=""
-  if [ -s "$QEMU_OUT" ]; then
+  if [ -f "$QEMU_OUT" ]; then
    local msg
    msg=$(<"$QEMU_OUT")
@ -114,7 +111,7 @@ _graceful_shutdown() {
  touch "$QEMU_END"
  echo && info "Received $1 signal, sending shutdown command..."
-  if [ ! -s "$QEMU_PID" ]; then
+  if [ ! -f "$QEMU_PID" ]; then
    echo && error "QEMU PID file does not exist?"
    finish "$code" && return "$code"
  fi
@ -158,7 +155,7 @@ _graceful_shutdown() {
    [[ "$DEBUG" == [Yy1]* ]] && info "Shutting down, waiting... ($cnt/$QEMU_TIMEOUT)"
    # Workaround for zombie pid
-    [ ! -s "$QEMU_PID" ] && break
+    [ ! -f "$QEMU_PID" ] && break
  done
@ -171,12 +168,11 @@ _graceful_shutdown() {
 MON_OPTS="\
        -pidfile $QEMU_PID \
        -name $PROCESS,process=$PROCESS,debug-threads=on \
        -monitor telnet:localhost:$QEMU_PORT,server,nowait,nodelay"
 if [[ "$CONSOLE" != [Yy]* ]]; then
-  MON_OPTS+=" -daemonize -D $QEMU_LOG"
+  MON_OPTS="$MON_OPTS -daemonize -D $QEMU_LOG"
  _trap _graceful_shutdown SIGTERM SIGHUP SIGINT SIGABRT SIGQUIT
--- a/src/print.sh
+++ b/src/print.sh
@ -2,9 +2,6 @@
 set -Eeuo pipefail
 : "${DHCP:="N"}"
 : "${NETWORK:="Y"}"
 [[ "$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; }
@ -21,7 +18,7 @@ resp_err="Guest returned an invalid response:"
 curl_err="Failed to connect to guest: curl error"
 jq_err="Failed to parse response from guest: jq error"
-while [ ! -s  "$file" ]
+while [ ! -f  "$file" ]
 do
  # Check if not shutting down
@ -30,7 +27,7 @@ do
  sleep 3
  [ -f "$shutdown" ] && exit 1
-  [ -s "$file" ] && break
+  [ -f "$file" ] && break
  # Retrieve network info from guest VM
  { json=$(curl -m 20 -sk "$url"); rc=$?; } || :
@ -104,5 +101,3 @@ info "-----------------------------------------------------------"
 info " You can now login to DSM at $msg"
 info "-----------------------------------------------------------"
 echo "" >&2
 exit 0
--- a/src/proc.sh
+++ b/src/proc.sh
@ -6,144 +6,70 @@ set -Eeuo pipefail
 : "${KVM:="Y"}"
 : "${HOST_CPU:=""}"
 : "${CPU_FLAGS:=""}"
-: "${CPU_MODEL:=""}"
+: "${CPU_MODEL:="host"}"
 : "${DEF_MODEL:="qemu64"}"
-CLOCKSOURCE="tsc"
+[ "$ARCH" != "amd64" ] && KVM="N"
 [[ "${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."
 fi
 if [[ "$KVM" != [Nn]* ]]; then
  KVM_ERR=""
  if [ ! -e /dev/kvm ]; then
-    KVM_ERR="(/dev/kvm is missing)"
+    KVM_ERR="(device file missing)"
  else
    if ! sh -c 'echo -n > /dev/kvm' &> /dev/null; then
-      KVM_ERR="(/dev/kvm is unwriteable)"
+      KVM_ERR="(no write access)"
    else
-      flags=$(sed -ne '/^flags/s/^.*: //p' /proc/cpuinfo)
+      if ! grep -q -e vmx -e svm /proc/cpuinfo; then
-      if ! grep -qw "vmx\|svm" <<< "$flags"; then
+        KVM_ERR="(vmx/svm disabled)"
        KVM_ERR="(not enabled in BIOS)"
      fi
    fi
  fi
  if [ -n "$KVM_ERR" ]; then
    KVM="N"
-    if [[ "$OSTYPE" =~ ^darwin ]]; then
+    error "KVM acceleration not detected $KVM_ERR, this will cause a major loss of performance."
-      warn "you are using macOS which has no KVM support, this will cause a major loss of performance."
+    error "See the FAQ on how to enable it, or continue without KVM by setting KVM=N (not recommended)."
-    else      
+    [[ "$DEBUG" != [Yy1]* ]] && exit 88
      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
 fi
 if [[ "$KVM" != [Nn]* ]]; then
-  CPU_FEATURES="kvm=on,l3-cache=on,+hypervisor"
+  CPU_FEATURES="kvm=on"
-  KVM_OPTS=",accel=kvm -enable-kvm -global kvm-pit.lost_tick_policy=discard"
+  KVM_OPTS=",accel=kvm -enable-kvm"
  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+=",+ssse3,+sse4.1,+sse4.2"
  fi
  if [ -z "$CPU_MODEL" ]; then
    CPU_MODEL="host"
    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
  if ! grep -qE '^flags.* (sse4_2)' /proc/cpuinfo; then
    error "Your host CPU does not have the SSE4.2 instruction set that Virtual DSM requires to boot."
    error "Disable KVM by setting KVM=N to emulate a compatible CPU, at the cost of performance."
    [[ "$DEBUG" != [Yy1]* ]] && exit 89
  fi
 else
  KVM_OPTS=""
-  CPU_FEATURES="l3-cache=on,+hypervisor"
+  CPU_FEATURES="+ssse3,+sse4.1,+sse4.2"
-  if [[ "$ARCH" == "amd64" ]]; then
+  if [[ "${CPU_MODEL,,}" == "host"* ]]; then
    KVM_OPTS=" -accel tcg,thread=multi"
  fi
  if [ -z "$CPU_MODEL" ]; then
    if [[ "$ARCH" == "amd64" ]]; then
      CPU_MODEL="max"
      CPU_FEATURES+=",migratable=no"
    else
-      CPU_MODEL="$DEF_MODEL"
+      CPU_MODEL="qemu64"
    fi
  fi
  CPU_FEATURES+=",+ssse3,+sse4.1,+sse4.2"
 fi
 if [ -z "$CPU_FLAGS" ]; then
-  if [ -z "$CPU_FEATURES" ]; then
+  CPU_FLAGS="$CPU_MODEL,$CPU_FEATURES"
    CPU_FLAGS="$CPU_MODEL"
  else
    CPU_FLAGS="$CPU_MODEL,$CPU_FEATURES"
  fi
 else
-  if [ -z "$CPU_FEATURES" ]; then
+  CPU_FLAGS="$CPU_MODEL,$CPU_FEATURES,$CPU_FLAGS"
    CPU_FLAGS="$CPU_MODEL,$CPU_FLAGS"
  else
    CPU_FLAGS="$CPU_MODEL,$CPU_FEATURES,$CPU_FLAGS"
  fi
 fi
 if [ -z "$HOST_CPU" ]; then
-  [[ "${CPU,,}" != "unknown" ]] && HOST_CPU="$CPU"
+  HOST_CPU=$(lscpu | grep 'Model name' | cut -f 2 -d ":" | awk '{$1=$1}1' | sed 's# @.*##g' | sed s/"(R)"//g | sed 's/[^[:alnum:] ]\+/ /g' | sed 's/  */ /g')
 fi
 if [ -n "$HOST_CPU" ]; then
@ -151,9 +77,9 @@ if [ -n "$HOST_CPU" ]; then
 else
  HOST_CPU="QEMU, Virtual CPU,"
  if [ "$ARCH" == "amd64" ]; then
-    HOST_CPU+=" X86_64"
+    HOST_CPU="$HOST_CPU X86_64"
  else
-    HOST_CPU+=" $ARCH"
+    HOST_CPU="$HOST_CPU $ARCH"
  fi
 fi
--- a/src/progress.sh
+++ b/src/progress.sh
@ -1,38 +0,0 @@
 #!/usr/bin/env bash
 set -Eeuo pipefail
 escape () {
    local s
    s=${1//&/\&amp;}
    s=${s//</\&lt;}
    s=${s//>/\&gt;}
    s=${s//'"'/\&quot;}
    printf -- %s "$s"
    return 0
 }
 file="$1"
 total="$2"
 body=$(escape "$3")
 info="/run/shm/msg.html"
 if [[ "$body" == *"..." ]]; then
  body="<p class=\"loading\">${body/.../}</p>"
 fi
 while true
 do
  if [ -s "$file" ]; then
    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/')
      else
        size="$(echo "$bytes" "$total" | awk '{printf "%.1f", $1 * 100 / $2}')"
        size="$size%"
      fi
      echo "${body//(\[P\])/($size)}"> "$info"
    fi
  fi
  sleep 1 & wait $!
 done
--- a/src/reset.sh
+++ b/src/reset.sh
@ -1,6 +1,10 @@
 #!/usr/bin/env bash
 set -Eeuo pipefail
 info () { printf "%b%s%b" "\E[1;34m❯ \E[1;36m" "$1" "\E[0m\n"; }
 error () { printf "%b%s%b" "\E[1;31m❯ " "ERROR: $1" "\E[0m\n" >&2; }
 warn () { printf "%b%s%b" "\E[1;31m❯ " "Warning: $1" "\E[0m\n" >&2; }
 trap 'error "Status $? while: $BASH_COMMAND (line $LINENO/$BASH_LINENO)"' ERR
 [ ! -f "/run/entry.sh" ] && error "Script must run inside Docker container!" && exit 11
@ -8,47 +12,33 @@ trap 'error "Status $? while: $BASH_COMMAND (line $LINENO/$BASH_LINENO)"' ERR
 echo "❯ Starting $APP for Docker v$(</run/version)..."
 echo "❯ For support visit $SUPPORT"
 echo
 # Docker environment variables
-: "${TZ:=""}"              # System local timezone
+: "${TZ:=""}"             # System local timezone
-: "${DEBUG:="N"}"          # Disable debugging mode
+: "${DEBUG:="N"}"         # Disable debugging mode
-: "${COUNTRY:=""}"         # Country code for mirror
+: "${COUNTRY:=""}"        # Country code for mirror
-: "${CONSOLE:="N"}"        # Disable console mode
+: "${CONSOLE:="N"}"       # Disable console mode
-: "${ALLOCATE:=""}"        # Preallocate diskspace
+: "${ALLOCATE:=""}"       # Preallocate diskspace
-: "${ARGUMENTS:=""}"       # Extra QEMU parameters
+: "${ARGUMENTS:=""}"      # Extra QEMU parameters
-: "${CPU_CORES:="2"}"      # Amount of CPU cores
+: "${CPU_CORES:="1"}"     # Amount of CPU cores
-: "${RAM_SIZE:="2G"}"      # Maximum RAM amount
+: "${RAM_SIZE:="1G"}"     # Maximum RAM amount
-: "${RAM_CHECK:="Y"}"      # Check available RAM
+: "${DISK_SIZE:="16G"}"   # Initial data disk size
 : "${DISK_SIZE:="16G"}"    # Initial data disk size
 : "${STORAGE:="/storage"}" # Storage folder location
 # Helper variables
-PROCESS="${APP,,}"
+STORAGE="/storage"
 PROCESS="${PROCESS// /-}"
 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)
+KERNEL=$(uname -r | cut -b 1)
-SYS=$(uname -r)
+MINOR=$(uname -r | cut -d '.' -f2)
 HOST=$(hostname -s)
 KERNEL=$(echo "$SYS" | cut -b 1)
 MINOR=$(echo "$SYS" | cut -d '.' -f2)
 ARCH=$(dpkg --print-architecture)
-CORES=$(grep -c '^processor' /proc/cpuinfo)
+VERS=$(qemu-system-x86_64 --version | head -n 1 | cut -d '(' -f 1)
 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
@ -60,62 +50,10 @@ 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
 # Check filesystem
 FS=$(stat -f -c %T "$STORAGE")
 if [[ "${FS,,}" == "ecryptfs" ]] || [[ "${FS,,}" == "tmpfs" ]]; then
  DISK_IO="threads"
  DISK_CACHE="writeback"
 fi
 # Read memory
 RAM_SPARE=500000000
 RAM_AVAIL=$(free -b | grep -m 1 Mem: | awk '{print $7}')
 RAM_TOTAL=$(free -b | grep -m 1 Mem: | awk '{print $2}')
 RAM_SIZE="${RAM_SIZE// /}"
 [ -z "$RAM_SIZE" ] && error "RAM_SIZE not specified!" && exit 16
 if [ -z "${RAM_SIZE//[0-9. ]}" ]; then
  [ "${RAM_SIZE%%.*}" -lt "130" ] && RAM_SIZE="${RAM_SIZE}G" || RAM_SIZE="${RAM_SIZE}M"
 fi
 RAM_SIZE=$(echo "${RAM_SIZE^^}" | sed 's/MB/M/g;s/GB/G/g;s/TB/T/g')
 ! numfmt --from=iec "$RAM_SIZE" &>/dev/null && error "Invalid RAM_SIZE: $RAM_SIZE" && exit 16
 RAM_WANTED=$(numfmt --from=iec "$RAM_SIZE")
 [ "$RAM_WANTED" -lt "136314880 " ] && error "RAM_SIZE is too low: $RAM_SIZE" && exit 16
 # Print system info
 SYS="${SYS/-generic/}"
 FS="${FS/UNKNOWN //}"
 FS="${FS/ext2\/ext3/ext4}"
 FS=$(echo "$FS" | sed 's/[)(]//g')
 SPACE=$(df --output=avail -B 1 "$STORAGE" | tail -n 1)
 SPACE_GB=$(formatBytes "$SPACE" "down")
 AVAIL_MEM=$(formatBytes "$RAM_AVAIL" "down")
 TOTAL_MEM=$(formatBytes "$RAM_TOTAL" "up")
 echo "❯ CPU: ${CPU} | RAM: ${AVAIL_MEM/ GB/}/$TOTAL_MEM | DISK: $SPACE_GB (${FS}) | KERNEL: ${SYS}..."
 echo
 # Check available memory
 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
 rm -f /run/shm/qemu.*
 rm -f /run/shm/dsm.url
@ -124,6 +62,91 @@ rm -f /run/shm/dsm.url
 rm -rf /tmp/dsm
 rm -rf "$STORAGE/tmp"
 # Helper functions
 isAlive() {
  local pid=$1
  if kill -0 "$pid" 2>/dev/null; then
    return 0
  fi
  return 1
 }
 pKill() {
  local pid=$1
  { kill -15 "$pid" || true; } 2>/dev/null
  while isAlive "$pid"; do
    sleep 0.2
  done
  return 0
 }
 fWait() {
  local name=$1
  while pgrep -f -l "$name" >/dev/null; do
    sleep 0.2
  done
  return 0
 }
 fKill() {
  local name=$1
  { pkill -f "$name" || true; } 2>/dev/null
  fWait "$name"
  return 0
 }
 escape () {
    local s
    s=${1//&/\&amp;}
    s=${s//</\&lt;}
    s=${s//>/\&gt;}
    s=${s//'"'/\&quot;}
    printf -- %s "$s"
    return 0
 }
 html()
 {
    local title
    local body
    local script
    local footer
    title=$(escape "$APP")
    title="<title>$title</title>"
    footer=$(escape "$FOOTER1")
    body=$(escape "$1")
    if [[ "$body" == *"..." ]]; then
      body="<p class=\"loading\">${body/.../}</p>"
    fi
    [ -n "${2:-}" ] && script="$2" || script=""
    local HTML
    HTML=$(<"$TEMPLATE")
    HTML="${HTML/\[1\]/$title}"
    HTML="${HTML/\[2\]/$script}"
    HTML="${HTML/\[3\]/$body}"
    HTML="${HTML/\[4\]/$footer}"
    HTML="${HTML/\[5\]/$FOOTER2}"
    echo "$HTML" > "$PAGE"
    echo "$body" > "$INFO"
    return 0
 }
 getCountry() {
  local url=$1
  local query=$2
@ -184,17 +207,6 @@ addPackage() {
  return 0
 }
 # shellcheck disable=SC2143
 if [ -f /proc/net/if_inet6 ] && [ -n "$(ifconfig -a | grep inet6)" ]; then
  sed -i "s/listen 5000 default_server;/listen [::]:5000 default_server ipv6only=off;/g" /etc/nginx/sites-enabled/web.conf
 else
  sed -i "s/listen [::]:5000 default_server ipv6only=off;/listen 5000 default_server;/g" /etc/nginx/sites-enabled/web.conf
 fi
 # Start webserver
 cp -r /var/www/* /run/shm
 html "Starting $APP for Docker..."
--- a/src/serial.sh
+++ b/src/serial.sh
@ -9,21 +9,6 @@ set -Eeuo pipefail
 : "${HOST_MODEL:=""}"
 : "${GUEST_SERIAL:=""}"
 if [ -n "$HOST_MAC" ]; then
  HOST_MAC="${HOST_MAC//-/:}"
  if [[ ${#HOST_MAC} == 12 ]]; then
    m="$HOST_MAC"
    HOST_MAC="${m:0:2}:${m:2:2}:${m:4:2}:${m:6:2}:${m:8:2}:${m:10:2}"
  fi
  if [[ ${#HOST_MAC} != 17 ]]; then
    error "Invalid HOST_MAC address: '$HOST_MAC', should be 12 or 17 digits long!" && exit 28
  fi
 fi
 HOST_ARGS=()
 HOST_ARGS+=("-cpu=$CPU_CORES")
 HOST_ARGS+=("-cpu_arch=$HOST_CPU")
@ -67,7 +52,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
@ -1,175 +0,0 @@
 #!/usr/bin/env bash
 set -Eeuo pipefail
 # Helper functions
 info () { printf "%b%s%b" "\E[1;34m❯ \E[1;36m" "${1:-}" "\E[0m\n"; }
 error () { printf "%b%s%b" "\E[1;31m❯ " "ERROR: ${1:-}" "\E[0m\n" >&2; }
 warn () { printf "%b%s%b" "\E[1;31m❯ " "Warning: ${1:-}" "\E[0m\n" >&2; }
 formatBytes() {
  local result
  result=$(numfmt --to=iec --suffix=B "$1" | sed -r 's/([A-Z])/ \1/' | sed 's/ B/ bytes/g;')
  local unit="${result//[0-9. ]}"
  result="${result//[a-zA-Z ]/}"
  if [[ "${2:-}" == "up" ]]; then
    if [[ "$result" == *"."* ]]; then
      result="${result%%.*}"
      result=$((result+1))
    fi
  else
    if [[ "${2:-}" == "down" ]]; then
      result="${result%%.*}"
    fi
  fi
  echo "$result $unit"
  return 0
 }
 isAlive() {
  local pid="$1"
  if kill -0 "$pid" 2>/dev/null; then
    return 0
  fi
  return 1
 }
 pKill() {
  local pid="$1"
  { kill -15 "$pid" || true; } 2>/dev/null
  while isAlive "$pid"; do
    sleep 0.2
  done
  return 0
 }
 fWait() {
  local name="$1"
  while pgrep -f -l "$name" >/dev/null; do
    sleep 0.2
  done
  return 0
 }
 fKill() {
  local name="$1"
  { pkill -f "$name" || true; } 2>/dev/null
  fWait "$name"
  return 0
 }
 escape () {
  local s
  s=${1//&/\&amp;}
  s=${s//</\&lt;}
  s=${s//>/\&gt;}
  s=${s//'"'/\&quot;}
  printf -- %s "$s"
  return 0
 }
 html() {
  local title
  local body
  local script
  local footer
  title=$(escape "$APP")
  title="<title>$title</title>"
  footer=$(escape "$FOOTER1")
  body=$(escape "$1")
  if [[ "$body" == *"..." ]]; then
    body="<p class=\"loading\">${body/.../}</p>"
  fi
  [ -n "${2:-}" ] && script="$2" || script=""
  local HTML
  HTML=$(<"$TEMPLATE")
  HTML="${HTML/\[1\]/$title}"
  HTML="${HTML/\[2\]/$script}"
  HTML="${HTML/\[3\]/$body}"
  HTML="${HTML/\[4\]/$footer}"
  HTML="${HTML/\[5\]/$FOOTER2}"
  echo "$HTML" > "$PAGE"
  echo "$body" > "$INFO"
  return 0
 }
 cpu() {
  local ret
  local cpu=""
  ret=$(lscpu)
  if grep -qi "model name" <<< "$ret"; then
    cpu=$(echo "$ret" | grep -m 1 -i 'model name' | cut -f 2 -d ":" | awk '{$1=$1}1' | sed 's# @.*##g' | sed s/"(R)"//g | sed 's/[^[:alnum:] ]\+/ /g' | sed 's/  */ /g')
  fi
  if [ -z "${cpu// /}" ] && grep -qi "model:" <<< "$ret"; then
    cpu=$(echo "$ret" | grep -m 1 -i 'model:' | cut -f 2 -d ":" | awk '{$1=$1}1' | sed 's# @.*##g' | sed s/"(R)"//g | sed 's/[^[:alnum:] ]\+/ /g' | sed 's/  */ /g')
  fi
  cpu="${cpu// CPU/}"
  cpu="${cpu// 4 Core/}"
  cpu="${cpu// 6 Core/}"
  cpu="${cpu// 8 Core/}"
  cpu="${cpu// 10 Core/}"
  cpu="${cpu// 12 Core/}"
  cpu="${cpu// 16 Core/}"
  cpu="${cpu// 32 Core/}"
  cpu="${cpu// 48 Core/}"
  cpu="${cpu// 64 Core/}"
  cpu="${cpu// 96 Core/}"
  cpu="${cpu// 128 Core/}"
  cpu="${cpu//7th Gen /}"
  cpu="${cpu//8th Gen /}"
  cpu="${cpu//9th Gen /}"
  cpu="${cpu//10th Gen /}"
  cpu="${cpu//11th Gen /}"
  cpu="${cpu//12th Gen /}"
  cpu="${cpu//13th Gen /}"
  cpu="${cpu//14th Gen /}"
  cpu="${cpu//15th Gen /}"
  cpu="${cpu// Processor/}"
  cpu="${cpu// Quad core/}"
  cpu="${cpu// Dual core/}"
  cpu="${cpu// Octa core/}"
  cpu="${cpu// Core TM/ Core}"
  cpu="${cpu// with Radeon Graphics/}"
  cpu="${cpu// with Radeon Vega Graphics/}"
  cpu="${cpu// with Radeon Vega Mobile Gfx/}"
  [ -z "${cpu// /}" ] && cpu="Unknown"
  echo "$cpu"
  return 0
 }
 hasDisk() {
  [ -b "/disk" ] && return 0
  [ -b "/disk1" ] && return 0
  [ -b "/dev/disk1" ] && return 0
  [ -b "${DEVICE:-}" ] && return 0
  [ -z "${DISK_NAME:-}" ] && DISK_NAME="data"
  [ -s "$STORAGE/$DISK_NAME.img" ]  && return 0
  [ -s "$STORAGE/$DISK_NAME.qcow2" ] && return 0
  return 1
 }
 return 0
--- a/web/css/style.css
+++ b/web/css/style.css
@ -1,14 +1,7 @@
 body {
 	color: white;
 	background-color: #125bdb;
-	font-smoothing: antialiased;
+	font-family: Verdana, Arial, sans-serif;
 	-webkit-font-smoothing: antialiased;
 	-moz-osx-font-smoothing: grayscale;
 	font-family: Verdana, Geneva, sans-serif;
 }
 #info {
 	text-shadow: 1px 1px 1px rgba(0, 0, 0, 0.25);
 }
 #content {
@ -24,7 +17,6 @@ footer {
 	height: 40px;
 	text-align: center;
 	color: #0c8aeb;
 	text-shadow: 0 0 1px #0c8aeb;
 }
 #empty {
@ -41,13 +33,8 @@ a:visited {
 footer a:link,
 footer a:visited,
-footer a:active {
+footer a:active { color: #0c8aeb; }
-	color: #0c8aeb;
+footer a:hover { color: #73e6ff; }
 }
 footer a:hover {
 	color: #73e6ff;
 }
 .loading:after {
 	content: " .";
--- a/web/index.html
+++ b/web/index.html
@ -5,8 +5,8 @@
        [1]
        <meta http-equiv="Cache-Control" content="no-cache" />
        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-        <link rel="stylesheet" type="text/css" href="css/style.css" />
+        <link rel="stylesheet" type="text/css" href="/css/style.css" />
-        <link rel="icon" href="img/favicon.svg" type="image/x-icon">
+        <link rel="icon" href="/img/favicon.svg" type="image/x-icon">
        [2]
    </head>
@ -28,7 +28,7 @@
                [5]
            </footer>
        </div>
-        <script type="text/javascript" src="js/script.js"></script>
+        <script type="text/javascript" src="/js/script.js"></script>
    </body>
 </html>
--- a/web/js/script.js
+++ b/web/js/script.js
@ -3,7 +3,7 @@ var interval = 1000;
 function getInfo() {
-    var url = "msg.html";
+    var url = "/msg.html";
    try {
--- a/web/conf/nginx.conf
+++ b/web/conf/nginx.conf
@ -1,5 +1,8 @@
 server {
    listen 80;
    listen [::]:80;
    listen 5000 default_server;
    listen [::]:5000 default_server;
    autoindex on;
    tcp_nodelay on;