feat: Display KVM warning on ARM64 (#739 )

fix: Display reason for network failure (#738 )
docs: Docker CLI (#737 )
2025-11-06 18:13:43 +08:00 · 2024-05-19 21:19:58 +02:00 · 2024-05-17 16:09:47 +02:00 · 2024-05-16 03:22:58 +02:00 · 2024-05-16 01:42:58 +02:00 · 2024-05-16 01:12:16 +02:00
33 changed files with 1522 additions and 450 deletions
--- a/.dockerignore
+++ b/.dockerignore
@@ -6,7 +6,10 @@
 .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
@@ -0,0 +1,62 @@
+name: "\U0001F6A8 Technical issue"
+description: When you're experiencing problems using the container
+body:
+  - type: checkboxes
+    attributes:
+      label: Is there no existing issue for this?
+      description: Please search to see if no solution was already provided before.
+      options:
+      - label: I have searched the existing issues
+        required: true
+  - type: input
+    id: cpu
+    attributes:
+      label: Machine specifications
+      description: The processor and RAM amount in your machine.
+      placeholder: e.g. Intel N5105 / 16 GB 
+    validations:
+      required: true
+  - type: input
+    id: os
+    attributes:
+      label: Operating system
+      description: The distribution and kernel version (as shown by `uname -a`).
+      placeholder: e.g. Ubuntu 24.04 / Kernel 6.8.0-22-generic
+    validations:
+      required: true
+  - type: input
+    id: docker
+    attributes:
+      label: Docker version
+      description: The version of the Docker engine (as shown by `docker -v`).
+      placeholder: e.g. 26.0.1
+    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).
+    validations:
+      required: true
+  - type: textarea
+    id: log
+    attributes:
+      label: Docker log
+      description: The logfile of the container (as shown by `docker logs dsm`).
+    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
@@ -0,0 +1,44 @@
+name: "\U0001F680 Feature request"
+description: Suggest an idea for improving the container
+title: "[Feature]: "
+labels: ["enhancement"]
+body:
+  - type: checkboxes
+    attributes:
+      label: Is there no existing feature request for this?
+      description: Please search to see if the feature was not already requested before.
+      options:
+      - label: I have searched the existing feature requests
+        required: true
+  - type: textarea
+    id: problem
+    attributes:
+      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
@@ -0,0 +1,64 @@
+name: "\U0001F41E Bug report"
+description: Create a report to help us improve the container
+title: "[Bug]: "
+labels: ["bug"]
+body:
+  - type: checkboxes
+    attributes:
+      label: Is there no existing bug report for this?
+      description: Please search to see if the bug was not already reported before.
+      options:
+      - label: I have searched the existing bug reports
+        required: true
+  - type: input
+    id: cpu
+    attributes:
+      label: Machine specifications
+      description: The processor and RAM amount in your machine.
+      placeholder: e.g. Intel N5105 / 16 GB 
+    validations:
+      required: true
+  - type: input
+    id: os
+    attributes:
+      label: Operating system
+      description: The distribution and kernel version (as shown by `uname -a`).
+      placeholder: e.g. Ubuntu 24.04 / Kernel 6.8.0-22-generic
+    validations:
+      required: true
+  - type: input
+    id: docker
+    attributes:
+      label: Docker version
+      description: The version of the Docker engine (as shown by `docker -v`).
+      placeholder: e.g. 26.0.1
+    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).
+    validations:
+      required: true
+  - type: textarea
+    id: log
+    attributes:
+      label: Docker log
+      description: The logfile of the container (as shown by `docker logs dsm`).
+    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
@@ -0,0 +1,26 @@
+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
@@ -0,0 +1 @@
+blank_issues_enabled: false
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -8,6 +8,10 @@ on:
    paths-ignore:
      - '**/*.md'
      - '**/*.yml'
+      - '**/*.js'
+      - '**/*.css'
+      - '**/*.html'
+      - 'web/**'
      - '.gitignore'
      - '.dockerignore'
      - '.github/**'
@@ -74,7 +78,7 @@ jobs:
          context: .
          push: true
          provenance: false
-          platforms: linux/amd64,linux/arm64,linux/arm
+          platforms: linux/amd64,linux/arm64
          tags: ${{ steps.meta.outputs.tags }}
          labels: ${{ steps.meta.outputs.labels }}
          annotations: ${{ steps.meta.outputs.annotations }}
@@ -99,3 +103,15 @@ 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,8 +7,18 @@ jobs:
    name: shellcheck
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v4
-      - name: Run ShellCheck
+      - 
+        name: Checkout
+        uses: actions/checkout@v4
+      -
+        name: Run ShellCheck
        uses: ludeeus/action-shellcheck@master
-env:
-        SHELLCHECK_OPTS: -x --source-path=src -e SC2001 -e SC2002 -e SC2223 -e SC2034 -e SC2064 -e SC2317 -e SC2153 -e SC2028
+        env:
+          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
+          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@v3
+      uses: peter-evans/dockerhub-description@v4
      with:
        username: ${{ secrets.DOCKERHUB_USERNAME }}
        password: ${{ secrets.DOCKERHUB_TOKEN }}
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -3,6 +3,7 @@ on:
  pull_request:
    paths:
      - '**/*.sh'
+      - 'Dockerfile'
      - '.github/workflows/test.yml'
      - '.github/workflows/check.yml'

--- a/37
+++ b/37
@@ -1,4 +1,4 @@
-FROM qemux/qemu-host as builder
+FROM qemux/qemu-host:2.04 as builder

 #  FROM golang as builder
 #  WORKDIR /
@@ -10,13 +10,15 @@ FROM qemux/qemu-host as builder
 FROM debian:trixie-slim

 ARG TARGETPLATFORM
-ARG DEBCONF_NOWARNINGS "yes"
-ARG DEBIAN_FRONTEND "noninteractive"
-ARG DEBCONF_NONINTERACTIVE_SEEN "true"
+ARG VERSION_ARG="0.0"
+ARG DEBCONF_NOWARNINGS="yes"
+ARG DEBIAN_FRONTEND="noninteractive"
+ARG DEBCONF_NONINTERACTIVE_SEEN="true"

-RUN if [ "$TARGETPLATFORM" != "linux/amd64" ]; then extra="qemu-user"; fi \
-    && apt-get update \
-    && apt-get --no-install-recommends -y install \
+RUN set -eu && extra="" && \
+    if [ "$TARGETPLATFORM" != "linux/amd64" ]; then extra="qemu-user"; fi && \
+    apt-get update && \
+    apt-get --no-install-recommends -y install \
        jq \
        tini \
        curl \
@@ -24,7 +26,7 @@ RUN if [ "$TARGETPLATFORM" != "linux/amd64" ]; then extra="qemu-user"; fi \
        wget \
        fdisk \
        unzip \
-        socat \
+        nginx \
        procps \
        xz-utils \
        iptables \
@@ -37,13 +39,17 @@ RUN if [ "$TARGETPLATFORM" != "linux/amd64" ]; then extra="qemu-user"; fi \
        ca-certificates \
        netcat-openbsd \
        qemu-system-x86 \
-        "$extra" \
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+        "$extra" && \
+    apt-get clean && \
+    unlink /etc/nginx/sites-enabled/default && \
+    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 ./src /run/
-COPY --from=builder /qemu-host.bin /run/host.bin
-RUN chmod +x /run/*.sh && chmod +x /run/*.bin
+COPY --chmod=755 ./src /run/
+COPY --chmod=755 ./web /var/www/
+COPY --chmod=755 --from=builder /qemu-host.bin /run/host.bin
+COPY --chmod=744 ./web/nginx.conf /etc/nginx/sites-enabled/web.conf

 VOLUME /storage
 EXPOSE 22 139 445 5000
@@ -52,9 +58,6 @@ ENV RAM_SIZE "1G"
 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

 ENTRYPOINT ["/usr/bin/tini", "-s", "/run/entry.sh"]
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,21 +1,15 @@
-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
@@ -0,0 +1,58 @@
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: dsm-pvc
+spec:
+  accessModes:
+    - ReadWriteOnce
+  resources:
+    requests:
+      storage: 16Gi
+---
+apiVersion: v1
+kind: Pod
+metadata:
+  name: dsm
+  labels:
+    name: dsm
+spec:
+  terminationGracePeriodSeconds: 120 # the Kubernetes default is 30 seconds and it may be not enough
+  containers:
+    - name: dsm
+      image: vdsm/virtual-dsm
+      ports:
+        - containerPort: 5000
+          protocol: TCP
+      resources:
+        limits:
+          devices.kubevirt.io/kvm: 1
+      securityContext:
+        privileged: true
+      env:
+        - name: RAM_SIZE
+          value: 1G
+        - name: CPU_CORES
+          value: "1"
+        - name: DISK_SIZE
+          value: "16G"  # Kubernetes uses Gi, but DSM uses GB
+      volumeMounts:
+        - mountPath: /storage
+          name: storage
+  volumes:
+    - name: storage
+      persistentVolumeClaim:
+        claimName: dsm-pvc
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: dsm
+spec:
+  type: NodePort
+  selector:
+    name: dsm
+  ports:
+    - name: tcp-5000
+      port: 5000
+      targetPort: 5000
+      nodePort: 31150
--- a/readme.md
+++ b/readme.md
@@ -1,6 +1,6 @@
-<h1 align="center">Virtual DSM for Docker<br />
+<h1 align="center">Virtual DSM<br />
 <div align="center">
-<img src="https://github.com/vdsm/virtual-dsm/raw/master/.github/screen.jpg" title="Screenshot" style="max-width:100%;" width="432" />
+<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>
 </div>
 <div align="center">

@@ -11,25 +11,23 @@

 </div></h1>

-Virtual DSM in a docker container.
+Virtual DSM in a Docker container.

 ## Features

 - Multiple disks
 - KVM acceleration
- - GPU passthrough
 - Upgrades supported
 
 ## Usage

-Via `docker-compose.yml`
+Via Docker Compose:

 ```yaml
-version: "3"
 services:
  dsm:
    container_name: dsm
-    image: vdsm/virtual-dsm:latest
+    image: vdsm/virtual-dsm
    environment:
      DISK_SIZE: "16G"
    devices:
@@ -40,190 +38,218 @@ services:
      - 5000:5000
    volumes:
      - /var/dsm:/storage
-    restart: on-failure
    stop_grace_period: 2m
 ```

-Via `docker run`
+Via Docker CLI:

 ```bash
-docker run -it --rm -p 5000:5000 --device=/dev/kvm --cap-add NET_ADMIN --stop-timeout 60 vdsm/virtual-dsm:latest
+docker run -it --name dsm -p 5000:5000 --device=/dev/kvm --cap-add NET_ADMIN --stop-timeout 120 vdsm/virtual-dsm
+```
+
+Via Kubernetes:
+
+```shell
+kubectl apply -f kubernetes.yml
 ```

 ## FAQ

-  * ### How do I change the size of the virtual disk?
+* ### How do I use it?

-    To expand the default size of 16 GB, locate the `DISK_SIZE` setting in your compose file and modify it to your preferred capacity:
+  Very simple! These are the steps:
+  
+  - Start the container and connect to [port 5000](http://localhost:5000) using your web browser.

-    ```yaml
-    environment:
-      DISK_SIZE: "128G"
-    ```
-    
-    This can also be used to resize the existing disk to a larger capacity without any data loss. 
+  - Wait until DSM is ready, choose an username and password, and you will be taken to the desktop.
+  
+  Enjoy your brand new machine, and don't forget to star this repo!

-  * ### How do I change the location of the virtual disk?
+* ### How do I change the storage location?

-    To change the location of the virtual disk, include the following bind mount in your compose file:
+  To change the storage location, include the following bind mount in your compose file:

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

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

-  * ### How do I add multiple disks?
+  To expand the default size of 16 GB, locate the `DISK_SIZE` setting in your compose file and modify it to your preferred capacity:

-    To create additional disks, modify your compose file like this:
-    
-    ```yaml
-    environment:
-      DISK2_SIZE: "32G"
-      DISK3_SIZE: "64G"
-    volumes:
-      - /home/example:/storage2
-      - /mnt/data/example:/storage3
-    ```
+  ```yaml
+  environment:
+    DISK_SIZE: "128G"
+  ```
+  
+  This can also be used to resize the existing disk to a larger capacity without any data loss.

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

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

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

-    ```yaml
-    environment:
-      DISK_FMT: "qcow2"
-    ```
+  ```yaml
+  environment:
+    DISK_FMT: "qcow2"
+  ```

-    Please note that this may reduce the write performance of the disk.
+  Please note that this may reduce the write performance of the disk.

-  * ### How do I increase the amount of CPU or RAM?
+* ### How do I add multiple disks?

-    By default, a single core and 1 GB of RAM are allocated to the container.
+  To create additional disks, modify your compose file like this:
+  
+  ```yaml
+  environment:
+    DISK2_SIZE: "32G"
+    DISK3_SIZE: "64G"
+  volumes:
+    - /home/example:/storage2
+    - /mnt/data/example:/storage3
+  ```

-    To increase this, add the following environment variables:
+* ### How do I pass-through a disk?

-    ```yaml
-    environment:
-      RAM_SIZE: "4G"
-      CPU_CORES: "4"
-    ```
+   It is possible to pass-through disk devices directly by adding them to your compose file in this way:

-  * ### How do I verify if my system supports KVM?
+  ```yaml
+  devices:
+    - /dev/disk/by-uuid/12345-12345-12345-12345-12345:/disk2
+    - /dev/disk/by-uuid/45678-45678-45678-45678-45678:/disk3
+  ```

-    To verify if your system supports KVM, run the following commands:
+  Make sure to bind the disk via its UUID (obtainable via `lsblk -o name,uuid`) instead of its name (`/dev/sdc`), to prevent ever binding the wrong disk when the drive letters happen to change. 

-    ```bash
-    sudo apt install cpu-checker
-    sudo kvm-ok
-    ```
+  Please note that the device needs to be totally empty (without any partition table) otherwise DSM does not always format it into a volume.

-    If you receive an error from `kvm-ok` indicating that KVM acceleration can't be used, check the virtualization settings in the BIOS.
+  Do NOT use this feature with the goal of sharing files from the host, they will all be lost without warning when DSM creates the volume.

-  * ### How do I assign an individual IP address to the container?
+* ### How do I increase the amount of CPU or RAM?

-    By default, the container uses bridge networking, which shares the IP address with the host. 
+  By default, a single CPU core and 1 GB of RAM are allocated to the container.

-    If you want to assign an individual IP address to the container, you can create a macvlan network as follows:
+  If there arises a need to increase this, add the following environment variables:

-    ```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. 
+  ```yaml
+  environment:
+    RAM_SIZE: "4G"
+    CPU_CORES: "4"
+  ```

-    Once you have created the network, change your compose file to look as follows:
+* ### How do I verify if my system supports KVM?

-    ```yaml
-    services:
-      dsm:
-        container_name: dsm
-        ..<snip>..
-        networks:
-          vdsm:
-            ipv4_address: 192.168.0.100
+  To verify if your system supports KVM, run the following commands:

-    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.
+  ```bash
+  sudo apt install cpu-checker
+  sudo kvm-ok
+  ```

-    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.
+  If you receive an error from `kvm-ok` indicating that KVM acceleration can't be used, check the virtualization settings in the BIOS.

-  * ### How can the container acquire an IP address from my router?
+* ### How do I assign an individual IP address to the container?

-    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.
+  By default, the container uses bridge networking, which shares the IP address with the host. 

-    To enable this feature, add the following lines to your compose file:
+  If you want to assign an individual IP address to the container, you can create a macvlan network as follows:

-    ```yaml
-    environment:
-      DHCP: "Y"
-    device_cgroup_rules:
-      - 'c *:* rwm'
-    ```
+  ```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. 

-    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.
+  Once you have created the network, change your compose file to look as follows:

-  * ### How do I passthrough the GPU?
+  ```yaml
+  services:
+    dsm:
+      container_name: dsm
+      ..<snip>..
+      networks:
+        vdsm:
+          ipv4_address: 192.168.0.100

-    To passthrough your Intel GPU, add the following lines to your compose file:
+  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.

-    ```yaml
-    environment:
-      GPU: "Y"
-    devices:
-      - /dev/dri
-    ```
+  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.

-    This can be used to enable the facial recognition function in Synology Photos for example.
+* ### How can DSM acquire an IP address from my router?

-  * ### How do I passthrough a disk?
+  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.

-    When running the container inside a virtualized environment, it is possible to passthrough disk devices directly, instead of binding a folder containing an image. As these devices are already backed by an image on the host, this removes an extra layer.
+  To enable this mode, add the following lines to your compose file:

-    This allows for easier management and higher performance. To do so, you can add those devices to your compose file:
+  ```yaml
+  environment:
+    DHCP: "Y"
+  devices:
+    - /dev/vhost-net
+  device_cgroup_rules:
+    - 'c *:* rwm'
+  ```

-    ```yaml
-    environment:
-      DEVICE: "/dev/sda"
-      DEVICE2: "/dev/sdb"
-    devices:
-      - /dev/sda
-      - /dev/sdb
-    ```
+  Please note that even if you don't need DHCP, it's still recommended to enable this mode, as it prevents NAT issues and increases performance by using a `macvtap` interface. You can just set a static IP from the DSM control panel afterwards.

-    Please beware that any existing data on the device will be wiped, as DSM will format its partition table during first use. So do NOT passthrough devices containing valueable data.
+* ### 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
+  environment:
+    GPU: "Y"
+  devices:
+    - /dev/dri
+  ```

-    ```yaml
-    environment:
-      URL: "https://global.synologydownload.com/download/DSM/release/7.0.1/42218/DSM_VirtualDSM_42218.pat"
-    ```
+  This can be used to enable the facial recognition function in Synology Photos for example.

-    With this method, it is even possible to switch between different versions while keeping all your file data intact.
+* ### 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 its download URL 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
+  environment:
+    URL: "https://global.synologydownload.com/download/DSM/release/7.0.1/42218/DSM_VirtualDSM_42218.pat"
+  ```

-    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. 
-    
-    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 between different versions while keeping all your file data intact.
+
+  If you don't have internet access, it's also possible to skip the download by setting URL to:
+
+  ```yaml
+  environment:
+    URL: "DSM_VirtualDSM_42218.pat"
+  ```
+
+  after placing a file called `DSM_VirtualDSM_42218.pat` in your `/storage` folder.
+
+* ### What are the differences compared to the standard DSM?
+
+  There are only two minor differences: the Virtual Machine Manager package is not available, and Surveillance Station will not include any free licenses.
+  
+* ### Is this project legal?
+
+  Yes, this project contains only open-source code and does not distribute any copyrighted material. Neither does it try to circumvent any copyright protection measures. So under all applicable laws, this project would be considered legal. 
+  
+  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

@@ -235,5 +261,5 @@ Only run this container on Synology hardware, any other use is not permitted by

 [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/kroese/virtual-dsm.svg?style=flat&label=pulls&logo=docker
+[Pulls]: https://img.shields.io/docker/pulls/vdsm/virtual-dsm.svg?style=flat&label=pulls&logo=docker
 [Version]: https://img.shields.io/docker/v/vdsm/virtual-dsm/latest?arch=amd64&sort=semver&color=066da5
--- a/src/check.sh
+++ b/src/check.sh
@@ -1,15 +1,18 @@
 #!/usr/bin/env bash
 set -Eeuo pipefail

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

 file="/run/shm/dsm.url"
 address="/run/shm/qemu.ip"

-[ ! -f  "$file" ] && echo "DSM has not enabled networking yet.." && exit 1
+[ ! -s  "$file" ] && echo "DSM has not enabled networking yet.." && exit 1

-location=$(cat "$file")
+location=$(<"$file")

 if ! curl -m 20 -ILfSs "http://$location/" > /dev/null; then

@@ -19,7 +22,7 @@ if ! curl -m 20 -ILfSs "http://$location/" > /dev/null; then
    echo "Failed to reach DSM at port $port"
  else
    echo "Failed to reach DSM at http://$location"
-    ip="$(cat "$address")"
+    ip=$(<"$address")
  fi

  echo "You might need to whitelist IP $ip in the DSM firewall." && exit 1
--- a/src/config.sh
+++ b/src/config.sh
@@ -2,9 +2,9 @@
 set -Eeuo pipefail

 DEF_OPTS="-nodefaults -boot strict=on"
-RAM_OPTS=$(echo "-m $RAM_SIZE" | sed 's/MB/M/g;s/GB/G/g;s/TB/T/g')
-CPU_OPTS="-cpu $CPU_MODEL -smp $CPU_CORES,sockets=1,dies=1,cores=$CPU_CORES,threads=1"
-MAC_OPTS="-machine type=q35,usb=off,dump-guest-core=off,hpet=off${KVM_OPTS}"
+RAM_OPTS=$(echo "-m ${RAM_SIZE^^}" | sed 's/MB/M/g;s/GB/G/g;s/TB/T/g')
+CPU_OPTS="-cpu $CPU_FLAGS -smp $CPU_CORES,sockets=1,dies=1,cores=$CPU_CORES,threads=1"
+MAC_OPTS="-machine type=q35,usb=off,vmport=off,dump-guest-core=off,hpet=off${KVM_OPTS}"
 DEV_OPTS="-device virtio-balloon-pci,id=balloon0,bus=pcie.0,addr=0x4"
 DEV_OPTS="$DEV_OPTS -object rng-random,id=objrng0,filename=/dev/urandom"
 DEV_OPTS="$DEV_OPTS -device virtio-rng-pci,rng=objrng0,id=rng0,bus=pcie.0,addr=0x1c"
@@ -12,4 +12,18 @@ DEV_OPTS="$DEV_OPTS -device virtio-rng-pci,rng=objrng0,id=rng0,bus=pcie.0,addr=0
 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
+
+RAM_AVAIL=$(free -b | grep -m 1 Mem: | awk '{print $7}')
+AVAIL_GB=$(( (RAM_AVAIL + 1073741823)/1073741824 ))
+
+if (( (RAM_WANTED + 500000000) > RAM_AVAIL )); then
+  error "Your configured RAM_SIZE of $WANTED_GB GB is higher than the $AVAIL_GB GB of memory available, please set a lower value."
+  exit 17
+fi
+
+if (( (RAM_WANTED + 1450000000) > RAM_AVAIL )); then
+  warn "your configured RAM_SIZE of $WANTED_GB GB is much too close to the $AVAIL_GB GB of memory available, please set a lower value."
+fi
+
 return 0
--- a/src/disk.sh
+++ b/src/disk.sh
@@ -3,18 +3,18 @@ set -Eeuo pipefail

 # Docker environment variables

-: ${DISK_IO:='native'}          # I/O Mode, can be set to 'native', 'threads' or 'io_turing'
-: ${DISK_FMT:='raw'}            # Disk file format, 'raw' by default for best performance
-: ${DISK_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.
-: ${DISK_ROTATION:='1'}         # Rotation rate, set to 1 for SSD storage and increase for HDD
+: "${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_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.
+: "${DISK_ROTATION:="1"}"         # Rotation rate, set to 1 for SSD storage and increase for HDD

 BOOT="$STORAGE/$BASE.boot.img"
 SYSTEM="$STORAGE/$BASE.system.img"

-[ ! -f "$BOOT" ] && error "Virtual DSM boot-image does not exist ($BOOT)" && exit 81
-[ ! -f "$SYSTEM" ] && error "Virtual DSM system-image does not exist ($SYSTEM)" && exit 82
+[ ! -s "$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

 DISK_OPTS="\
    -object iothread,id=io2 \
@@ -61,8 +61,8 @@ getSize() {
  local DISK_FILE=$1
  local DISK_EXT DISK_FMT

-  DISK_EXT="$(echo "${DISK_FILE//*./}" | sed 's/^.*\.//')"
-  DISK_FMT="$(ext2fmt "$DISK_EXT")"
+  DISK_EXT=$(echo "${DISK_FILE//*./}" | sed 's/^.*\.//')
+  DISK_FMT=$(ext2fmt "$DISK_EXT")

  case "${DISK_FMT,,}" in
    raw)
@@ -80,13 +80,23 @@ getSize() {
 isCow() {
  local FS=$1

-  if [[ "${FS,,}" == "xfs" || "${FS,,}" == "zfs" || "${FS,,}" == "btrfs" || "${FS,,}" == "bcachefs" ]]; then
+  if [[ "${FS,,}" == "btrfs" ]]; 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
@@ -112,7 +122,9 @@ createDisk() {
    fi
  fi

-  info "Creating a $DISK_TYPE $DISK_DESC image in $DISK_FMT format with a size of $DISK_SPACE..."
+  html "Creating a $DISK_DESC image..."
+  info "Creating a $DISK_SPACE $DISK_TYPE $DISK_DESC image in $DISK_FMT format..."
+
  local FAIL="Could not create a $DISK_TYPE $DISK_FMT $DISK_DESC image of $DISK_SPACE ($DISK_FILE)"

  case "${DISK_FMT,,}" in
@@ -195,7 +207,9 @@ resizeDisk() {
  fi

  local GB=$(( (CUR_SIZE + 1073741823)/1073741824 ))
-  info "Resizing $DISK_DESC from ${GB}G to $DISK_SPACE..."
+  MSG="Resizing $DISK_DESC from ${GB}G to $DISK_SPACE..."
+  info "$MSG" && html "$MSG"
+
  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
@@ -262,6 +276,7 @@ convertDisk() {
    fi
  fi

+  html "Converting $DISK_DESC to $DST_FMT..."
  info "Converting $DISK_DESC to $DST_FMT, please wait until completed..."

  local CONV_FLAGS="-p"
@@ -301,6 +316,7 @@ convertDisk() {
    fi
  fi

+  html "Conversion of $DISK_DESC completed..."
  info "Conversion of $DISK_DESC to $DST_FMT completed succesfully!"

  return 0
@@ -323,6 +339,10 @@ 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")
@@ -335,17 +355,39 @@ checkFS () {
  return 0
 }

-addDisk () {
+createDevice () {
+
  local DISK_ID=$1
-  local DISK_BASE=$2
-  local DISK_EXT=$3
-  local DISK_DESC=$4
-  local DISK_SPACE=$5
-  local DISK_INDEX=$6
-  local DISK_ADDRESS=$7
-  local DISK_FMT=$8
+  local DISK_FILE=$2
+  local DISK_INDEX=$3
+  local DISK_ADDRESS=$4
+  local DISK_FMT=$5
+  local DISK_IO=$6
+  local DISK_CACHE=$7
+
+  local result="-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"
+
+  result="$result \
+    -device virtio-scsi-pci,id=hw-$DISK_ID,iothread=io2,bus=pcie.0,addr=$DISK_ADDRESS \
+    -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"
+
+  echo "$result"
+  return 0
+}
+
+addDisk () {
+  local DISK_BASE=$1
+  local DISK_EXT=$2
+  local DISK_DESC=$3
+  local DISK_SPACE=$4
+  local DISK_INDEX=$5
+  local DISK_ADDRESS=$6
+  local DISK_FMT=$7
+  local DISK_IO=$8
+  local DISK_CACHE=$9
+  local DISK_ID="userdata$DISK_INDEX"
  local DISK_FILE="$DISK_BASE.$DISK_EXT"
-  local DIR DATA_SIZE FS PREV_FMT PREV_EXT CUR_SIZE
+  local DIR DATA_SIZE FS PREV_FMT PREV_EXT CUR_SIZE OPTS

  DIR=$(dirname "$DISK_FILE")
  [ ! -d "$DIR" ] && return 0
@@ -365,21 +407,26 @@ addDisk () {
  FS=$(stat -f -c %T "$DIR")
  checkFS "$FS" "$DISK_FILE" "$DISK_DESC" || exit $?

-  if ! [ -f "$DISK_FILE" ] ; then
+  if ! supportsDirect "$FS"; 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")"
+    PREV_EXT=$(fmt2ext "$PREV_FMT")

-    if [ -f "$DISK_BASE.$PREV_EXT" ] ; then
+    if [ -s "$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 [ -f "$DISK_FILE" ]; then
+  if [ -s "$DISK_FILE" ]; then

    CUR_SIZE=$(getSize "$DISK_FILE")

@@ -393,34 +440,33 @@ addDisk () {

  fi

-  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"
+  OPTS=$(createDevice "$DISK_ID" "$DISK_FILE" "$DISK_INDEX" "$DISK_ADDRESS" "$DISK_FMT" "$DISK_IO" "$DISK_CACHE")
+  DISK_OPTS="$DISK_OPTS $OPTS"

  return 0
 }

 addDevice () {

-  local DISK_ID=$1
-  local DISK_DEV=$2
-  local DISK_DESC=$3
-  local DISK_INDEX=$4
-  local DISK_ADDRESS=$5
+  local DISK_DEV=$1
+  local DISK_DESC=$2
+  local DISK_INDEX=$3
+  local DISK_ADDRESS=$4
+  local DISK_ID="userdata$DISK_INDEX"

  [ -z "$DISK_DEV" ] && return 0
  [ ! -b "$DISK_DEV" ] && error "Device $DISK_DEV cannot be found! Please add it to the 'devices' section of your compose file." && exit 55

-  DISK_OPTS="$DISK_OPTS \
-    -device virtio-scsi-pci,id=hw-$DISK_ID,iothread=io2,bus=pcie.0,addr=$DISK_ADDRESS \
-    -drive file=$DISK_DEV,if=none,id=drive-$DISK_ID,format=raw,cache=$DISK_CACHE,aio=$DISK_IO,discard=$DISK_DISCARD,detect-zeroes=on \
-    -device scsi-hd,bus=hw-$DISK_ID.0,channel=0,scsi-id=0,lun=0,drive=drive-$DISK_ID,id=$DISK_ID,rotation_rate=$DISK_ROTATION,bootindex=$DISK_INDEX"
+  local OPTS
+  OPTS=$(createDevice "$DISK_ID" "$DISK_DEV" "$DISK_INDEX" "$DISK_ADDRESS" "raw" "$DISK_IO" "$DISK_CACHE")
+  DISK_OPTS="$DISK_OPTS $OPTS"

  return 0
 }

-DISK_EXT="$(fmt2ext "$DISK_FMT")" || exit $?
+html "Initializing disks..."
+
+DISK_EXT=$(fmt2ext "$DISK_FMT")

 if [ -z "$ALLOCATE" ]; then
  if [[ "${DISK_FMT,,}" == "raw" ]]; then
@@ -472,37 +518,49 @@ fi

 DISK4_FILE="/storage4/data4"

-: ${DISK2_SIZE:=''}
-: ${DISK3_SIZE:=''}
-: ${DISK4_SIZE:=''}
+: "${DISK2_SIZE:=""}"
+: "${DISK3_SIZE:=""}"
+: "${DISK4_SIZE:=""}"

-: ${DEVICE:=''}        # Docker variables to passthrough a block device, like /dev/vdc1.
-: ${DEVICE2:=''}
-: ${DEVICE3:=''}
-: ${DEVICE4:=''}
+: "${DEVICE:=""}"        # Docker variables to passthrough a block device, like /dev/vdc1.
+: "${DEVICE2:=""}"
+: "${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 "userdata" "$DEVICE" "device" "3" "0xc" || exit $?
+  addDevice "$DEVICE" "device" "3" "0xc" || exit $?
 else
-  addDisk "userdata" "$DISK1_FILE" "$DISK_EXT" "disk" "$DISK_SIZE" "3" "0xc" "$DISK_FMT" || exit $?
+  addDisk "$DISK1_FILE" "$DISK_EXT" "disk" "$DISK_SIZE" "3" "0xc" "$DISK_FMT" "$DISK_IO" "$DISK_CACHE" || exit $?
 fi

 if [ -n "$DEVICE2" ]; then
-  addDevice "userdata2" "$DEVICE2" "device2" "4" "0xd" || exit $?
+  addDevice "$DEVICE2" "device2" "4" "0xd" || exit $?
 else
-  addDisk "userdata2" "$DISK2_FILE" "$DISK_EXT" "disk2" "$DISK2_SIZE" "4" "0xd" "$DISK_FMT" || exit $?
+  addDisk "$DISK2_FILE" "$DISK_EXT" "disk2" "$DISK2_SIZE" "4" "0xd" "$DISK_FMT" "$DISK_IO" "$DISK_CACHE" || exit $?
 fi

 if [ -n "$DEVICE3" ]; then
-  addDevice "userdata3" "$DEVICE3" "device3" "5" "0xe" || exit $?
+  addDevice "$DEVICE3" "device3" "5" "0xe" || exit $?
 else
-  addDisk "userdata3" "$DISK3_FILE" "$DISK_EXT" "disk3" "$DISK3_SIZE" "5" "0xe" "$DISK_FMT" || exit $?
+  addDisk "$DISK3_FILE" "$DISK_EXT" "disk3" "$DISK3_SIZE" "5" "0xe" "$DISK_FMT" "$DISK_IO" "$DISK_CACHE" || exit $?
 fi

 if [ -n "$DEVICE4" ]; then
-  addDevice "userdata4" "$DEVICE4" "device4" "6" "0xf" || exit $?
+  addDevice "$DEVICE4" "device4" "6" "0xf" || exit $?
 else
-  addDisk "userdata4" "$DISK4_FILE" "$DISK_EXT" "disk4" "$DISK4_SIZE" "6" "0xf" "$DISK_FMT" || exit $?
+  addDisk "$DISK4_FILE" "$DISK_EXT" "disk4" "$DISK4_SIZE" "6" "0xf" "$DISK_FMT" "$DISK_IO" "$DISK_CACHE" || exit $?
 fi

+html "Initialized disks successfully..."
 return 0
--- a/src/display.sh
+++ b/src/display.sh
@@ -3,17 +3,20 @@ set -Eeuo pipefail

 # Docker environment variables

-: ${GPU:='N'}           # GPU passthrough
-: ${DISPLAY:='none'}  # Display type
+: "${GPU:="N"}"         # GPU passthrough
+: "${VGA:="virtio"}"    # VGA adaptor
+: "${DISPLAY:="none"}"  # Display type

 if [[ "$GPU" != [Yy1]* ]] || [[ "$ARCH" != "amd64" ]]; then

-  DISPLAY_OPTS="-display $DISPLAY -vga none"
+  [[ "${DISPLAY,,}" == "none" ]] && VGA="none"
+  DISPLAY_OPTS="-display $DISPLAY -vga $VGA"
  return 0

 fi

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

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

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

-echo "❯ Starting Virtual DSM for Docker v$(</run/version)..."
-echo "❯ For support visit https://github.com/vdsm/virtual-dsm"
+APP="Virtual DSM"
+SUPPORT="https://github.com/vdsm/virtual-dsm"

 cd /run

@@ -18,16 +18,19 @@ cd /run

 trap - ERR

+info "Booting ${APP}..."
+[[ "$DEBUG" == [Yy1]* ]] && echo "Arguments: $ARGS" && echo
+
 if [[ "$CONSOLE" == [Yy]* ]]; then
  exec qemu-system-x86_64 ${ARGS:+ $ARGS}
 fi

-[[ "$DEBUG" == [Yy1]* ]] && info "$VERS" && echo "Arguments: $ARGS" && echo
 { qemu-system-x86_64 ${ARGS:+ $ARGS} >"$QEMU_OUT" 2>"$QEMU_LOG"; rc=$?; } || :
-(( rc != 0 )) && error "$(cat "$QEMU_LOG")" && exit 15
+(( rc != 0 )) && error "$(<"$QEMU_LOG")" && exit 15

 terminal
 tail -fn +0 "$QEMU_LOG" 2>/dev/null &
 cat "$QEMU_TERM" 2>/dev/null & wait $! || :

-sleep 1 && finish 0
+sleep 1 & wait $!
+finish 0
--- a/src/install.sh
+++ b/src/install.sh
@@ -1,23 +1,37 @@
 #!/usr/bin/env bash
 set -Eeuo pipefail

-: ${URL:=''}    # URL of the PAT file to be downloaded.
+: "${URL:=""}"    # URL of the PAT file to be downloaded.

 if [ -f "$STORAGE/dsm.ver" ]; then
-  BASE=$(cat "$STORAGE/dsm.ver")
+  BASE=$(<"$STORAGE/dsm.ver")
+  [ -z "$BASE" ] && BASE="DSM_VirtualDSM_69057"
 else
  # Fallback for old installs
  BASE="DSM_VirtualDSM_42962"
 fi

-[ -n "$URL" ] && BASE=$(basename "$URL" .pat)
+if [ -n "$URL" ]; then
+  BASE=$(basename "$URL" .pat)
+  if [ ! -s "$STORAGE/$BASE.system.img" ]; then
+    BASE=$(basename "${URL%%\?*}" .pat)
+    : "${BASE//+/ }"; printf -v BASE '%b' "${_//%/\\x}"
+    BASE=$(echo "$BASE" | sed -e 's/[^A-Za-z0-9._-]/_/g')
+  fi
+  if [[ "${URL,,}" != "http"* ]]; then
+    if [ -s "$STORAGE/$BASE.pat" ]; then
+      URL="file://$STORAGE/$BASE.pat"
+    else
+      error "File $STORAGE/$BASE.pat does not exist!" && exit 65
+    fi
+  fi
+fi

-if [[ -f "$STORAGE/$BASE.boot.img" ]] && [[ -f "$STORAGE/$BASE.system.img" ]]; then
+if [[ -s "$STORAGE/$BASE.boot.img" ]] && [[ -s "$STORAGE/$BASE.system.img" ]]; then
  return 0  # Previous installation found
 fi

-# Display wait message
-/run/server.sh 5000 install &
+html "Please wait while Virtual DSM is being installed..."

 DL=""
 DL_CHINA="https://cndl.synology.cn/download/DSM"
@@ -34,7 +48,9 @@ fi

 [ -z "$URL" ] && URL="$DL/release/7.2.1/69057-1/DSM_VirtualDSM_69057.pat"

-BASE=$(basename "$URL" .pat)
+BASE=$(basename "${URL%%\?*}" .pat)
+: "${BASE//+/ }"; printf -v BASE '%b' "${_//%/\\x}"
+BASE=$(echo "$BASE" | sed -e 's/[^A-Za-z0-9._-]/_/g')

 if [[ "$URL" != "file://$STORAGE/$BASE.pat" ]]; then
  rm -f "$STORAGE/$BASE.pat"
@@ -57,7 +73,15 @@ if [[ "${FS,,}" == "fuse"* ]]; then
  info "Warning: the filesystem of $STORAGE is FUSE, this extra layer will negatively affect performance!"
 fi

-if [[ "${FS,,}" != "fat"* && "${FS,,}" != "vfat"* && "${FS,,}" != "exfat"* && "${FS,,}" != "ntfs"* && "${FS,,}" != "msdos"* ]]; then
+if [[ "${FS,,}" == "ecryptfs" ]] || [[ "${FS,,}" == "tmpfs" ]]; 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"
@@ -92,30 +116,65 @@ fi
 # Download the required files from the Synology website

 ROOT="Y"
+RD="$TMP/rd.gz"
 RDC="$STORAGE/dsm.rd"

-if [ ! -f "$RDC" ]; then
+if [ ! -s "$RDC" ] && [[ "$URL" == "file://"* ]] && [[ "${URL,,}" == *"_42218.pat" ]]; then

-  info "Install: Downloading installer..."
+  rm -f "$RD"
+  rm -f "$RDC"

-  RD="$TMP/rd.gz"
+  tar --extract --file="${URL:7}" --directory="$(dirname "$RD")"/. "$(basename "$RD")"
+  cp "$RD" "$RDC"
+
+fi
+
+if [ ! -s "$RDC" ]; then
+
+  rm -f "$RD"
+  rm -f "$RDC"
+
+  MSG="Downloading installer..."
+  PRG="Downloading installer ([P])..."
+  info "Install: $MSG" && html "$MSG"
+
+  SIZE=5394188
  POS="65627648-71021835"
  VERIFY="b4215a4b213ff5154db0488f92c87864"
  LOC="$DL/release/7.0.1/42218/DSM_VirtualDSM_42218.pat"
+  [[ "${URL,,}" == *"_42218.pat" ]] && LOC="$URL"

-  { curl -r "$POS" -sfk -S -o "$RD" "$LOC"; rc=$?; } || :
-  (( rc != 0 )) && error "Failed to download $LOC, reason: $rc" && exit 60
+  /run/progress.sh "$RD" "$SIZE" "$PRG" &
+  { curl -r "$POS" -sfk --connect-timeout 10 -S -o "$RD" "$LOC"; rc=$?; } || :

-  SUM=$(md5sum "$RD" | cut -f 1 -d " ")
+  fKill "progress.sh"
+
+  (( rc == 4 )) && error "Failed to download $LOC , network failure!" && exit 60
+
+  if (( rc != 0 )); then
+    if (( rc != 22 )) && (( rc != 56 )); then
+      error "Failed to download $LOC, reason: $rc" && exit 60
+    fi
+    SUM="skip"
+  else
+    SUM=$(md5sum "$RD" | cut -f 1 -d " ")
+  fi

  if [ "$SUM" != "$VERIFY" ]; then

    PAT="/install.pat"
-    rm "$RD"
+    SIZE=379637760
+
+    rm -f "$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
+    html "$MSG"
+    /run/progress.sh "$PAT" "$SIZE" "$PRG" &
+    { wget "$LOC" -O "$PAT" -q --no-check-certificate --timeout=10 --show-progress "$PROGRESS"; rc=$?; } || :
+
+    fKill "progress.sh"
+    (( rc == 4 )) && error "Failed to download $LOC , network failure!" && exit 60
+    (( rc != 0 )) && error "Failed to download $LOC , reason: $rc" && exit 60

    tar --extract --file="$PAT" --directory="$(dirname "$RD")"/. "$(basename "$RD")"
    rm "$PAT"
@@ -129,14 +188,14 @@ fi
 if [ -f "$RDC" ]; then

  { xz -dc <"$RDC" >"$TMP/rd" 2>/dev/null; rc=$?; } || :
-  (( rc != 1 )) && error "Failed to unxz $RDC, reason $rc" && exit 91
+  (( rc != 1 )) && error "Failed to unxz $RDC on $FS, reason $rc" && exit 91

  { (cd "$TMP" && cpio -idm <"$TMP/rd" 2>/dev/null); rc=$?; } || :

  if (( rc != 0 )); then
    ROOT="N"
    { (cd "$TMP" && fakeroot cpio -idmu <"$TMP/rd" 2>/dev/null); rc=$?; } || :
-    (( rc != 0 )) && error "Failed to extract $RDC, reason $rc" && exit 92
+    (( rc != 0 )) && error "Failed to extract $RDC on $FS, reason $rc" && exit 92
  fi

  rm -rf /run/extract && mkdir -p /run/extract
@@ -165,7 +224,11 @@ fi

 rm -rf "$TMP" && mkdir -p "$TMP"

-info "Install: Downloading $(basename "$URL")..."
+info "Install: Downloading $BASE.pat..."
+
+MSG="Downloading DSM..."
+PRG="Downloading DSM ([P])..."
+html "$MSG"

 PAT="/$BASE.pat"
 rm -f "$PAT"
@@ -176,12 +239,21 @@ if [[ "$URL" == "file://"* ]]; then

 else

-  { wget "$URL" -O "$PAT" -q --no-check-certificate --show-progress "$PROGRESS"; rc=$?; } || :
-  (( rc != 0 )) && error "Failed to download $URL, reason: $rc" && exit 69
+  SIZE=0
+  [[ "${URL,,}" == *"_69057.pat" ]] && SIZE=363837333
+  [[ "${URL,,}" == *"_42218.pat" ]] && SIZE=379637760
+
+  /run/progress.sh "$PAT" "$SIZE" "$PRG" &
+
+  { wget "$URL" -O "$PAT" -q --no-check-certificate --timeout=10 --show-progress "$PROGRESS"; rc=$?; } || :
+
+  fKill "progress.sh"
+  (( rc == 4 )) && error "Failed to download $URL , network failure!" && exit 69
+  (( rc != 0 )) && error "Failed to download $URL , reason: $rc" && exit 69

 fi

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

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

@@ -189,7 +261,8 @@ if ((SIZE<250000000)); then
  error "The specified PAT file is probably an update pack as it's too small." && exit 62
 fi

-info "Install: Extracting downloaded image..."
+MSG="Extracting downloaded image..."
+info "Install: $MSG" && html "$MSG"

 if { tar tf "$PAT"; } >/dev/null 2>&1; then

@@ -212,10 +285,12 @@ else
 fi

 rm -rf /run/extract
-info "Install: Preparing system partition..."
+
+MSG="Preparing system partition..."
+info "Install: $MSG" && html "$MSG"

 BOOT=$(find "$TMP" -name "*.bin.zip")
-[ ! -f "$BOOT" ] && error "The PAT file contains no boot image." && exit 67
+[ ! -s "$BOOT" ] && error "The PAT file contains no boot image." && exit 67

 BOOT=$(echo "$BOOT" | head -c -5)
 unzip -q -o "$BOOT".zip -d "$TMP"
@@ -236,11 +311,11 @@ if ! touch "$SYSTEM"; then
  error "Could not create file $SYSTEM for the system disk." && exit 98
 fi

-if [[ "${FS,,}" == "xfs" || "${FS,,}" == "zfs" || "${FS,,}" == "btrfs" || "${FS,,}" == "bcachefs" ]]; then
+if [[ "${FS,,}" == "btrfs" ]]; then
  { chattr +C "$SYSTEM"; } || :
  FA=$(lsattr "$SYSTEM")
  if [[ "$FA" != *"C"* ]]; then
-    error "Failed to disable COW for system image $SYSTEM on ${FS^^} filesystem (returned $FA)"
+    error "Failed to disable COW for system image $SYSTEM on ${FS^^} filesystem."
  fi
 fi

@@ -268,22 +343,23 @@ sfdisk -q "$SYSTEM" < "$PART"
 MOUNT="$TMP/system"
 rm -rf "$MOUNT" && mkdir -p "$MOUNT"

-info "Install: Extracting system partition..."
+MSG="Extracting system partition..."
+info "Install: $MSG" && html "$MSG"

 HDA="$TMP/hda1"
 IDB="$TMP/indexdb"
 PKG="$TMP/packages"
 HDP="$TMP/synohdpack_img"

-[ ! -f "$HDA.tgz" ] && error "The PAT file contains no OS image." && exit 64
+[ ! -s "$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-"*

-[ -f "$HDP.txz" ] && tar xpfJ "$HDP.txz" --absolute-names -C "$MOUNT/"
+[ -s "$HDP.txz" ] && tar xpfJ "$HDP.txz" --absolute-names -C "$MOUNT/"

-if [ -f "$IDB.txz" ]; then
+if [ -s "$IDB.txz" ]; then
  INDEX_DB="$MOUNT/usr/syno/synoman/indexdb/"
  mkdir -p "$INDEX_DB"
  tar xpfJ "$IDB.txz" --absolute-names -C "$INDEX_DB"
@@ -292,12 +368,13 @@ fi
 LABEL="1.44.1-42218"
 OFFSET="1048576" # 2048 * 512
 NUMBLOCKS="622560" # (4980480 * 512) / 4096
+MSG="Installing system partition..."

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

  tar xpfJ "$HDA.txz" --absolute-names --skip-old-files -C "$MOUNT/"

-  info "Install: Installing system partition..."
+  info "Install: $MSG" && html "$MSG"

  mke2fs -q -t ext4 -b 4096 -d "$MOUNT/" -L "$LABEL" -F -E "offset=$OFFSET" "$SYSTEM" "$NUMBLOCKS"

@@ -305,13 +382,12 @@ 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: Installing system partition...' '\E[0m\n';\
+        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"

 if [[ "$URL" == "file://$STORAGE/$BASE.pat" ]]; then
@@ -321,10 +397,10 @@ else
 fi

 mv -f "$BOOT" "$STORAGE/$BASE.boot.img"
-
 rm -rf "$TMP"

 { set +x; } 2>/dev/null
 [[ "$DEBUG" == [Yy1]* ]] && echo

+html "Installation finished successfully..."
 return 0
--- a/src/network.sh
+++ b/src/network.sh
@@ -3,17 +3,19 @@ set -Eeuo pipefail

 # Docker environment variables

-: ${DHCP:='N'}
-: ${MAC:='02:11:32:AA:BB:CC'}
+: "${MAC:=""}"
+: "${DHCP:="N"}"
+: "${NETWORK:="Y"}"
+: "${HOST_PORTS:=""}"

-: ${VM_NET_DEV:=''}
-: ${VM_NET_TAP:='dsm'}
-: ${VM_NET_MAC:="$MAC"}
-: ${VM_NET_HOST:='VirtualDSM'}
+: "${VM_NET_DEV:=""}"
+: "${VM_NET_TAP:="dsm"}"
+: "${VM_NET_MAC:="$MAC"}"
+: "${VM_NET_HOST:="VirtualDSM"}"

-: ${DNSMASQ_OPTS:=''}
-: ${DNSMASQ:='/usr/sbin/dnsmasq'}
-: ${DNSMASQ_CONF_DIR:='/etc/dnsmasq.d'}
+: "${DNSMASQ_OPTS:=""}"
+: "${DNSMASQ:="/usr/sbin/dnsmasq"}"
+: "${DNSMASQ_CONF_DIR:="/etc/dnsmasq.d"}"

 ADD_ERR="Please add the following setting to your container:"

@@ -23,17 +25,23 @@ ADD_ERR="Please add the following setting to your container:"

 configureDHCP() {

-  # Create a macvtap network for the VM guest
+  # 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
  { ip link add link "$VM_NET_DEV" name "$VM_NET_TAP" address "$VM_NET_MAC" type macvtap mode bridge ; rc=$?; } || :

  if (( rc != 0 )); then
-    error "Cannot create macvtap interface. Please make sure the network type is 'macvlan' and not 'ipvlan',"
-    error "and that the NET_ADMIN capability has been added to the container: --cap-add NET_ADMIN" && exit 16
+    error "Cannot create macvtap interface. Please make sure that the network type is 'macvlan' and not 'ipvlan',"
+    error "that your kernel is recent (>4) and supports it, and that the container has the NET_ADMIN capability set." && exit 16
  fi

  while ! ip link set "$VM_NET_TAP" up; do
-    info "Waiting for address to become available..."
+    info "Waiting for MAC address $VM_NET_MAC to become available..."
    sleep 2
  done

@@ -80,16 +88,37 @@ configureDNS() {

  # Set DNS server and gateway
  DNSMASQ_OPTS="$DNSMASQ_OPTS --dhcp-option=option:dns-server,${VM_NET_IP%.*}.1 --dhcp-option=option:router,${VM_NET_IP%.*}.1"
-  DNSMASQ_OPTS=$(echo "$DNSMASQ_OPTS" | sed 's/\t/ /g' | tr -s ' ' | sed 's/^ *//')

+  # Add DNS entry for container
+  DNSMASQ_OPTS="$DNSMASQ_OPTS --address=/host.lan/${VM_NET_IP%.*}.1"
+
+  DNSMASQ_OPTS=$(echo "$DNSMASQ_OPTS" | sed 's/\t/ /g' | tr -s ' ' | sed 's/^ *//')
  [[ "$DEBUG" == [Yy1]* ]] && set -x
-  $DNSMASQ ${DNSMASQ_OPTS:+ $DNSMASQ_OPTS}
+
+  if ! $DNSMASQ ${DNSMASQ_OPTS:+ $DNSMASQ_OPTS}; then
+    error "Failed to start dnsmasq, reason: $?" && exit 29
+  fi
  { set +x; } 2>/dev/null
  [[ "$DEBUG" == [Yy1]* ]] && echo

  return 0
 }

