feat: Add automatic device type (#749)

.github/ISSUE_TEMPLATE/1-issue.yml

@@ -0,0 +1,39 @@
+name: "\U0001F6A8 Technical issue"
+description: When you're experiencing problems using the container
+body:
+  - type: input
+    id: os
+    attributes:
+      label: Operating system
+      description: Your Linux distribution (can be shown by `lsb_release -a`).
+      placeholder: e.g. Ubuntu 24.04
+    validations:
+      required: true
+  - type: textarea
+    id: summary
+    attributes:
+      label: Description
+      description: A clear and concise description of your issue.
+    validations:
+      required: true
+  - type: textarea
+    id: compose
+    attributes:
+      label: Docker compose
+      description: The compose file (or otherwise the `docker run` command used).
+    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

.github/ISSUE_TEMPLATE/2-feature.yml

@@ -3,13 +3,6 @@ description: Suggest an idea for improving the container
 title: "[Feature]: "
 labels: ["enhancement"]
 body:
-  - type: checkboxes
-    attributes:
-      label: Is there an existing feature request for this?
-      description: Please search to see if the feature request already exists.
-      options:
-      - label: I have searched the existing feature requests
-        required: true
   - type: textarea
     id: problem
     attributes:

.github/ISSUE_TEMPLATE/3-bug.yml

@@ -0,0 +1,41 @@
+name: "\U0001F41E Bug report"
+description: Create a report to help us improve the container
+title: "[Bug]: "
+labels: ["bug"]
+body:
+  - type: input
+    id: os
+    attributes:
+      label: Operating system
+      description: Your Linux distribution (can be shown by `lsb_release -a`).
+      placeholder: e.g. Ubuntu 24.04
+    validations:
+      required: true
+  - type: textarea
+    id: summary
+    attributes:
+      label: Description
+      description: Describe the expected behaviour, the actual behaviour, and the steps to reproduce.
+    validations:
+      required: true
+  - type: textarea
+    id: compose
+    attributes:
+      label: Docker compose
+      description: The compose file (or otherwise the `docker run` command used).
+    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

.github/ISSUE_TEMPLATE/4-question.yml

@@ -1,5 +1,5 @@
-name: "? Question"
-description: General questions about the container
+name: "\U00002753 General question"
+description: Questions about the container not related to an issue
 title: "[Question]: "
 labels: ["question"]
 body:
@@ -13,7 +13,7 @@ body:
   - type: checkboxes
     attributes:
       label: Is this a general question and not a technical issue?
-      description: For technical issues you must use the [bug report](https://github.com/vdsm/virtual-dsm/issues/new?assignees=&labels=bug&projects=&template=BUG_REPORT.yml&title=%5BBug%5D%3A+) form instead. It contains all the right fields (system info, logfiles, etc.) we need in order to be able to help you.
+      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

.github/ISSUE_TEMPLATE/BUG_REPORT.yml

@@ -1,64 +0,0 @@
-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 an existing issue for this?
-      description: Please search to see if an issue already exists for the bug you encountered.
-      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 Linux 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 Docker version as shown by `docker -v`.
-      placeholder: e.g. Docker version 26.0.1, build d260a54
-    validations:
-      required: true
-  - type: textarea
-    id: summary
-    attributes:
-      label: Description
-      description: A clear and concise description of the problem.
-    validations:
-      required: true
-  - type: textarea
-    id: compose
-    attributes:
-      label: Docker compose
-      description: The Docker compose file (or otherwise `run` command).
-    validations:
-      required: true
-  - type: textarea
-    id: log
-    attributes:
-      label: Docker log
-      description: The Docker logfile of the container.
-    validations:
-      required: true
-  - type: textarea
-    id: screenshot
-    attributes:
-      label: Screenshots (optional)
-      description: Screenshots of the problem.
-    validations:
-      required: false

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1 @@
+blank_issues_enabled: false

Dockerfile

@@ -10,11 +10,13 @@ FROM qemux/qemu-host:2.04 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 && \
+RUN set -eu && extra="" && \
+    if [ "$TARGETPLATFORM" != "linux/amd64" ]; then extra="qemu-user"; fi && \
     apt-get update && \
     apt-get --no-install-recommends -y install \
         jq \
@@ -41,14 +43,13 @@ RUN if [ "$TARGETPLATFORM" != "linux/amd64" ]; then extra="qemu-user"; fi && \
     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 ./web /var/www/
-COPY --from=builder /qemu-host.bin /run/host.bin
-
-RUN chmod +x /run/*.sh && chmod +x /run/*.bin
-RUN mv /var/www/nginx.conf /etc/nginx/sites-enabled/web.conf 
+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
@@ -57,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"]

compose.yml

@@ -1,4 +1,3 @@
-version: "3"
 services:
     dsm:
         container_name: dsm
@@ -13,5 +12,4 @@ services:
             - 5000:5000
         volumes:
             - /var/dsm:/storage
-        restart: on-failure
         stop_grace_period: 2m

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

readme.md

@@ -24,7 +24,6 @@ Virtual DSM in a Docker container.
 Via Docker Compose:
 
 ```yaml
-version: "3"
 services:
   dsm:
     container_name: dsm
@@ -39,14 +38,19 @@ services:
       - 5000:5000
     volumes:
       - /var/dsm:/storage
-    restart: on-failure
     stop_grace_period: 2m
 ```
 
 Via Docker CLI:
 
 ```bash
-docker run -it --rm --name dsm -p 5000:5000 --device=/dev/kvm --cap-add NET_ADMIN --stop-timeout 120 vdsm/virtual-dsm
+docker run -it --rm -p 5000:5000 --device=/dev/kvm --cap-add NET_ADMIN --stop-timeout 120 vdsm/virtual-dsm
+```
+
+Via Kubernetes:
+
+```shell
+kubectl apply -f kubernetes.yml
 ```
 
 ## FAQ
@@ -111,12 +115,11 @@ docker run -it --rm --name dsm -p 5000:5000 --device=/dev/kvm --cap-add NET_ADMI
 
 * ### How do I pass-through a disk?
 
-   It is possible to pass-through disk devices directly by adding them to your compose file in this way:
+   It is possible to pass-through a disk device directly, by adding it to your compose file in this way:
 
   ```yaml
   devices:
     - /dev/disk/by-uuid/12345-12345-12345-12345-12345:/disk2
-    - /dev/disk/by-uuid/45678-45678-45678-45678-45678:/disk3
   ```
 
   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. 
@@ -125,11 +128,11 @@ docker run -it --rm --name dsm -p 5000:5000 --device=/dev/kvm --cap-add NET_ADMI
 
   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 increase the amount of CPU or RAM?
+* ### How do I change the amount of CPU or RAM?
 
-  By default, a single CPU core and 1 GB of RAM are allocated to the container.
+  By default, the container will be allowed to use a maximum of 1 CPU core and 1 GB of RAM.
 
-  If there arises a need to increase this, add the following environment variables:
+  If you want to adjust this, you can specify the desired amount using the following environment variables:
 
   ```yaml
   environment:
@@ -225,6 +228,15 @@ docker run -it --rm --name dsm -p 5000:5000 --device=/dev/kvm --cap-add NET_ADMI
 
   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.

src/config.sh

@@ -4,7 +4,7 @@ set -Eeuo pipefail
 DEF_OPTS="-nodefaults -boot strict=on"
 RAM_OPTS=$(echo "-m ${RAM_SIZE^^}" | sed 's/MB/M/g;s/GB/G/g;s/TB/T/g')
 CPU_OPTS="-cpu $CPU_FLAGS -smp $CPU_CORES,sockets=1,dies=1,cores=$CPU_CORES,threads=1"
-MAC_OPTS="-machine type=q35,usb=off,vmport=off,dump-guest-core=off,hpet=off${KVM_OPTS}"
+MAC_OPTS="-machine type=q35,smm=off,usb=off,vmport=off,dump-guest-core=off,hpet=off${KVM_OPTS}"
 DEV_OPTS="-device virtio-balloon-pci,id=balloon0,bus=pcie.0,addr=0x4"
 DEV_OPTS="$DEV_OPTS -object rng-random,id=objrng0,filename=/dev/urandom"
 DEV_OPTS="$DEV_OPTS -device virtio-rng-pci,rng=objrng0,id=rng0,bus=pcie.0,addr=0x1c"
@@ -14,16 +14,24 @@ 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_CHECK" != [Nn]* ]]; then
+
+  RAM_AVAIL=$(free -b | grep -m 1 Mem: | awk '{print $7}')
+  AVAIL_GB=$(( RAM_AVAIL/1073741824 ))
+
+  if (( (RAM_WANTED + RAM_SPARE) > RAM_AVAIL )); then
+    error "Your configured RAM_SIZE of $WANTED_GB GB is too high for the $AVAIL_GB GB of memory available, please set a lower value."
+    exit 17
+  fi
+
+  if (( (RAM_WANTED + (RAM_SPARE * 3)) > RAM_AVAIL )); then
+    warn "your configured RAM_SIZE of $WANTED_GB GB is very close to the $AVAIL_GB GB of memory available, please consider a lower value."
+  fi
 
-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."
+if [[ "$DEBUG" == [Yy1]* ]]; then
+  printf "Arguments:\n\n%s" "${ARGS// -/$'\n-'}" && echo
 fi
 
 return 0

src/disk.sh

@@ -5,6 +5,7 @@ set -Eeuo pipefail
 
 : "${DISK_IO:="native"}"          # I/O Mode, can be set to 'native', 'threads' or 'io_turing'
 : "${DISK_FMT:="raw"}"            # Disk file format, 'raw' by default for best performance
+: "${DISK_TYPE:=""}"              # Device type to be used, choose "ide", "usb", "blk" or "scsi"
 : "${DISK_FLAGS:=""}"             # Specifies the options for use with the qcow2 disk format
 : "${DISK_CACHE:="none"}"         # Caching mode, can be set to 'writeback' for better performance
 : "${DISK_DISCARD:="on"}"         # Controls whether unmap (TRIM) commands are passed to the host.
@@ -16,15 +17,6 @@ SYSTEM="$STORAGE/$BASE.system.img"
 [ ! -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 \
-    -device virtio-scsi-pci,id=hw-synoboot,iothread=io2,bus=pcie.0,addr=0xa \
-    -drive file=$BOOT,if=none,id=drive-synoboot,format=raw,cache=$DISK_CACHE,aio=$DISK_IO,discard=$DISK_DISCARD,detect-zeroes=on \
-    -device scsi-hd,bus=hw-synoboot.0,channel=0,scsi-id=0,lun=0,drive=drive-synoboot,id=synoboot0,rotation_rate=$DISK_ROTATION,bootindex=1 \
-    -device virtio-scsi-pci,id=hw-synosys,iothread=io2,bus=pcie.0,addr=0xb \
-    -drive file=$SYSTEM,if=none,id=drive-synosys,format=raw,cache=$DISK_CACHE,aio=$DISK_IO,discard=$DISK_DISCARD,detect-zeroes=on \
-    -device scsi-hd,bus=hw-synosys.0,channel=0,scsi-id=0,lun=0,drive=drive-synosys,id=synosys0,rotation_rate=$DISK_ROTATION,bootindex=2"
-
 fmt2ext() {
   local DISK_FMT=$1
 
@@ -123,9 +115,9 @@ createDisk() {
   fi
 
   html "Creating a $DISK_DESC image..."
-  info "Creating a $DISK_SPACE $DISK_TYPE $DISK_DESC image in $DISK_FMT format..."
+  info "Creating a $DISK_SPACE $DISK_STYLE $DISK_DESC image in $DISK_FMT format..."
 
-  local FAIL="Could not create a $DISK_TYPE $DISK_FMT $DISK_DESC image of $DISK_SPACE ($DISK_FILE)"
+  local FAIL="Could not create a $DISK_STYLE $DISK_FMT $DISK_DESC image of $DISK_SPACE ($DISK_FILE)"
 
   case "${DISK_FMT,,}" in
     raw)
@@ -210,7 +202,7 @@ resizeDisk() {
   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)"
+  local FAIL="Could not resize the $DISK_STYLE $DISK_FMT $DISK_DESC image from ${GB}G to $DISK_SPACE ($DISK_FILE)"
 
   case "${DISK_FMT,,}" in
     raw)
@@ -293,7 +285,7 @@ convertDisk() {
   # shellcheck disable=SC2086
   if ! qemu-img convert -f "$SOURCE_FMT" $CONV_FLAGS -o "$DISK_PARAM" -O "$DST_FMT" -- "$SOURCE_FILE" "$TMP_FILE"; then
     rm -f "$TMP_FILE"
-    error "Failed to convert $DISK_TYPE $DISK_DESC image to $DST_FMT format in $DIR, is there enough space available?" && exit 79
+    error "Failed to convert $DISK_STYLE $DISK_DESC image to $DST_FMT format in $DIR, is there enough space available?" && exit 79
   fi
 
   if [[ "$DST_FMT" == "raw" ]]; then
@@ -356,28 +348,52 @@ checkFS () {
 }
 
 createDevice () {
-
-  local DISK_ID=$1
-  local DISK_FILE=$2
+  local DISK_FILE=$1
+  local DISK_TYPE=$2
   local DISK_INDEX=$3
   local DISK_ADDRESS=$4
   local DISK_FMT=$5
   local DISK_IO=$6
   local DISK_CACHE=$7
+  local DISK_ID="data$DISK_INDEX"
 
-  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"
+  local index=""
+  [ -n "$DISK_INDEX" ] && index=",bootindex=$DISK_INDEX"
+  local result="-drive file=$DISK_FILE,id=$DISK_ID,format=$DISK_FMT,cache=$DISK_CACHE,aio=$DISK_IO,discard=$DISK_DISCARD,detect-zeroes=on"
 
-  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"
+  case "${DISK_TYPE,,}" in
+    "auto" )
+      echo "$result"
+      ;;
+    "usb" )
+      result="$result,if=none \
+      -device usb-storage,drive=${DISK_ID}${index}"
+      echo "$result"
+      ;;
+    "ide" )
+      result="$result,if=none \
+      -device ide-hd,drive=${DISK_ID},bus=ide.$DISK_INDEX,rotation_rate=$DISK_ROTATION${index}"
+      echo "$result"
+      ;;
+    "blk" | "virtio-blk" )
+      result="$result,if=none \
+      -device virtio-blk-pci,drive=${DISK_ID},scsi=off,bus=pcie.0,addr=$DISK_ADDRESS,iothread=io2${index}"
+      echo "$result"
+      ;;
+    "scsi" | "virtio-scsi" )
+      result="$result,if=none \
+      -device virtio-scsi-pci,id=${DISK_ID}b,bus=pcie.0,addr=$DISK_ADDRESS,iothread=io2 \
+      -device scsi-hd,drive=${DISK_ID},bus=${DISK_ID}b.0,channel=0,scsi-id=0,lun=0,rotation_rate=$DISK_ROTATION${index}"
+      echo "$result"
+      ;;
+  esac
 
-  echo "$result"
   return 0
 }
 
 addDisk () {
   local DISK_BASE=$1
-  local DISK_EXT=$2
+  local DISK_TYPE=$2
   local DISK_DESC=$3
   local DISK_SPACE=$4
   local DISK_INDEX=$5
@@ -385,9 +401,10 @@ addDisk () {
   local DISK_FMT=$7
   local DISK_IO=$8
   local DISK_CACHE=$9
-  local DISK_ID="userdata$DISK_INDEX"
+  local DISK_EXT DIR DATA_SIZE FS PREV_FMT PREV_EXT CUR_SIZE OPTS
+
+  DISK_EXT=$(fmt2ext "$DISK_FMT")
   local DISK_FILE="$DISK_BASE.$DISK_EXT"
-  local DIR DATA_SIZE FS PREV_FMT PREV_EXT CUR_SIZE OPTS
 
   DIR=$(dirname "$DISK_FILE")
   [ ! -d "$DIR" ] && return 0
@@ -440,25 +457,23 @@ addDisk () {
 
   fi
 
-  OPTS=$(createDevice "$DISK_ID" "$DISK_FILE" "$DISK_INDEX" "$DISK_ADDRESS" "$DISK_FMT" "$DISK_IO" "$DISK_CACHE")
+  OPTS=$(createDevice "$DISK_FILE" "$DISK_TYPE" "$DISK_INDEX" "$DISK_ADDRESS" "$DISK_FMT" "$DISK_IO" "$DISK_CACHE")
   DISK_OPTS="$DISK_OPTS $OPTS"
 
   return 0
 }
 
 addDevice () {
-
   local DISK_DEV=$1
-  local DISK_DESC=$2
+  local DISK_TYPE=$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
 
   local OPTS
-  OPTS=$(createDevice "$DISK_ID" "$DISK_DEV" "$DISK_INDEX" "$DISK_ADDRESS" "raw" "$DISK_IO" "$DISK_CACHE")
+  OPTS=$(createDevice "$DISK_DEV" "$DISK_TYPE" "$DISK_INDEX" "$DISK_ADDRESS" "raw" "$DISK_IO" "$DISK_CACHE")
   DISK_OPTS="$DISK_OPTS $OPTS"
 
   return 0
@@ -466,7 +481,11 @@ addDevice () {
 
 html "Initializing disks..."
 
-DISK_EXT=$(fmt2ext "$DISK_FMT")
+case "${DISK_TYPE,,}" in
+  "" ) DISK_TYPE="scsi" ;;
+  "auto" | "ide" | "usb" | "blk" | "scsi" ) ;;
+  * ) error "Invalid DISK_TYPE, value \"$DISK_TYPE\" is unrecognized!" && exit 80 ;;
+esac
 
 if [ -z "$ALLOCATE" ]; then
   if [[ "${DISK_FMT,,}" == "raw" ]]; then
@@ -477,13 +496,17 @@ if [ -z "$ALLOCATE" ]; then
 fi
 
 if [[ "$ALLOCATE" == [Nn]* ]]; then
-  DISK_TYPE="growable"
+  DISK_STYLE="growable"
   DISK_ALLOC="preallocation=off"
 else
-  DISK_TYPE="preallocated"
+  DISK_STYLE="preallocated"
   DISK_ALLOC="preallocation=falloc"
 fi
 
+DISK_OPTS=$(createDevice "$BOOT" "$DISK_TYPE" "1" "0xa" "raw" "$DISK_IO" "$DISK_CACHE")
+OPTS=$(createDevice "$SYSTEM" "$DISK_TYPE" "2" "0xb" "raw" "$DISK_IO" "$DISK_CACHE")
+DISK_OPTS="$DISK_OPTS $OPTS"
+
 DISK1_FILE="$STORAGE/data"
 if [[ ! -f "$DISK1_FILE.img" ]] && [[ -f "$STORAGE/data${DISK_SIZE}.img" ]]; then
   # Fallback for legacy installs
@@ -527,6 +550,7 @@ DISK4_FILE="/storage4/data4"
 : "${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"
@@ -538,28 +562,30 @@ DISK4_FILE="/storage4/data4"
 [ -z "$DEVICE4" ] && [ -b "/dev/disk4" ] && DEVICE4="/dev/disk4"
 
 if [ -n "$DEVICE" ]; then
-  addDevice "$DEVICE" "device" "3" "0xc" || exit $?
+  addDevice "$DEVICE" "$DISK_TYPE" "3" "0xc" || exit $?
 else
-  addDisk "$DISK1_FILE" "$DISK_EXT" "disk" "$DISK_SIZE" "3" "0xc" "$DISK_FMT" "$DISK_IO" "$DISK_CACHE" || exit $?
+  addDisk "$DISK1_FILE" "$DISK_TYPE" "disk" "$DISK_SIZE" "3" "0xc" "$DISK_FMT" "$DISK_IO" "$DISK_CACHE" || exit $?
 fi
 
 if [ -n "$DEVICE2" ]; then
-  addDevice "$DEVICE2" "device2" "4" "0xd" || exit $?
+  addDevice "$DEVICE2" "$DISK_TYPE" "4" "0xd" || exit $?
 else
-  addDisk "$DISK2_FILE" "$DISK_EXT" "disk2" "$DISK2_SIZE" "4" "0xd" "$DISK_FMT" "$DISK_IO" "$DISK_CACHE" || exit $?
+  addDisk "$DISK2_FILE" "$DISK_TYPE" "disk2" "$DISK2_SIZE" "4" "0xd" "$DISK_FMT" "$DISK_IO" "$DISK_CACHE" || exit $?
 fi
 
 if [ -n "$DEVICE3" ]; then
-  addDevice "$DEVICE3" "device3" "5" "0xe" || exit $?
+  addDevice "$DEVICE3" "$DISK_TYPE" "5" "0xe" || exit $?
 else
-  addDisk "$DISK3_FILE" "$DISK_EXT" "disk3" "$DISK3_SIZE" "5" "0xe" "$DISK_FMT" "$DISK_IO" "$DISK_CACHE" || exit $?
+  addDisk "$DISK3_FILE" "$DISK_TYPE" "disk3" "$DISK3_SIZE" "5" "0xe" "$DISK_FMT" "$DISK_IO" "$DISK_CACHE" || exit $?
 fi
 
 if [ -n "$DEVICE4" ]; then
-  addDevice "$DEVICE4" "device4" "6" "0xf" || exit $?
+  addDevice "$DEVICE4" "$DISK_TYPE" "6" "0xf" || exit $?
 else
-  addDisk "$DISK4_FILE" "$DISK_EXT" "disk4" "$DISK4_SIZE" "6" "0xf" "$DISK_FMT" "$DISK_IO" "$DISK_CACHE" || exit $?
+  addDisk "$DISK4_FILE" "$DISK_TYPE" "disk4" "$DISK4_SIZE" "6" "0xf" "$DISK_FMT" "$DISK_IO" "$DISK_CACHE" || exit $?
 fi
 
+DISK_OPTS="$DISK_OPTS -object iothread,id=io2"
+
 html "Initialized disks successfully..."
 return 0

src/entry.sh

@@ -19,7 +19,6 @@ cd /run
 trap - ERR
 
 info "Booting ${APP}..."
-[[ "$DEBUG" == [Yy1]* ]] && echo "Arguments: $ARGS" && echo
 
 if [[ "$CONSOLE" == [Yy]* ]]; then
   exec qemu-system-x86_64 ${ARGS:+ $ARGS}
@@ -33,4 +32,4 @@ tail -fn +0 "$QEMU_LOG" 2>/dev/null &
 cat "$QEMU_TERM" 2>/dev/null & wait $! || :
 
 sleep 1 & wait $!
-finish 0
+[ ! -f "$QEMU_END" ] && finish 0

src/install.sh

@@ -18,6 +18,13 @@ if [ -n "$URL" ]; then
     : "${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 [[ -s "$STORAGE/$BASE.boot.img" ]] && [[ -s "$STORAGE/$BASE.system.img" ]]; then
@@ -53,8 +60,6 @@ rm -f "$STORAGE/$BASE.agent"
 rm -f "$STORAGE/$BASE.boot.img"
 rm -f "$STORAGE/$BASE.system.img"
 
-[[ "$DEBUG" == [Yy1]* ]] && set -x
-
 # Check filesystem
 FS=$(stat -f -c %T "$STORAGE")
 
@@ -109,27 +114,41 @@ fi
 # Download the required files from the Synology website
 
 ROOT="Y"
+RD="$TMP/rd.gz"
 RDC="$STORAGE/dsm.rd"
 
+if [ ! -s "$RDC" ] && [[ "$URL" == "file://"* ]] && [[ "${URL,,}" == *"_42218.pat" ]]; then
+
+  rm -f "$RD"
+  rm -f "$RDC"
+
+  tar --extract --file="${URL:7}" --directory="$(dirname "$RD")"/. "$(basename "$RD")"
+  cp "$RD" "$RDC"
+
+fi
+
 if [ ! -s "$RDC" ]; then
 
+  rm -f "$RD"
+  rm -f "$RDC"
+
   MSG="Downloading installer..."
   PRG="Downloading installer ([P])..."
   info "Install: $MSG" && html "$MSG"
 
-  RD="$TMP/rd.gz"
   SIZE=5394188
   POS="65627648-71021835"
   VERIFY="b4215a4b213ff5154db0488f92c87864"
   LOC="$DL/release/7.0.1/42218/DSM_VirtualDSM_42218.pat"
+  [[ "${URL,,}" == *"_42218.pat" ]] && LOC="$URL"
 
-  rm -f "$RD"
-  rm -f "$RDC"
   /run/progress.sh "$RD" "$SIZE" "$PRG" &
   { curl -r "$POS" -sfk --connect-timeout 10 -S -o "$RD" "$LOC"; rc=$?; } || :
 
   fKill "progress.sh"
 
+  (( rc == 4 )) && error "Failed to download $LOC , network failure!" && exit 60
+
   if (( rc != 0 )); then
     if (( rc != 22 )) && (( rc != 56 )); then
       error "Failed to download $LOC, reason: $rc" && exit 60
@@ -152,6 +171,7 @@ if [ ! -s "$RDC" ]; then
     { 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")"
@@ -211,20 +231,22 @@ html "$MSG"
 PAT="/$BASE.pat"
 rm -f "$PAT"
 
-SIZE=0
-[[ "$URL" == *"DSM_VirtualDSM_69057.pat" ]] && SIZE=363837333
-
 if [[ "$URL" == "file://"* ]]; then
 
   cp "${URL:7}" "$PAT"
 
 else
 
+  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
@@ -375,8 +397,5 @@ 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

src/network.sh

@@ -11,6 +11,7 @@ set -Eeuo pipefail
 : "${VM_NET_DEV:=""}"
 : "${VM_NET_TAP:="dsm"}"
 : "${VM_NET_MAC:="$MAC"}"
+: "${VM_NET_IP:="20.20.20.21"}"
 : "${VM_NET_HOST:="VirtualDSM"}"
 
 : "${DNSMASQ_OPTS:=""}"
@@ -146,15 +147,13 @@ configureNAT() {
 
   # Create a bridge with a static IP for the VM guest
 
-  VM_NET_IP='20.20.20.21'
-
   { ip link add dev dockerbridge type bridge ; rc=$?; } || :
 
   if (( rc != 0 )); then
     error "Failed to create bridge. $ADD_ERR --cap-add NET_ADMIN" && exit 23
   fi
 
-  ip address add ${VM_NET_IP%.*}.1/24 broadcast ${VM_NET_IP%.*}.255 dev dockerbridge
+  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 IP address to become available..."
@@ -240,11 +239,33 @@ 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
+    # Give Kubernetes priority over the default interface
+    [ -d "/sys/class/net/net0" ] && VM_NET_DEV="net0"
+    [ -d "/sys/class/net/net1" ] && VM_NET_DEV="net1"
+    [ -d "/sys/class/net/net2" ] && VM_NET_DEV="net2"
+    [ -d "/sys/class/net/net3" ] && VM_NET_DEV="net3"
     # Automaticly detect the default network interface
-    VM_NET_DEV=$(awk '$2 == 00000000 { print $1 }' /proc/net/route)
+    [ -z "$VM_NET_DEV" ] && VM_NET_DEV=$(awk '$2 == 00000000 { print $1 }' /proc/net/route)
     [ -z "$VM_NET_DEV" ] && VM_NET_DEV="eth0"
   fi
 
@@ -275,7 +296,7 @@ getInfo() {
     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}')
+  GATEWAY=$(ip route list dev "$VM_NET_DEV" | awk ' /^default/ {print $3}')
   IP=$(ip address show dev "$VM_NET_DEV" | grep inet | awk '/inet / { print $2 }' | cut -f1 -d/)
   echo "$IP" > /run/shm/qemu.ip
 
@@ -306,8 +327,10 @@ fi
 
 if [[ "$DHCP" == [Yy1]* ]]; then
 
-  if [[ "$GATEWAY" == "172."* ]]; then
-    warn "your gateway IP starts with 172.* which is often a sign that you are not on a macvlan network (required for DHCP)!"
+  ! checkOS && [[ "$DEBUG" != [Yy1]* ]] && exit 19
+
+  if [[ "$IP" == "172."* ]]; then
+    warn "container IP starts with 172.* which is often a sign that you are not on a macvlan network (required for DHCP)!"
   fi
 
   # Configuration for DHCP IP
@@ -318,6 +341,10 @@ if [[ "$DHCP" == [Yy1]* ]]; then
 
 else
 
+  if [[ "$IP" != "172."* ]] && [[ "$IP" != "10.8"* ]] && [[ "$IP" != "10.9"* ]]; then
+    ! checkOS && [[ "$DEBUG" != [Yy1]* ]] && exit 19
+  fi
+
   # Shutdown nginx
   nginx -s stop 2> /dev/null
   fWait "nginx"

src/proc.sh

@@ -9,7 +9,10 @@ set -Eeuo pipefail
 : "${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
 
@@ -30,9 +33,17 @@ if [[ "$KVM" != [Nn]* ]]; then
 
   if [ -n "$KVM_ERR" ]; then
     KVM="N"
-    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
+    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

src/reset.sh

@@ -23,6 +23,7 @@ echo "❯ For support visit $SUPPORT"
 : "${ARGUMENTS:=""}"      # Extra QEMU parameters
 : "${CPU_CORES:="1"}"     # Amount of CPU cores
 : "${RAM_SIZE:="1G"}"     # Maximum RAM amount
+: "${RAM_CHECK:="Y"}"     # Check available RAM
 : "${DISK_SIZE:="16G"}"   # Initial data disk size
 
 # Helper variables
@@ -42,7 +43,8 @@ HOST=$(hostname -s)
 KERNEL=$(echo "$SYS" | cut -b 1)
 MINOR=$(echo "$SYS" | cut -d '.' -f2)
 ARCH=$(dpkg --print-architecture)
-CPU=$(lscpu | grep -m 1 'Model name' | cut -f 2 -d ":" | awk '{$1=$1}1' | sed 's# @.*##g' | sed s/"(R)"//g | sed 's/[^[:alnum:] ]\+/ /g' | sed 's/  */ /g')
+SOCKETS=$(lscpu | grep -m 1 -i 'socket(s)' | awk '{print $(2)}')
+CPU=$(lscpu | grep -m 1 -i 'model name' | cut -f 2 -d ":" | awk '{$1=$1}1' | sed 's# @.*##g' | sed s/"(R)"//g | sed 's/[^[:alnum:] ]\+/ /g' | sed 's/  */ /g')
 
 # Check system
 
@@ -67,11 +69,12 @@ if [[ "${FS,,}" == "ecryptfs" ]] || [[ "${FS,,}" == "tmpfs" ]]; then
 fi
 
 # Read memory
+RAM_SPARE=500000000
 RAM_AVAIL=$(free -b | grep -m 1 Mem: | awk '{print $7}')
 RAM_TOTAL=$(free -b | grep -m 1 Mem: | awk '{print $2}')
 RAM_SIZE=$(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 ))
+AVAIL_GB=$(( RAM_AVAIL/1073741824 ))
 TOTAL_GB=$(( (RAM_TOTAL + 1073741823)/1073741824 ))
 WANTED_GB=$(( (RAM_WANTED + 1073741823)/1073741824 ))
 
@@ -86,9 +89,11 @@ 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
+if [[ "$RAM_CHECK" != [Nn]* ]]; then
+  if (( (RAM_WANTED + RAM_SPARE) > RAM_AVAIL )); then
+    error "Your configured RAM_SIZE of $WANTED_GB GB is too high for the $AVAIL_GB GB of memory available, please set a lower value."
+    exit 17
+  fi
 fi
 
 # Cleanup files