+getPorts() {
+
+  local list=$1
+
+  [ -z "$list" ] && echo "" && return 0
+
+  if [[ "$list" != *","* ]]; then
+    echo " ! --dport $list"
+  else
+    echo " -m multiport ! --dports $list"
+  fi
+
+  return 0
+}
+
 configureNAT() {

  # Create the necessary file structure for /dev/net/tun
@@ -101,21 +130,23 @@ configureNAT() {
  fi

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

+  local tables="The 'ip_tables' kernel module is not loaded. Try this command: sudo modprobe ip_tables iptable_nat"
+  local tuntap="The 'tun' kernel module is not available. Try this command: 'sudo modprobe tun' or run the container with 'privileged: true'."
+
  # Create a bridge with a static IP for the VM guest

  VM_NET_IP='20.20.20.21'
-  [[ "$DEBUG" == [Yy1]* ]] && set -x

  { ip link add dev dockerbridge type bridge ; rc=$?; } || :

@@ -126,15 +157,17 @@ configureNAT() {
  ip address add ${VM_NET_IP%.*}.1/24 broadcast ${VM_NET_IP%.*}.255 dev dockerbridge

  while ! ip link set dockerbridge up; do
-    info "Waiting for address to become available..."
+    info "Waiting for IP address to become available..."
    sleep 2
  done

  # QEMU Works with taps, set tap to the bridge created
-  ip tuntap add dev "$VM_NET_TAP" mode tap
+  if ! ip tuntap add dev "$VM_NET_TAP" mode tap; then
+    error "$tuntap" && exit 31
+  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

@@ -144,22 +177,27 @@ configureNAT() {
  update-alternatives --set iptables /usr/sbin/iptables-legacy > /dev/null
  update-alternatives --set ip6tables /usr/sbin/ip6tables-legacy > /dev/null

-  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"
+  exclude=$(getPorts "$HOST_PORTS")
+
+  if ! iptables -t nat -A POSTROUTING -o "$VM_NET_DEV" -j MASQUERADE; then
+    error "$tables" && exit 30
+  fi
+
+  # shellcheck disable=SC2086
+  iptables -t nat -A PREROUTING -i "$VM_NET_DEV" -d "$IP" -p tcp${exclude} -j DNAT --to "$VM_NET_IP"
  iptables -t nat -A PREROUTING -i "$VM_NET_DEV" -d "$IP" -p udp  -j DNAT --to "$VM_NET_IP"

  if (( 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 || true
+    iptables -A POSTROUTING -t mangle -p udp --dport bootpc -j CHECKSUM --checksum-fill > /dev/null 2>&1 || true
  fi

-  { set +x; } 2>/dev/null
-  [[ "$DEBUG" == [Yy1]* ]] && echo
-
  NET_OPTS="-netdev tap,ifname=$VM_NET_TAP,script=no,downscript=no,id=hostnet0"

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

  configureDNS

@@ -168,19 +206,28 @@ configureNAT() {

 closeNetwork() {

+  if [[ "$DHCP" == [Yy1]* ]]; then
+
+    # Shutdown nginx
+    nginx -s stop 2> /dev/null
+    fWait "nginx"
+
+  fi
+
+  [[ "$NETWORK" != [Yy1]* ]] && return 0
+
  exec 30<&- || true
  exec 40<&- || true

  if [[ "$DHCP" == [Yy1]* ]]; then

-    fKill "server.sh"
-
    ip link set "$VM_NET_TAP" down || true
    ip link delete "$VM_NET_TAP" || true

  else

-    fKill "dnsmasq"
+    local pid="/var/run/dnsmasq.pid"
+    [ -s "$pid" ] && pKill "$(<"$pid")"

    ip link set "$VM_NET_TAP" down promisc off || true
    ip link delete "$VM_NET_TAP" || true
@@ -193,6 +240,23 @@ closeNetwork() {
  return 0
 }

+checkOS() {
+
+  local name
+  local os=""
+  name=$(uname -a)
+
+  [[ "${name,,}" == *"darwin"* ]] && os="MacOS"
+  [[ "${name,,}" == *"microsoft"* ]] && os="Windows"
+
+  if [ -n "$os" ]; then
+    error "You are using Docker Desktop for $os which does not support macvlan, please revert to bridge networking!"
+    return 1
+  fi
+
+  return 0
+}
+
 getInfo() {

  if [ -z "$VM_NET_DEV" ]; then
@@ -206,14 +270,26 @@ getInfo() {
    error "$ADD_ERR -e \"VM_NET_DEV=NAME\" to specify another interface name." && exit 27
  fi

+  if [ -z "$VM_NET_MAC" ]; then
+    local file="$STORAGE/dsm.mac"
+    [ -s "$file" ] && VM_NET_MAC=$(<"$file")
+    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 r | grep default | awk '{print $3}')
@@ -227,36 +303,48 @@ getInfo() {
 #  Configure Network
 # ######################################

-fKill "server.sh"
-
-if [ ! -c /dev/vhost-net ]; then
-  if mknod /dev/vhost-net c 10 238; then
-    chmod 660 /dev/vhost-net
-  fi
+if [[ "$NETWORK" != [Yy1]* ]]; then
+  NET_OPTS=""
+  return 0
 fi

 getInfo
+html "Initializing network..."

 if [[ "$DEBUG" == [Yy1]* ]]; then
-  info "Container IP is $IP with gateway $GATEWAY on interface $VM_NET_DEV" && echo
+  info "Host: $HOST  IP: $IP  Gateway: $GATEWAY  Interface: $VM_NET_DEV  MAC: $VM_NET_MAC"
+  [ -f /etc/resolv.conf ] && grep '^nameserver*' /etc/resolv.conf
+  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 [[ "$DHCP" == [Yy1]* ]]; then

+  ! checkOS && exit 19
+
  if [[ "$GATEWAY" == "172."* ]]; then
-    if [[ "$DEBUG" != [Yy1]* ]]; then
-      error "You can only enable DHCP while the container is on a macvlan network!" && exit 26
-    fi
+    warn "your gateway IP starts with 172.* which is often a sign that you are not on a macvlan network (required for DHCP)!"
  fi

  # Configuration for DHCP IP
  configureDHCP

-  # Display IP on port 80 and 5000
-  /run/server.sh 5000 /run/ip.sh &
+  MSG="Booting DSM instance..."
+  html "$MSG"

 else

+  if [[ "$GATEWAY" != "172."* ]]; then
+    ! checkOS && exit 19
+  fi
+
+  # Shutdown nginx
+  nginx -s stop 2> /dev/null
+  fWait "nginx"
+
  # Configuration for static IP
  configureNAT

--- a/src/power.sh
+++ b/src/power.sh
@@ -10,10 +10,11 @@ API_HOST="127.0.0.1:2210"
 QEMU_TERM=""
 QEMU_PORT=7100
 QEMU_TIMEOUT=50
-QEMU_PID="/run/shm/qemu.pid"
-QEMU_LOG="/run/shm/qemu.log"
-QEMU_OUT="/run/shm/qemu.out"
-QEMU_END="/run/shm/qemu.end"
+QEMU_DIR="/run/shm"
+QEMU_PID="$QEMU_DIR/qemu.pid"
+QEMU_LOG="$QEMU_DIR/qemu.log"
+QEMU_OUT="$QEMU_DIR/qemu.out"
+QEMU_END="$QEMU_DIR/qemu.end"

 if [[ "$KVM" == [Nn]* ]]; then
  API_TIMEOUT=$(( API_TIMEOUT*2 ))
@@ -34,16 +35,18 @@ finish() {
  local pid
  local reason=$1

-  if [ -f "$QEMU_PID" ]; then
+  touch "$QEMU_END"

-    pid="$(cat "$QEMU_PID")"
+  if [ -s "$QEMU_PID" ]; then
+
+    pid=$(<"$QEMU_PID")
    echo && error "Forcefully terminating QEMU process, reason: $reason..."
    { kill -15 "$pid" || true; } 2>/dev/null

    while isAlive "$pid"; do
      sleep 1
      # Workaround for zombie pid
-      [ ! -f "$QEMU_PID" ] && break
+      [ ! -s "$QEMU_PID" ] && break
    done
  fi

@@ -62,10 +65,10 @@ terminal() {

  local dev=""

-  if [ -f "$QEMU_OUT" ]; then
+  if [ -s "$QEMU_OUT" ]; then

    local msg
-    msg="$(cat "$QEMU_OUT")"
+    msg=$(<"$QEMU_OUT")

    if [ -n "$msg" ]; then

@@ -98,7 +101,6 @@ terminal() {

 _graceful_shutdown() {

-  local cnt=0
  local code=$?
  local pid url response

@@ -112,12 +114,12 @@ _graceful_shutdown() {
  touch "$QEMU_END"
  echo && info "Received $1 signal, sending shutdown command..."

-  if [ ! -f "$QEMU_PID" ]; then
+  if [ ! -s "$QEMU_PID" ]; then
    echo && error "QEMU PID file does not exist?"
    finish "$code" && return "$code"
  fi

-  pid="$(cat "$QEMU_PID")"
+  pid=$(<"$QEMU_PID")

  if ! isAlive "$pid"; then
    echo && error "QEMU process does not exist?"
@@ -144,6 +146,8 @@ _graceful_shutdown() {

  fi

+  local cnt=0
+
  while [ "$cnt" -lt "$QEMU_TIMEOUT" ]; do

    ! isAlive "$pid" && break
@@ -154,7 +158,7 @@ _graceful_shutdown() {
    [[ "$DEBUG" == [Yy1]* ]] && info "Shutting down, waiting... ($cnt/$QEMU_TIMEOUT)"

    # Workaround for zombie pid
-    [ ! -f "$QEMU_PID" ] && break
+    [ ! -s "$QEMU_PID" ] && break

  done

@@ -167,6 +171,7 @@ _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
--- a/src/print.sh
+++ b/src/print.sh
@@ -1,21 +1,27 @@
 #!/usr/bin/env bash
 set -Eeuo pipefail

-: ${DHCP:='N'}
+: "${DHCP:="N"}"
+: "${NETWORK:="Y"}"
+
+[[ "$NETWORK" != [Yy1]* ]] && 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; }

 file="/run/shm/dsm.url"
+info="/run/shm/msg.html"
+page="/run/shm/index.html"
 address="/run/shm/qemu.ip"
 shutdown="/run/shm/qemu.end"
+template="/var/www/index.html"
 url="http://127.0.0.1:2210/read?command=10"

 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 [ ! -f  "$file" ]
+while [ ! -s  "$file" ]
 do

  # Check if not shutting down
@@ -24,7 +30,7 @@ do
  sleep 3

  [ -f "$shutdown" ] && exit 1
-  [ -f "$file" ] && break
+  [ -s "$file" ] && break

  # Retrieve network info from guest VM
  { json=$(curl -m 20 -sk "$url"); rc=$?; } || :
@@ -61,15 +67,28 @@ done

 [ -f "$shutdown" ] && exit 1

-location=$(cat "$file")
+location=$(<"$file")

 if [[ "$location" != "20.20"* ]]; then

  msg="http://$location"
+  title="<title>Virtual DSM</title>"
+  body="The location of DSM is <a href='http://$location'>http://$location</a>"
+  script="<script>setTimeout(function(){ window.location.assign('http://$location'); }, 3000);</script>"
+
+  HTML=$(<"$template")
+  HTML="${HTML/\[1\]/$title}"
+  HTML="${HTML/\[2\]/$script}"
+  HTML="${HTML/\[3\]/$body}"
+  HTML="${HTML/\[4\]/}"
+  HTML="${HTML/\[5\]/}"
+
+  echo "$HTML" > "$page"
+  echo "$body" > "$info"

 else

-  ip="$(cat "$address")"
+  ip=$(<"$address")
  port="${location##*:}"

  if [[ "$ip" == "172."* ]]; then
@@ -85,3 +104,5 @@ info "-----------------------------------------------------------"
 info " You can now login to DSM at $msg"
 info "-----------------------------------------------------------"
 echo "" >&2
+
+exit 0
--- a/src/proc.sh
+++ b/src/proc.sh
@@ -3,12 +3,16 @@ set -Eeuo pipefail

 # Docker environment variables

-: ${KVM:='Y'}
-: ${HOST_CPU:=''}
-: ${CPU_MODEL:='host'}
-: ${CPU_FEATURES:='+ssse3,+sse4.1,+sse4.2'}
+: "${KVM:="Y"}"
+: "${HOST_CPU:=""}"
+: "${CPU_FLAGS:=""}"
+: "${CPU_MODEL:=""}"
+: "${DEF_MODEL:="qemu64"}"

-[ "$ARCH" != "amd64" ] && KVM="N"
+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

@@ -20,7 +24,8 @@ if [[ "$KVM" != [Nn]* ]]; then
    if ! sh -c 'echo -n > /dev/kvm' &> /dev/null; then
      KVM_ERR="(no write access)"
    else
-      if ! grep -q -e vmx -e svm /proc/cpuinfo; then
+      flags=$(sed -ne '/^flags/s/^.*: //p' /proc/cpuinfo)
+      if ! grep -qw "vmx\|svm" <<< "$flags"; then
        KVM_ERR="(vmx/svm disabled)"
      fi
    fi
@@ -28,39 +33,75 @@ if [[ "$KVM" != [Nn]* ]]; then

  if [ -n "$KVM_ERR" ]; then
    KVM="N"
-    error "KVM acceleration not detected $KVM_ERR, this will cause a major loss of performance."
-    error "See the FAQ on how to enable it, or continue without KVM by setting KVM=N (not recommended)."
-    [[ "$DEBUG" != [Yy1]* ]] && exit 88
+    if [[ "$OSTYPE" =~ ^darwin ]]; then
+      warn "you are using MacOS which has no KVM support, this will cause a major loss of performance."
+    else
+      if grep -qi Microsoft /proc/version; then
+        warn "you are using Windows 10 which has no KVM support, this will cause a major loss of performance."
+      else
+        error "KVM acceleration not available $KVM_ERR, this will cause a major loss of performance."
+        error "See the FAQ on how to enable it, or continue without KVM by setting KVM=N (not recommended)."
+        [[ "$DEBUG" != [Yy1]* ]] && exit 88
+      fi
+    fi
  fi

 fi

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

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

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

 else

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

-  if [[ "$CPU_MODEL" == "host"* ]]; then
+  if [[ "$ARCH" == "amd64" ]]; then
+    KVM_OPTS=" -accel tcg,thread=multi"
+  fi
+
+  if [ -z "$CPU_MODEL" ]; then
    if [[ "$ARCH" == "amd64" ]]; then
-      CPU_MODEL="max,$CPU_FEATURES"
+      CPU_MODEL="max"
+      CPU_FEATURES="$CPU_FEATURES,migratable=no"
    else
-      CPU_MODEL="qemu64,$CPU_FEATURES"
+      CPU_MODEL="$DEF_MODEL"
    fi
  fi

+  CPU_FEATURES="$CPU_FEATURES,+ssse3,+sse4.1,+sse4.2"
+
+fi
+
+if [ -z "$CPU_FLAGS" ]; then
+  if [ -z "$CPU_FEATURES" ]; then
+    CPU_FLAGS="$CPU_MODEL"
+  else
+    CPU_FLAGS="$CPU_MODEL,$CPU_FEATURES"
+  fi
+else
+  if [ -z "$CPU_FEATURES" ]; then
+    CPU_FLAGS="$CPU_MODEL,$CPU_FLAGS"
+  else
+    CPU_FLAGS="$CPU_MODEL,$CPU_FEATURES,$CPU_FLAGS"
+  fi
 fi

 if [ -z "$HOST_CPU" ]; then
-  HOST_CPU=$(lscpu | grep 'Model name' | cut -f 2 -d ":" | awk '{$1=$1}1' | sed 's# @.*##g' | sed s/"(R)"//g | sed 's/[^[:alnum:] ]\+/ /g' | sed 's/  */ /g')
+  HOST_CPU=$(lscpu | grep -m 1 'Model name' | cut -f 2 -d ":" | awk '{$1=$1}1' | sed 's# @.*##g' | sed s/"(R)"//g | sed 's/[^[:alnum:] ]\+/ /g' | sed 's/  */ /g')
 fi

 if [ -n "$HOST_CPU" ]; then
--- a/src/progress.sh
+++ b/src/progress.sh
@@ -0,0 +1,38 @@
+#!/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=$(printf '%.1f\n' "$((bytes*100*100/total))e-2")
+        size="$size%"
+      fi
+      echo "${body//(\[P\])/($size)}"> "$info"
+    fi
+  fi
+  sleep 1 & wait $!
+done
--- a/src/reset.sh
+++ b/src/reset.sh
@@ -1,50 +1,97 @@
 #!/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; }
+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
 [ "$(id -u)" -ne "0" ] && error "Script must be executed with root privileges." && exit 12

+echo "❯ Starting $APP for Docker v$(</run/version)..."
+echo "❯ For support visit $SUPPORT"
+
 # Docker environment variables

-: ${TZ:=''}             # System local timezone
-: ${DEBUG:='N'}         # Disable debugging mode
-: ${COUNTRY:=''}        # Country code for mirror
-: ${CONSOLE:='N'}       # Disable console mode
-: ${ALLOCATE:=''}       # Preallocate diskspace
-: ${ARGUMENTS:=''}      # Extra QEMU parameters
-: ${CPU_CORES:='1'}     # Amount of CPU cores
-: ${RAM_SIZE:='1G'}     # Maximum RAM amount
-: ${DISK_SIZE:='16G'}   # Initial data disk size
+: "${TZ:=""}"             # System local timezone
+: "${DEBUG:="N"}"         # Disable debugging mode
+: "${COUNTRY:=""}"        # Country code for mirror
+: "${CONSOLE:="N"}"       # Disable console mode
+: "${ALLOCATE:=""}"       # Preallocate diskspace
+: "${ARGUMENTS:=""}"      # Extra QEMU parameters
+: "${CPU_CORES:="1"}"     # Amount of CPU cores
+: "${RAM_SIZE:="1G"}"     # Maximum RAM amount
+: "${DISK_SIZE:="16G"}"   # Initial data disk size

 # Helper variables

-KERNEL=$(uname -r | cut -b 1)
-MINOR=$(uname -r | cut -d '.' -f2)
+PROCESS="${APP,,}"
+PROCESS="${PROCESS// /-}"
+
+STORAGE="/storage"
+INFO="/run/shm/msg.html"
+PAGE="/run/shm/index.html"
+TEMPLATE="/var/www/index.html"
+FOOTER1="$APP for Docker v$(</run/version)"
+FOOTER2="<a href='$SUPPORT'>$SUPPORT</a>"
+
+SYS=$(uname -r)
+HOST=$(hostname -s)
+KERNEL=$(echo "$SYS" | cut -b 1)
+MINOR=$(echo "$SYS" | cut -d '.' -f2)
 ARCH=$(dpkg --print-architecture)
-VERS=$(qemu-system-x86_64 --version | head -n 1 | cut -d '(' -f 1)
+CPU=$(lscpu | grep -m 1 'Model name' | cut -f 2 -d ":" | awk '{$1=$1}1' | sed 's# @.*##g' | sed s/"(R)"//g | sed 's/[^[:alnum:] ]\+/ /g' | sed 's/  */ /g')
+
+# Check system
+
+if [ ! -d "/dev/shm" ]; then
+  error "Directory /dev/shm not found!" && exit 14
+else
+  [ ! -d "/run/shm" ] && ln -s /dev/shm /run/shm
+fi

 # Check folder

-STORAGE="/storage"
 if [ ! -d "$STORAGE" ]; then
  error "Storage folder ($STORAGE) not found!" && exit 13
 fi

-if [ ! -d "/run/shm" ]; then
-  if [ -d "/dev/shm" ]; then
-    ln -s /dev/shm /run/shm
-  else
-    error "Folder /dev/shm not found!" && exit 14
-  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_AVAIL=$(free -b | grep -m 1 Mem: | awk '{print $7}')
+RAM_TOTAL=$(free -b | grep -m 1 Mem: | awk '{print $2}')
+RAM_SIZE=$(echo "${RAM_SIZE^^}" | sed 's/MB/M/g;s/GB/G/g;s/TB/T/g')
+RAM_WANTED=$(numfmt --from=iec "$RAM_SIZE")
+AVAIL_GB=$(( (RAM_AVAIL + 1073741823)/1073741824 ))
+TOTAL_GB=$(( (RAM_TOTAL + 1073741823)/1073741824 ))
+WANTED_GB=$(( (RAM_WANTED + 1073741823)/1073741824 ))
+
+# Print system info
+SYS="${SYS/-generic/}"
+FS="${FS/ext2\/ext3/ext4}"
+SPACE=$(df --output=avail -B 1 "$STORAGE" | tail -n 1)
+SPACE_GB=$(( (SPACE + 1073741823)/1073741824 ))
+
+echo "❯ CPU: ${CPU} | RAM: $AVAIL_GB/$TOTAL_GB GB | DISK: $SPACE_GB GB (${FS}) | HOST: ${SYS}..."
+echo
+
+# Check memory
+
+if (( (RAM_WANTED + 500000000) > RAM_AVAIL )); then
+  error "Your configured RAM_SIZE of $WANTED_GB GB is higher than the $AVAIL_GB GB of memory available, please set a lower value."
+  exit 17
 fi

 # Cleanup files
-rm -f /tmp/server.*
 rm -f /run/shm/qemu.*
 rm -f /run/shm/dsm.url

@@ -70,7 +117,17 @@ pKill() {
  { kill -15 "$pid" || true; } 2>/dev/null

  while isAlive "$pid"; do
-    sleep 0.1
+    sleep 0.2
+  done
+
+  return 0
+}
+
+fWait() {
+  local name=$1
+
+  while pgrep -f -l "$name" >/dev/null; do
+    sleep 0.2
  done

  return 0
@@ -80,14 +137,53 @@ fKill() {
  local name=$1

  { pkill -f "$name" || true; } 2>/dev/null
-
-  while pgrep -f -l "$name" >/dev/null; do
-    sleep 0.1
-  done
+  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
@@ -133,7 +229,8 @@ addPackage() {
    return 0
  fi

-  info "Installing $desc..."
+  MSG="Installing $desc..."
+  info "$MSG" && html "$MSG"

  [ -z "$COUNTRY" ] && setCountry

@@ -147,4 +244,9 @@ addPackage() {
  return 0
 }

+# Start webserver
+cp -r /var/www/* /run/shm
+html "Starting $APP for Docker..."
+nginx -e stderr
+
 return 0
--- a/src/serial.sh
+++ b/src/serial.sh
@@ -3,11 +3,26 @@ set -Eeuo pipefail

 # Docker environment variables

-: ${HOST_MAC:=''}
-: ${HOST_DEBUG:=''}
-: ${HOST_SERIAL:=''}
-: ${HOST_MODEL:=''}
-: ${GUEST_SERIAL:=''}
+: "${HOST_MAC:=""}"
+: "${HOST_DEBUG:=""}"
+: "${HOST_SERIAL:=""}"
+: "${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")
--- a/src/server.sh
+++ b/src/server.sh
@@ -1,66 +0,0 @@
-#!/usr/bin/env bash
-set -eu
-
-TMP_FILE=$(mktemp -q /tmp/server.XXXXXX)
-
-stop() {
-  trap - SIGINT EXIT
-  { pkill -f socat || true; } 2>/dev/null
-  [ -f "$TMP_FILE" ] && rm -f "$TMP_FILE"
-}
-
-trap 'stop' EXIT SIGINT SIGTERM SIGHUP
-
-html()
-{
-    local h="<!DOCTYPE html><HTML><HEAD><TITLE>VirtualDSM</TITLE>"
-    h="$h<STYLE>body { color: white; background-color: #125bdb; font-family: Verdana,"
-    h="$h Arial,sans-serif; } a, a:hover, a:active, a:visited { color: white; }</STYLE></HEAD>"
-    h="$h<BODY><BR><BR><H1><CENTER>$1</CENTER></H1></BODY></HTML>"
-
-    echo "$h"
-}
-
-if [[ "$2" != "/"* ]]; then
-
-  BODY="$2"
-
-  if [[ "$BODY" == "install" ]]; then
-    BODY="Please wait while Virtual DSM is being installed..."
-    BODY="$BODY<script>setTimeout(() => { document.location.reload(); }, 9999);</script>"
-  fi
-
-  HTML=$(html "$BODY")
-  printf '%b' "HTTP/1.1 200 OK\nContent-Length: ${#HTML}\nConnection: close\n\n$HTML" > "$TMP_FILE"
-
-  socat TCP4-LISTEN:80,reuseaddr,fork,crlf SYSTEM:"cat $TMP_FILE" 2> /dev/null &
-  socat TCP4-LISTEN:"${1:-5000}",reuseaddr,fork,crlf SYSTEM:"cat $TMP_FILE" 2> /dev/null & wait $!
-
-  exit
-
-fi
-
-if [[ "$2" != "/run/ip.sh" ]]; then
-
-  cp "$2" "$TMP_FILE"
-
-else
-
-  BODY="The location of DSM is <a href='http://\$LOCATION'>http://\$LOCATION</a><script>"
-  BODY="$BODY setTimeout(function(){ window.location.assign('http://\$LOCATION'); }, 3000);</script>"
-  WAIT="Please wait while discovering IP...<script>setTimeout(() => { document.location.reload(); }, 4999);</script>"
-
-  HTML=$(html "xxx")
-
-  { echo "#!/bin/bash"
-    echo "[ -f \"/run/shm/dsm.url\" ] && LOCATION=\$(cat \"/run/shm/dsm.url\")"
-    echo "HTML=\"$HTML\"; [ -z \"\$LOCATION\" ] && BODY=\"$WAIT\" || BODY=\"$BODY\"; HTML=\${HTML/xxx/\$BODY}"
-    echo "printf '%b' \"HTTP/1.1 200 OK\\nContent-Length: \${#HTML}\\nConnection: close\\n\\n\$HTML\""
-  } > "$TMP_FILE"
-
-fi
-
-chmod +x "$TMP_FILE"
-
-socat TCP4-LISTEN:80,reuseaddr,fork,crlf SYSTEM:"$TMP_FILE" 2> /dev/null &
-socat TCP4-LISTEN:"${1:-5000}",reuseaddr,fork,crlf SYSTEM:"$TMP_FILE" 2> /dev/null & wait $!
--- a/web/css/style.css
+++ b/web/css/style.css
@@ -0,0 +1,167 @@
+body {
+	color: white;
+	background-color: #125bdb;
+	font-smoothing: antialiased;
+	-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 {
+	text-align: center;
+	padding: 20px;
+	margin-top: 50px;
+}
+
+footer {
+	width: 98%;
+	position: fixed;
+	bottom: 0px;
+	height: 40px;
+	text-align: center;
+	color: #0c8aeb;
+	text-shadow: 0 0 1px #0c8aeb;
+}
+
+#empty {
+	height: 40px;
+	/* Same height as footer */
+}
+
+a,
+a:hover,
+a:active,
+a:visited {
+	color: white;
+}
+
+footer a:link,
+footer a:visited,
+footer a:active {
+	color: #0c8aeb;
+}
+
+footer a:hover {
+	color: #73e6ff;
+}
+
+.loading:after {
+	content: " .";
+	animation: dots 1s steps(5, end) infinite;
+}
+
+@keyframes dots {
+
+	0%,
+	20% {
+		color: rgba(0, 0, 0, 0);
+		text-shadow: 0.25em 0 0 rgba(0, 0, 0, 0), 0.5em 0 0 rgba(0, 0, 0, 0);
+	}
+
+	40% {
+		color: white;
+		text-shadow: 0.25em 0 0 rgba(0, 0, 0, 0), 0.5em 0 0 rgba(0, 0, 0, 0);
+	}
+
+	60% {
+		text-shadow: 0.25em 0 0 white, 0.5em 0 0 rgba(0, 0, 0, 0);
+	}
+
+	80%,
+	100% {
+		text-shadow: 0.25em 0 0 white, 0.5em 0 0 white;
+	}
+}
+
+.spinner_LWk7 {
+	animation: spinner_GWy6 1.2s linear infinite, spinner_BNNO 1.2s linear infinite
+}
+
+.spinner_yOMU {
+	animation: spinner_GWy6 1.2s linear infinite, spinner_pVqn 1.2s linear infinite;
+	animation-delay: .15s
+}
+
+.spinner_KS4S {
+	animation: spinner_GWy6 1.2s linear infinite, spinner_6uKB 1.2s linear infinite;
+	animation-delay: .3s
+}
+
+.spinner_zVee {
+	animation: spinner_GWy6 1.2s linear infinite, spinner_Qw4x 1.2s linear infinite;
+	animation-delay: .45s
+}
+
+@keyframes spinner_GWy6 {
+
+	0%,
+	50% {
+		width: 9px;
+		height: 9px
+	}
+
+	10% {
+		width: 11px;
+		height: 11px
+	}
+}
+
+@keyframes spinner_BNNO {
+
+	0%,
+	50% {
+		x: 1.5px;
+		y: 1.5px
+	}
+
+	10% {
+		x: .5px;
+		y: .5px
+	}
+}
+
+@keyframes spinner_pVqn {
+
+	0%,
+	50% {
+		x: 13.5px;
+		y: 1.5px
+	}
+
+	10% {
+		x: 12.5px;
+		y: .5px
+	}
+}
+
+@keyframes spinner_6uKB {
+
+	0%,
+	50% {
+		x: 13.5px;
+		y: 13.5px
+	}
+
+	10% {
+		x: 12.5px;
+		y: 12.5px
+	}
+}
+
+@keyframes spinner_Qw4x {
+
+	0%,
+	50% {
+		x: 1.5px;
+		y: 13.5px
+	}
+
+	10% {
+		x: .5px;
+		y: 12.5px
+	}
+}
--- a/web/img/favicon.svg
+++ b/web/img/favicon.svg
@@ -0,0 +1 @@
+<svg id="Capa_1" enable-background="new 0 0 511.962 511.962" height="512" viewBox="0 0 511.962 511.962" width="512" xmlns="http://www.w3.org/2000/svg"><g><path d="m489.965 120.063c0-5.77-3.31-11.028-8.512-13.524l-218.984-105.063c-4.102-1.967-8.875-1.967-12.977 0l-218.985 105.063c-5.202 2.496-8.511 7.755-8.511 13.524l-.003 271.834c0 5.77 3.31 11.028 8.512 13.524l218.989 105.064c2.051.983 4.27 1.476 6.488 1.476 2.219 0 4.438-.492 6.488-1.476l218.989-105.064c5.202-2.496 8.512-7.755 8.512-13.524z" fill="#4e6ba6"/><path d="m489.965 120.063c0-5.77-3.31-11.028-8.512-13.524l-218.984-105.063c-2.051-.984-4.269-1.476-6.488-1.476v511.962c2.219 0 4.438-.492 6.488-1.476l218.989-105.064c5.202-2.496 8.512-7.755 8.512-13.524z" fill="#28487a"/><path d="m425.812 160.441c0-2.27-.519-4.457-1.457-6.432l-336.701-.095c-.967 1.999-1.504 4.22-1.504 6.526l-.002 191.081c0 5.769 3.31 11.028 8.512 13.524l154.833 74.285c2.051.983 4.27 1.476 6.488 1.476 2.219 0 4.438-.492 6.488-1.476l154.834-74.285c5.202-2.496 8.512-7.755 8.512-13.524z" fill="#8dc2eb"/><path d="m424.354 154.009h-168.373v286.798c2.219 0 4.438-.492 6.488-1.476l154.834-74.285c5.202-2.496 8.512-7.755 8.512-13.524l-.003-191.081c0-2.27-.52-4.458-1.458-6.432z" fill="#5e9ff6"/><path d="m417.3 146.916-154.831-74.284c-4.102-1.967-8.875-1.967-12.977 0l-154.831 74.284c-3.122 1.498-5.555 3.996-7.007 6.998l168.328 80.812 168.374-80.717c-1.448-3.044-3.9-5.579-7.056-7.093z" fill="#ecf9fd"/><path d="m417.3 146.916-154.831-74.284c-2.051-.983-4.27-1.476-6.488-1.476v163.569l168.374-80.717c-1.447-3.043-3.899-5.578-7.055-7.092z" fill="#d9f3fc"/></g></svg>
--- a/web/index.html
+++ b/web/index.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<html>
+
+    <head>
+        [1]
+        <meta http-equiv="Cache-Control" content="no-cache" />
+        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+        <link rel="stylesheet" type="text/css" href="/css/style.css" />
+        <link rel="icon" href="/img/favicon.svg" type="image/x-icon">
+        [2]
+    </head>
+
+    <body>
+        <div id="page">
+            <div id="content">
+                <svg id="spinner" width="64" height="64" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+                    <rect class="spinner_LWk7" fill="#0c8aeb" x="1.5" y="1.5" rx="1" width="9" height="9"/>
+                    <rect class="spinner_yOMU" fill="#0c8aeb" x="13.5" y="1.5" rx="1" width="9" height="9"/>
+                    <rect class="spinner_KS4S" fill="#0c8aeb" x="13.5" y="13.5" rx="1" width="9" height="9"/>
+                    <rect class="spinner_zVee" fill="#0c8aeb" x="1.5" y="13.5" rx="1" width="9" height="9"/>
+                </svg>
+                <h1 id="info">[3]</h1>
+            </div>
+            <div id="empty">
+            </div>
+            <footer id="footer">
+                [4]<br />
+                [5]
+            </footer>
+        </div>
+        <script type="text/javascript" src="/js/script.js"></script>
+    </body>
+
+</html>
--- a/web/js/script.js
+++ b/web/js/script.js
@@ -0,0 +1,130 @@
+var request;
+var interval = 1000;
+
+function getInfo() {
+
+    var url = "/msg.html";
+
+    try {
+
+        if (window.XMLHttpRequest) {
+            request = new XMLHttpRequest();
+        } else {
+            throw "XMLHttpRequest not available!";
+        }
+
+        request.onreadystatechange = processInfo;
+        request.open("GET", url, true);
+        request.send();
+
+    } catch (e) {
+        var err = "Error: " + e.message;
+        console.log(err);
+        setError(err);
+    }
+}
+
+function processInfo() {
+    try {
+        if (request.readyState != 4) {
+            return true;
+        }
+
+        var msg = request.responseText;
+        if (msg == null || msg.length == 0) {
+            setInfo("Booting DSM instance", true);
+            schedule();
+            return false;
+        }
+
+        var notFound = (request.status == 404);
+
+        if (request.status == 200) {
+            if (msg.toLowerCase().indexOf("<html>") !== -1) {
+                notFound = true;
+            } else {
+                if (msg.toLowerCase().indexOf("href=") !== -1) {
+                    var div = document.createElement("div");
+                    div.innerHTML = msg;
+                    var url = div.querySelector("a").href;
+                    setTimeout(() => {
+                        window.location.assign(url);
+                    }, 3000);
+                    setInfo(msg);
+                    return true;
+                } else {
+                    setInfo(msg);
+                    schedule();
+                    return true;
+                }
+            }
+        }
+
+        if (notFound) {
+            setInfo("Connecting to web portal", true);
+            reload();
+            return true;
+        }
+
+        setError("Error: Received statuscode " + request.status);
+        schedule();
+        return false;
+
+    } catch (e) {
+        var err = "Error: " + e.message;
+        console.log(err);
+        setError(err);
+        return false;
+    }
+}
+
+function setInfo(msg, loading, error) {
+
+    try {
+        if (msg == null || msg.length == 0) {
+            return false;
+        }
+
+        var el = document.getElementById("spinner");
+
+        error = !!error;
+        if (!error) {
+            el.style.visibility = 'visible';
+        } else {
+            el.style.visibility = 'hidden';
+        }
+
+        loading = !!loading;
+        if (loading) {
+            msg = "<p class=\"loading\">" + msg + "</p>";
+        }
+
+        el = document.getElementById("info");
+
+        if (el.innerHTML != msg) {
+            el.innerHTML = msg;
+        }
+
+        return true;
+
+    } catch (e) {
+        console.log("Error: " + e.message);
+        return false;
+    }
+}
+
+function setError(text) {
+    return setInfo(text, false, true);
+}
+
+function schedule() {
+    setTimeout(getInfo, interval);
+}
+
+function reload() {
+    setTimeout(() => {
+        document.location.reload();
+    }, 3000);
+}
+
+schedule();
--- a/web/nginx.conf
+++ b/web/nginx.conf
@@ -0,0 +1,31 @@
+server {
+    listen 80;
+    listen 5000 default_server;
+
+    autoindex on;
+    tcp_nodelay on;
+    server_tokens off;
+    absolute_redirect off;
+
+    error_log /dev/null;
+    access_log /dev/null;
+
+    include /etc/nginx/mime.types;
+
+    gzip on;
+    gzip_vary on;
+    gzip_proxied any;
+    gzip_comp_level 5;
+    gzip_min_length 500;
+    gzip_disable "msie6";
+    gzip_types text/css text/javascript text/xml text/plain text/x-component application/javascript application/json application/xml application/rss+xml font/truetype font/opentype application/vnd.ms-fontobject image/svg+xml;
+
+    add_header Cache-Control "no-cache";
+
+    location / {
+
+      root /run/shm;
+      index index.html;
+
+    }
+}
Author	SHA1	Message	Date
Kroese	b588f8c90d	feat: Display KVM warning on ARM64 (#739 )	2024-05-19 21:19:58 +02:00
Kroese	1f1007a0f1	fix: Display reason for network failure (#738 )	2024-05-17 16:09:47 +02:00
Kroese	2ec37e2802	docs: Docker CLI (#737 )	2024-05-16 03:22:58 +02:00
Slavik	3126b3847b	feat: Add Kubernetes manifest (#735 )	2024-05-16 01:42:58 +02:00
Kroese	41e0157e9d	docs: Update issue templates (#736 )	2024-05-16 01:12:16 +02:00
Kroese	1d64410849	docs: Update issue template (#734 )	2024-05-15 22:04:25 +02:00
Kroese	55034b0f40	feat: Additional disk device (#733 )	2024-05-15 17:56:12 +02:00
Kroese	acffcf3774	docs: Remove restart policy (#732 )	2024-05-15 17:23:09 +02:00
Kroese	fba0eb527b	docs: Remove version from compose (#731 )	2024-05-15 16:54:17 +02:00
Kroese	d9fc2714a6	build: Declare extra variable (#730 )	2024-05-13 04:02:25 +02:00
Kroese	d1f1772d74	build: Optimize Dockerfile (#729 )	2024-05-13 03:48:29 +02:00
Kroese	bf1d47e4f3	docs: Readme (#728 )	2024-05-12 20:55:50 +02:00
Kroese	3da564dfd1	feat: Support install from local PAT file (#727 )	2024-05-12 20:19:30 +02:00
Kroese	abd30b9d91	feat: Detect Windows and MacOS (#726 )	2024-05-11 22:11:11 +02:00
Kroese	c86408cbd6	fix: Additional pass-through mounts (#722 )	2024-05-08 23:23:17 +02:00
Kroese	1f51974c48	fix: Set download timeout (#719 )	2024-05-04 17:24:21 +02:00
Kroese	29f4cde296	feat: Show download percentage (#718 )	2024-05-04 16:34:30 +02:00
Kroese	c4a0035062	feat: Display RAM amount warning (#717 )	2024-05-03 11:18:20 +02:00
Kroese	6724ddbd7d	feat: Check the amount of RAM available (#716 )	2024-05-02 20:21:21 +02:00
Kroese	8d8ed63122	docs: Disk pass-through (#715 )	2024-05-01 11:57:56 +02:00
Kroese	6f4ea81907	feat: New disk pass-through method (#714 )	2024-05-01 00:13:26 +02:00
Kroese	6d162744ec	feat: Improved networking (#712 )	2024-04-30 00:30:44 +02:00
Kroese	145b4aab5b	docs: Update issue templates (#708 )	2024-04-26 16:53:15 +02:00
Kroese	2e4eb56d0b	fix: Curl error on Chinese mirror (#707 )	2024-04-26 16:32:08 +02:00
Kroese	39c019193e	fix: Curl error on Chinese mirror (#706 )	2024-04-26 16:30:30 +02:00
Kroese	faec563b4a	feat: Display kernel version (#704 )	2024-04-26 13:59:51 +02:00
Kroese	9840f8e07a	feat: Support ecryptfs filesystem (#703 )	2024-04-26 06:04:48 +02:00
Kroese	3a5895fa0f	build: Remove armv7 support (#702 )	2024-04-26 04:16:46 +02:00
Kroese	1bac5c8a7f	feat: Print system info (#701 )	2024-04-25 14:31:49 +02:00
Kroese	dd76c60e2a	fix: CPU detection (#697 )	2024-04-22 16:48:41 +02:00
Kroese	ac78cc7dc5	feat: Display system info on boot (#696 )	2024-04-22 16:29:23 +02:00
Kroese	66ac2d2002	docs: Update issue template (#692 )	2024-04-17 19:03:17 +02:00
Kroese	0bd099d704	docs: Update issue templates (#691 )	2024-04-17 18:32:43 +02:00
Kroese	d2dac3cfb4	docs: Add issue templates (#690 )	2024-04-17 18:14:51 +02:00
Kroese	e81dc0f31d	fix: Verify files are not empty (#689 )	2024-04-16 15:35:35 +02:00
Kroese	5015597183	fix: Ignore empty MAC address (#688 )	2024-04-13 23:33:17 +02:00
Kroese	64e2af9fa2	fix: Continue if file is missing (#682 )	2024-04-08 09:54:42 +02:00
Kroese	debb4b69fc	fix: Continue when range request fails (#680 )	2024-04-08 04:53:30 +02:00
Kroese	c6d3dda171	docs: Readme (#677 )	2024-04-07 01:59:50 +02:00
Kroese	7c0693c2ff	build: Update qemu-host to v2.04 (#670 )	2024-03-31 05:24:54 +02:00
Kroese	76355d4857	fix: TUN error message (#669 )	2024-03-31 04:57:56 +02:00
Kroese	404aaadefc	build: Dockerfile (#663 )	2024-03-25 16:49:25 +01:00
Kroese	be027e10be	fix: Disable IPv6 in Nginx (#662 )	2024-03-25 13:53:30 +01:00
Kroese	1c8cad92f8	fix: Disable kernel networking in bridge mode (#656 )	2024-03-12 01:50:43 +01:00
Kroese	fabb8ea3b7	docs: Readme (#650 )	2024-02-28 20:43:27 +01:00
Kroese	2ee4abca54	docs: Docker run command (#647 )	2024-02-28 08:51:55 +01:00
Kroese	5896928030	feat: Persistant MAC address (#646 )	2024-02-28 08:40:00 +01:00
Kroese	8652544982	docs: Readme (#638 )	2024-02-19 21:32:22 +01:00
Kroese	a70338ec3c	feat: Print filesystem on error (#635 )	2024-02-17 05:56:40 +01:00
Kroese	a84878abfc	fix: Detect Mac Journal filesystem (#634 )	2024-02-17 03:55:30 +01:00
Kroese	8421a391b7	fix: Prevent re-entry during shutdown (#633 )	2024-02-16 16:03:37 +01:00
Kroese	f9340ec3d6	docs: Readme (#630 )	2024-02-10 00:33:21 +01:00
Kroese	0cca9c5f83	feat: Disable CoW check on XFS (#629 )	2024-02-09 23:53:18 +01:00
Kroese	13d60b7f47	build: Notify after build (#628 )	2024-02-09 14:45:38 +01:00
Kroese	f74771a9cc	fix: Convert MAC address to uppercase (#627 )	2024-02-08 17:33:11 +01:00
Kroese	f24ba41930	fix: Convert dashes in custom MAC addresses (#626 )	2024-02-08 17:03:30 +01:00
Kroese	f412580a4a	feat: Add DNS entry for container (#624 )	2024-02-07 22:26:29 +01:00
Kroese	5cde1b4438	feat: Set process name (#623 )	2024-02-07 13:04:29 +01:00
Kroese	7cfb57b1bc	docs: Readme (#621 )	2024-02-05 16:18:13 +01:00
Kroese	a478b58f97	feat: Set KVM tick policy (#620 )	2024-02-05 12:09:12 +01:00
Kroese	8297f4f880	fix: Support CPU's without SSE4 (#619 )	2024-02-05 07:41:47 +01:00
Kroese	4c67343d33	feat: Enable L3 cache and multi-threaded TCG (#618 )	2024-02-04 19:25:22 +01:00
Kroese	53cc6998f0	fix: CPU features	2024-02-02 22:44:43 +01:00
Kroese	d857d71e0d	fix: Merge drive function (#614 )	2024-02-01 11:05:33 +01:00
Kroese	003c2766ce	docs: Readme (#613 )	2024-01-31 04:28:24 +01:00
Kroese	78594098cc	feat: Disable CoW check on ZFS (#612 )	2024-01-31 03:54:40 +01:00
Kroese	3c31bc91e4	feat: Generate unique MAC address (#611 )	2024-01-30 04:46:44 +01:00
Kroese	72141bab7a	build: Lint Dockerfile (#610 )	2024-01-29 11:51:28 +01:00
Kroese	bc52463aa4	fix: Process signal faster (#609 )	2024-01-29 05:54:22 +01:00
Kroese	9fa68908a9	feat: Show download progress (#608 )	2024-01-29 05:40:06 +01:00
Kroese	740dbec1b1	build: Exclude web folder (#607 )	2024-01-29 02:29:05 +01:00
Kroese	440d203730	fix: Stylesheet (#606 )	2024-01-29 02:27:04 +01:00
Kroese	1a83c67e2c	feat: Font smoothing (#605 )	2024-01-29 02:01:51 +01:00
Kroese	34a707a2a5	docs: Readme (#603 )	2024-01-27 19:51:26 +01:00
Kroese	cabb2cdfc9	docs: Readme (#602 )	2024-01-27 19:10:43 +01:00
Kroese	dc52ccf172	docs: Readme (#601 )	2024-01-27 19:06:10 +01:00
Kroese	bdd7fec3c3	fix: Space after URL (#600 )	2024-01-27 02:01:27 +01:00
Kroese	bd8b03d089	docs: Readme (#599 )	2024-01-26 06:29:15 +01:00
Kroese	a10588b0ce	fix: Check dnsmasq (#598 )	2024-01-26 02:19:31 +01:00
renovate[bot]	3503b86e12	chore(deps): update peter-evans/dockerhub-description action to v4 (#597 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2024-01-25 17:05:28 +01:00
Kroese	9e124980cd	fix: Disk message (#596 )	2024-01-25 17:02:50 +01:00
Kroese	675aa5e122	docs: Readme (#595 )	2024-01-23 21:49:18 +01:00
Kroese	2a62d4e938	feat: Display console arguments (#594 )	2024-01-23 19:32:15 +01:00
Kroese	9cbb51cc86	feat: Display QEMU version (#593 )	2024-01-23 19:29:07 +01:00
Kroese	7790f81d15	fix: Trap exit code (#592 )	2024-01-23 18:46:47 +01:00
Kroese	fdbff4879b	fix: Incorrect path (#591 )	2024-01-23 03:06:29 +01:00
Kroese	739e679a66	feat: Check for SHM (#590 )	2024-01-23 03:04:47 +01:00
Kroese	0dea507d85	feat: Shorter messages (#588 )	2024-01-23 00:15:11 +01:00
Kroese	4f524c47d8	docs: Readme (#587 )	2024-01-22 03:24:00 +01:00
Kroese	0c74201eb4	feat: CPU flags (#586 )	2024-01-21 20:52:53 +01:00
Kroese	1e13258bc9	feat: Dynamic page content (#585 )	2024-01-21 18:35:55 +01:00
Kroese	2c7cea042f	feat: Display progress via web (#584 )	2024-01-20 19:59:44 +01:00
Kroese	fc92b66ff4	fix: Echo (#583 )	2024-01-19 15:12:02 +01:00
Kroese	89ae24a2ac	feat: Add warning macro (#582 )	2024-01-19 15:10:40 +01:00
Kroese	bd4a23b287	docs: Readme (#581 )	2024-01-19 12:05:54 +01:00
Kroese	1b8c4d9f08	docs: Readme (#580 )	2024-01-19 12:01:31 +01:00
Kroese	a1187decb5	docs: Readme (#579 )	2024-01-19 08:09:49 +01:00
Kroese	b9d7aa182d	docs: Readme (#578 )	2024-01-19 07:50:07 +01:00
Kroese	b908c1118d	fix: Sanitize filename (#577 )	2024-01-19 04:17:09 +01:00
Kroese	fab776764f	fix: Strip query parameters from filename (#576 )	2024-01-19 03:04:26 +01:00
Kroese	f3e17e399d	feat: Custom VGA adaptor (#573 )	2024-01-17 19:42:30 +01:00
Kroese	3706ca873b	docs: Remove latest (#572 )	2024-01-15 13:58:23 +01:00
Kroese	10c565f32b	docs: Grammar (#571 )	2024-01-15 13:31:21 +01:00
Kroese	d237e5b9e6	docs: Disk passthrough (#570 )	2024-01-15 11:54:57 +01:00
Kroese	3c7e1ce12f	docs: DHCP mode (#568 )	2024-01-15 05:00:15 +01:00
Kroese	f422f64325	docs: Readme (#567 )	2024-01-14 21:22:13 +01:00
Kroese	df0656b345	docs: Readme (#566 )	2024-01-14 20:12:51 +01:00
Kroese	1fc9c56c8f	style: Quote variables (#565 )	2024-01-14 16:01:15 +01:00
Kroese	893a013ae9	style: Quote variables (#563 )	2024-01-14 01:11:58 +01:00
Kroese	6d3812d1d0	fix: Remove cat (#562 )	2024-01-14 00:37:36 +01:00
Kroese	6422aec780	fix: Remove cat (#561 )	2024-01-14 00:00:59 +01:00
				`@@ -0,0 +1 @@`
				<svg id="Capa_1" enable-background="new 0 0 511.962 511.962" height="512" viewBox="0 0 511.962 511.962" width="512" xmlns="http://www.w3.org/2000/svg"><g><path d="m489.965 120.063c0-5.77-3.31-11.028-8.512-13.524l-218.984-105.063c-4.102-1.967-8.875-1.967-12.977 0l-218.985 105.063c-5.202 2.496-8.511 7.755-8.511 13.524l-.003 271.834c0 5.77 3.31 11.028 8.512 13.524l218.989 105.064c2.051.983 4.27 1.476 6.488 1.476 2.219 0 4.438-.492 6.488-1.476l218.989-105.064c5.202-2.496 8.512-7.755 8.512-13.524z" fill="#4e6ba6"/><path d="m489.965 120.063c0-5.77-3.31-11.028-8.512-13.524l-218.984-105.063c-2.051-.984-4.269-1.476-6.488-1.476v511.962c2.219 0 4.438-.492 6.488-1.476l218.989-105.064c5.202-2.496 8.512-7.755 8.512-13.524z" fill="#28487a"/><path d="m425.812 160.441c0-2.27-.519-4.457-1.457-6.432l-336.701-.095c-.967 1.999-1.504 4.22-1.504 6.526l-.002 191.081c0 5.769 3.31 11.028 8.512 13.524l154.833 74.285c2.051.983 4.27 1.476 6.488 1.476 2.219 0 4.438-.492 6.488-1.476l154.834-74.285c5.202-2.496 8.512-7.755 8.512-13.524z" fill="#8dc2eb"/><path d="m424.354 154.009h-168.373v286.798c2.219 0 4.438-.492 6.488-1.476l154.834-74.285c5.202-2.496 8.512-7.755 8.512-13.524l-.003-191.081c0-2.27-.52-4.458-1.458-6.432z" fill="#5e9ff6"/><path d="m417.3 146.916-154.831-74.284c-4.102-1.967-8.875-1.967-12.977 0l-154.831 74.284c-3.122 1.498-5.555 3.996-7.007 6.998l168.328 80.812 168.374-80.717c-1.448-3.044-3.9-5.579-7.056-7.093z" fill="#ecf9fd"/><path d="m417.3 146.916-154.831-74.284c-2.051-.983-4.27-1.476-6.488-1.476v163.569l168.374-80.717c-1.447-3.043-3.899-5.578-7.055-7.092z" fill="#d9f3fc"/></g></svg>