fix: Remove non-printable characters (#949)

.devcontainer.json

@@ -0,0 +1,6 @@
+{
+  "name": "dsm",
+  "service": "dsm",
+  "forwardPorts": [5000],
+  "dockerComposeFile": "compose.yml"
+}

compose.yml

@@ -1,16 +1,17 @@
 services:
-    dsm:
+  dsm:
-        container_name: dsm
+    container_name: dsm
-        image: vdsm/virtual-dsm:latest
+    image: vdsm/virtual-dsm
-        environment:
+    environment:
-            DISK_SIZE: "16G"
+      DISK_SIZE: "16G"
-        devices:
+    devices:
-            - /dev/kvm
+      - /dev/kvm
-            - /dev/net/tun
+      - /dev/net/tun
-        cap_add:
+    cap_add:
-            - NET_ADMIN
+      - NET_ADMIN
-        ports:
+    ports:
-            - 5000:5000
+      - 5000:5000
-        volumes:
+    volumes:
-            - /var/dsm:/storage
+      - ./dsm:/storage
-        stop_grace_period: 2m
+    restart: always
+    stop_grace_period: 2m

kubernetes.yml

@@ -10,58 +10,68 @@ spec:
     requests:
       storage: 16Gi
 ---
-apiVersion: v1
+apiVersion: apps/v1
-kind: Pod
+kind: Deployment
 metadata:
   name: dsm
   labels:
     name: dsm
 spec:
-  containers:
+  replicas: 1
-  - name: dsm
+  selector:
-    image: vdsm/virtual-dsm
+    matchLabels:
-    env:
+      app: dsm
-    - name: RAM_SIZE
+  template:
-      value: "1G"
+    metadata:
-    - name: CPU_CORES
+      labels:
-      value: "1"
+        app: dsm
-    - name: DISK_SIZE
+    spec:
-      value: "16G"
+      containers:
-    ports:
+      - name: dsm
-    - containerPort: 5000
+        image: vdsm/virtual-dsm
-    securityContext:
+        env:
-      capabilities:
+        - name: DISK_SIZE
-        add:
+          value: "16G"
-        - NET_ADMIN
+        ports:
-      privileged: true
+          - containerPort: 5000
-    volumeMounts:
+            name: http
-    - mountPath: /storage
+            protocol: TCP
-      name: storage
+        securityContext:
-    - mountPath: /dev/kvm
+          capabilities:
-      name: dev-kvm
+            add:
-    - mountPath: /dev/net/tun
+            - NET_ADMIN
-      name: dev-tun
+          privileged: true
-  terminationGracePeriodSeconds: 120
+        volumeMounts:
-  volumes:
+        - mountPath: /storage
-  - name: storage
+          name: storage
-    persistentVolumeClaim:
+        - mountPath: /dev/kvm
-      claimName: dsm-pvc
+          name: dev-kvm
-  - hostPath:
+        - mountPath: /dev/net/tun
-      path: /dev/kvm
+          name: dev-tun
-    name: dev-kvm
+      terminationGracePeriodSeconds: 120
-  - hostPath:
+      volumes:
-      path: /dev/net/tun
+      - name: storage
-      type: CharDevice
+        persistentVolumeClaim:
-    name: dev-tun
+          claimName: dsm-pvc
+      - hostPath:
+          path: /dev/kvm
+        name: dev-kvm
+      - hostPath:
+          path: /dev/net/tun
+          type: CharDevice
+        name: dev-tun
 ---
 apiVersion: v1
 kind: Service
 metadata:
   name: dsm
 spec:
+  internalTrafficPolicy: Cluster
   ports:
-  - name: tcp-5000
+    - name: http
-    port: 5000
+      port: 5000
+      protocol: TCP
+      targetPort: 5000
   selector:
-    name: dsm
+    app: dsm
-  type: NodePort
+  type: ClusterIP

readme.md

@@ -22,7 +22,7 @@ Virtual DSM in a Docker container.
  
 ## Usage  🐳
 
-Via Docker Compose:
+##### Via Docker Compose:
 
 ```yaml
 services:
@@ -39,32 +39,26 @@ services:
     ports:
       - 5000:5000
     volumes:
-      - /var/dsm:/storage
+      - ./dsm:/storage
     restart: always
     stop_grace_period: 2m
 ```
 
-Via Docker CLI:
+##### Via Docker CLI:
 
 ```bash
-docker run -it --rm -p 5000:5000 --device=/dev/kvm --device=/dev/net/tun --cap-add NET_ADMIN --stop-timeout 120 vdsm/virtual-dsm
+docker run -it --rm --name dsm -p 5000:5000 --device=/dev/kvm --device=/dev/net/tun --cap-add NET_ADMIN -v ${PWD:-.}/dsm:/storage --stop-timeout 120 vdsm/virtual-dsm
 ```
 
-Via Kubernetes:
+##### Via Kubernetes:
 
 ```shell
 kubectl apply -f https://raw.githubusercontent.com/vdsm/virtual-dsm/refs/heads/master/kubernetes.yml
 ```
 
-## Compatibility ⚙️
+##### Via Github Codespaces:
 
-| **Product**  | **Platform**   | |
+[`Click here to launch this container in the cloud!`](https://github.com/codespaces/new?skip_quickstart=true&machine=basicLinux32gb&repo=619260050&ref=master&devcontainer_path=.devcontainer.json)
-|---|---|---|
-| Docker Engine | Linux| ✅ |
-| Docker Desktop | Linux | ❌ |
-| Docker Desktop | macOS | ❌ |
-| Docker Desktop | Windows 11 | ✅ |
-| Docker Desktop | Windows 10 | ❌ |
 
 ## FAQ 💬
 
@@ -72,9 +66,11 @@ kubectl apply -f https://raw.githubusercontent.com/vdsm/virtual-dsm/refs/heads/m
 
   Very simple! These are the steps:
   
-  - Start the container and connect to [port 5000](http://localhost:5000) using your web browser.
+  - Start the container and connect to [port 5000](http://127.0.0.1:5000/) using your web browser.
 
-  - Wait until DSM is ready, choose an username and password, and you will be taken to the desktop.
+  - Wait until DSM finishes its installation
+ 
+  - Choose an username and password, and you will be taken to the desktop.
   
   Enjoy your brand new NAS, and don't forget to star this repo!
 
@@ -84,10 +80,10 @@ kubectl apply -f https://raw.githubusercontent.com/vdsm/virtual-dsm/refs/heads/m
 
   ```yaml
   volumes:
-    - /var/dsm:/storage
+    - ./dsm:/storage
   ```
 
-  Replace the example path `/var/dsm` with the desired storage folder.
+  Replace the example path `./dsm` with the desired storage folder or named volume.
  
 ### How do I change the size of the disk?
 
@@ -103,7 +99,7 @@ kubectl apply -f https://raw.githubusercontent.com/vdsm/virtual-dsm/refs/heads/m
 
 ### How do I create a growable disk?
 
-  By default, the entire capacity of the disk is reserved in advance.
+  By default, the entire capacity of the disk will be reserved in advance.
 
   To create a growable disk that only allocates space that is actually used, add the following environment variable:
 
@@ -112,9 +108,6 @@ kubectl apply -f https://raw.githubusercontent.com/vdsm/virtual-dsm/refs/heads/m
     DISK_FMT: "qcow2"
   ```
 
-> [!NOTE]
-> This may reduce the write performance of the disk.
-
 ### How do I add multiple disks?
 
   To create additional disks, modify your compose file like this:
@@ -124,26 +117,27 @@ kubectl apply -f https://raw.githubusercontent.com/vdsm/virtual-dsm/refs/heads/m
     DISK2_SIZE: "32G"
     DISK3_SIZE: "64G"
   volumes:
-    - /home/example:/storage2
+    - ./example2:/storage2
-    - /mnt/data/example:/storage3
+    - ./example3:/storage3
   ```
 
 ### How do I pass-through a disk?
 
-   It is possible to pass-through a disk device directly, by adding it to your compose file in this way:
+   It is possible to pass-through a disk device directly, which can be useful when your host is a virtual machine, as it removes an extra layer and allows for easier management. For use with physical disks this method provides little advantage and is not recommended.
+   
+   You can add the virtual device to your compose file like this:
 
   ```yaml
   devices:
     - /dev/disk/by-uuid/12345-12345-12345-12345-12345:/disk2
   ```
 
+  The device needs to be totally empty (without any partition table) otherwise DSM does not always format it into a volume.
+  
   Make sure to bind the disk via its UUID (obtainable via `lsblk -o name,uuid`) instead of its name (`/dev/sdc`), to prevent ever binding the wrong disk when the drive letters happen to change. 
-
+ 
-> [!IMPORTANT]
-> The device needs to be totally empty (without any partition table) otherwise DSM does not always format it into a volume.
-
 > [!CAUTION]
-> Do NOT use this feature with the goal of sharing files from the host, they will all be lost without warning when DSM creates the volume.
+> Do NOT use this feature with the goal of sharing files from the host, they might all get lost without warning when DSM creates the volume.
 
 ### How do I change the amount of CPU or RAM?
 
@@ -159,9 +153,16 @@ kubectl apply -f https://raw.githubusercontent.com/vdsm/virtual-dsm/refs/heads/m
 
 ### How do I verify if my system supports KVM?
 
-  Only Linux and Windows 11 support KVM virtualization, macOS and Windows 10 do not unfortunately.
+  First check if your software is compatible using this chart:
-  
+
-  You can run the following commands in Linux to check your system:
+  | **Product**  | **Linux** | **Win11** | **Win10** | **macOS** |
+  |---|---|---|---|---|
+  | Docker CLI        | ✅   | ✅       | ❌        | ❌ |
+  | Docker Desktop    | ❌   | ✅       | ❌        | ❌ | 
+  | Podman CLI        | ✅   | ✅       | ❌        | ❌ | 
+  | Podman Desktop    | ✅   | ✅       | ❌        | ❌ | 
+
+  After that you can run the following commands in Linux to check your system:
 
   ```bash
   sudo apt install cpu-checker
@@ -176,11 +177,7 @@ kubectl apply -f https://raw.githubusercontent.com/vdsm/virtual-dsm/refs/heads/m
 
   - you are not using a cloud provider, as most of them do not allow nested virtualization for their VPS's.
 
-  If you do not receive any error from `kvm-ok` but the container still complains about KVM, please check whether:
+  If you did not receive any error from `kvm-ok` but the container still complains about a missing KVM device, it could help to add `privileged: true` to your compose file (or `sudo` to your `docker` command) to rule out any permission issue.
-
-  - you are not using "Docker Desktop for Linux" as it does not support KVM, instead make use of Docker Engine directly.
- 
-  - it could help to add `privileged: true` to your compose file (or `sudo` to your `docker run` command), to rule out any permission issue.
 
 ### How do I assign an individual IP address to the container?
 
@@ -245,33 +242,41 @@ kubectl apply -f https://raw.githubusercontent.com/vdsm/virtual-dsm/refs/heads/m
     - /dev/dri
   ```
 
-> [!TIP]
+> [!NOTE]
-> This can be used to enable the facial recognition function in Synology Photos for example.
+> This can be used to enable the facial recognition function in Synology Photos, but does not provide hardware transcoding for video.
 
 ### How do I install a specific version of vDSM?
 
-  By default, version 7.2 will be installed, but if you prefer an older version, you can add its download URL to your compose file as follows:
+  By default, version 7.2 will be installed, but if you prefer an older version, you can add the download URL of the `.pat` file to your compose file as follows:
 
   ```yaml
   environment:
     URL: "https://global.synologydownload.com/download/DSM/release/7.0.1/42218/DSM_VirtualDSM_42218.pat"
   ```
 
-  With this method, it is even possible to switch between different versions while keeping all your file data intact.
+  With this method, it is even possible to switch back and forth between versions while keeping your file data intact.
 
-  If you don't have internet access, it's also possible to skip the download by setting URL to:
+  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.
+  after placing a copy of [DSM_VirtualDSM_42218.pat](https://global.synologydownload.com/download/DSM/release/7.0.1/42218/DSM_VirtualDSM_42218.pat) in the root of your `/storage` folder.
 
 ### What are the differences compared to the standard DSM?
 
   There are only two minor differences: the Virtual Machine Manager package is not available, and Surveillance Station will not include any free licenses.
-  
+
+### How do I run Windows in a container?
+
+  You can use [dockur/windows](https://github.com/dockur/windows) for that. It shares many of the same features, and even has completely automatic installation.
+
+### How do I run a Linux desktop in a container?
+
+  You can use [qemus/qemu](https://github.com/qemus/qemu) in that case.
+
 ### Is this project legal?
 
   Yes, this project contains only open-source code and does not distribute any copyrighted material. Neither does it try to circumvent any copyright protection measures. So under all applicable laws, this project will be considered legal. 

src/config.sh

@@ -17,21 +17,27 @@ ARGS=$(echo "$ARGS" | sed 's/\t/ /g' | tr -s ' ')
 if [[ "$RAM_CHECK" != [Nn]* ]]; then
 
   RAM_AVAIL=$(free -b | grep -m 1 Mem: | awk '{print $7}')
-  AVAIL_GB=$(( RAM_AVAIL/1073741824 ))
+  AVAIL_MEM=$(formatBytes "$RAM_AVAIL")
 
   if (( (RAM_WANTED + RAM_SPARE) > RAM_AVAIL )); then
-    error "Your configured RAM_SIZE of $WANTED_GB GB is too high for the $AVAIL_GB GB of memory available, please set a lower value."
+    msg="Your configured RAM_SIZE of ${RAM_SIZE/G/ GB} is too high for the $AVAIL_MEM of memory available, please set a lower value."
-    exit 17
+    [[ "${FS,,}" != "zfs" ]] && error "$msg" && exit 17
-  fi
+    info "$msg"
-
+  else
-  if (( (RAM_WANTED + (RAM_SPARE * 3)) > RAM_AVAIL )); then
+    if (( (RAM_WANTED + (RAM_SPARE * 3)) > RAM_AVAIL )); then
-    warn "your configured RAM_SIZE of $WANTED_GB GB is very close to the $AVAIL_GB GB of memory available, please consider a lower value."
+      msg="your configured RAM_SIZE of ${RAM_SIZE/G/ GB} is very close to the $AVAIL_MEM of memory available, please consider a lower value."
+      if [[ "${FS,,}" != "zfs" ]]; then
+        warn "$msg"
+      else
+        info "$msg"
+      fi
+    fi
   fi
 
 fi
 
 if [[ "$DEBUG" == [Yy1]* ]]; then
-  printf "Arguments:\n\n%s" "${ARGS// -/$'\n-'}" && echo
+  printf "Arguments:\n\n%s\n\n" "${ARGS// -/$'\n-'}"
 fi
 
 return 0

src/disk.sh

@@ -96,7 +96,7 @@ createDisk() {
   local DISK_DESC=$3
   local DISK_FMT=$4
   local FS=$5
-  local DATA_SIZE DIR SPACE FA
+  local DATA_SIZE DIR SPACE GB FA
 
   DATA_SIZE=$(numfmt --from=iec "$DISK_SPACE")
 
@@ -109,16 +109,16 @@ createDisk() {
     SPACE=$(df --output=avail -B 1 "$DIR" | tail -n 1)
 
     if (( DATA_SIZE > SPACE )); then
-      local SPACE_GB=$(( (SPACE + 1073741823)/1073741824 ))
+      GB=$(formatBytes "$SPACE")
-      error "Not enough free space to create a $DISK_DESC of $DISK_SPACE in $DIR, it has only $SPACE_GB GB available..."
+      error "Not enough free space to create a $DISK_DESC of ${DISK_SPACE/G/ GB} in $DIR, it has only $GB available..."
       error "Please specify a smaller ${DISK_DESC^^}_SIZE or disable preallocation by setting ALLOCATE=N." && exit 76
     fi
   fi
 
   html "Creating a $DISK_DESC image..."
-  info "Creating a $DISK_SPACE $DISK_STYLE $DISK_DESC image in $DISK_FMT format..."
+  info "Creating a ${DISK_SPACE/G/ GB} $DISK_STYLE $DISK_DESC image in $DISK_FMT format..."
 
-  local FAIL="Could not create a $DISK_STYLE $DISK_FMT $DISK_DESC image of $DISK_SPACE ($DISK_FILE)"
+  local FAIL="Could not create a $DISK_STYLE $DISK_FMT $DISK_DESC image of ${DISK_SPACE/G/ GB} ($DISK_FILE)"
 
   case "${DISK_FMT,,}" in
     raw)
@@ -141,10 +141,12 @@ createDisk() {
       else
 
         # Create an empty file
-        if ! fallocate -l "$DATA_SIZE" "$DISK_FILE"; then
+        if ! fallocate -l "$DATA_SIZE" "$DISK_FILE" &>/dev/null; then
-          if ! truncate -s "$DATA_SIZE" "$DISK_FILE"; then
+          if ! fallocate -l -x "$DATA_SIZE" "$DISK_FILE"; then
-            rm -f "$DISK_FILE"
+            if ! truncate -s "$DATA_SIZE" "$DISK_FILE"; then
-            error "$FAIL" && exit 77
+              rm -f "$DISK_FILE"
+              error "$FAIL" && exit 77
+            fi
           fi
         fi
 
@@ -180,7 +182,7 @@ resizeDisk() {
   local DISK_DESC=$3
   local DISK_FMT=$4
   local FS=$5
-  local CUR_SIZE DATA_SIZE DIR SPACE
+  local CUR_SIZE DATA_SIZE DIR SPACE GB
 
   CUR_SIZE=$(getSize "$DISK_FILE")
   DATA_SIZE=$(numfmt --from=iec "$DISK_SPACE")
@@ -194,17 +196,17 @@ resizeDisk() {
     SPACE=$(df --output=avail -B 1 "$DIR" | tail -n 1)
 
     if (( REQ > SPACE )); then
-      local SPACE_GB=$(( (SPACE + 1073741823)/1073741824 ))
+      GB=$(formatBytes "$SPACE")
-      error "Not enough free space to resize $DISK_DESC to $DISK_SPACE in $DIR, it has only $SPACE_GB GB available.."
+      error "Not enough free space to resize $DISK_DESC to ${DISK_SPACE/G/ GB} in $DIR, it has only $GB available.."
       error "Please specify a smaller ${DISK_DESC^^}_SIZE or disable preallocation by setting ALLOCATE=N." && exit 74
     fi
   fi
 
-  local GB=$(( (CUR_SIZE + 1073741823)/1073741824 ))
+  GB=$(formatBytes "$CUR_SIZE")
-  MSG="Resizing $DISK_DESC from ${GB}G to $DISK_SPACE..."
+  MSG="Resizing $DISK_DESC from $GB to ${DISK_SPACE/G/ GB}..."
   info "$MSG" && html "$MSG"
 
-  local FAIL="Could not resize the $DISK_STYLE $DISK_FMT $DISK_DESC image from ${GB}G to $DISK_SPACE ($DISK_FILE)"
+  local FAIL="Could not resize the $DISK_STYLE $DISK_FMT $DISK_DESC image from ${GB} to ${DISK_SPACE/G/ GB} ($DISK_FILE)"
 
   case "${DISK_FMT,,}" in
     raw)
@@ -219,9 +221,11 @@ resizeDisk() {
       else
 
         # Resize file by allocating more space
-        if ! fallocate -l "$DATA_SIZE" "$DISK_FILE"; then
+        if ! fallocate -l "$DATA_SIZE" "$DISK_FILE" &>/dev/null; then
-          if ! truncate -s "$DATA_SIZE" "$DISK_FILE"; then
+          if ! fallocate -l -x "$DATA_SIZE" "$DISK_FILE"; then
-            error "$FAIL" && exit 75
+            if ! truncate -s "$DATA_SIZE" "$DISK_FILE"; then
+              error "$FAIL" && exit 75
+            fi
           fi
         fi
 
@@ -257,7 +261,7 @@ convertDisk() {
 
   if [[ "$ALLOCATE" != [Nn]* ]]; then
 
-    local DIR CUR_SIZE SPACE
+    local DIR CUR_SIZE SPACE GB
 
     # Check free diskspace
     DIR=$(dirname "$TMP_FILE")
@@ -265,8 +269,8 @@ convertDisk() {
     SPACE=$(df --output=avail -B 1 "$DIR" | tail -n 1)
 
     if (( CUR_SIZE > SPACE )); then
-      local SPACE_GB=$(( (SPACE + 1073741823)/1073741824 ))
+      GB=$(formatBytes "$SPACE")
-      error "Not enough free space to convert $DISK_DESC to $DST_FMT in $DIR, it has only $SPACE_GB GB available..."
+      error "Not enough free space to convert $DISK_DESC to $DST_FMT in $DIR, it has only $GB available..."
       error "Please free up some disk space or disable preallocation by setting ALLOCATE=N." && exit 76
     fi
   fi
@@ -296,8 +300,10 @@ convertDisk() {
     if [[ "$ALLOCATE" != [Nn]* ]]; then
       # Work around qemu-img bug
       CUR_SIZE=$(stat -c%s "$TMP_FILE")
-      if ! fallocate -l "$CUR_SIZE" "$TMP_FILE"; then
+      if ! fallocate -l "$CUR_SIZE" "$TMP_FILE" &>/dev/null; then
+        if ! fallocate -l -x "$CUR_SIZE" "$TMP_FILE"; then
           error "Failed to allocate $CUR_SIZE bytes for $DISK_DESC image $TMP_FILE"
+        fi
       fi
     fi
   fi
@@ -369,7 +375,7 @@ createDevice () {
   local result=" -drive file=$DISK_FILE,id=$DISK_ID,format=$DISK_FMT,cache=$DISK_CACHE,aio=$DISK_IO,discard=$DISK_DISCARD,detect-zeroes=on"
 
   case "${DISK_TYPE,,}" in
-    "none" ) ;;  
+    "none" ) ;;
     "auto" )
       echo "$result"
       ;;
@@ -382,7 +388,7 @@ createDevice () {
       result+=",if=none \
       -device nvme,drive=${DISK_ID}${index},serial=deadbeaf${DISK_INDEX}"
       echo "$result"
-      ;;      
+      ;;
     "ide" | "sata" )
       result+=",if=none \
       -device ich9-ahci,id=ahci${DISK_INDEX},addr=$DISK_ADDRESS \
@@ -416,7 +422,7 @@ addDisk () {
   local DISK_FMT=$7
   local DISK_IO=$8
   local DISK_CACHE=$9
-  local DISK_EXT DIR DATA_SIZE FS PREV_FMT PREV_EXT CUR_SIZE
+  local DISK_EXT DIR SPACE DATA_SIZE FS PREV_FMT PREV_EXT CUR_SIZE
 
   DISK_EXT=$(fmt2ext "$DISK_FMT")
   local DISK_FILE="$DISK_BASE.$DISK_EXT"
@@ -424,15 +430,17 @@ addDisk () {
   DIR=$(dirname "$DISK_FILE")
   [ ! -d "$DIR" ] && return 0
 
-  [ -z "$DISK_SPACE" ] && DISK_SPACE="16G"
+  SPACE="${DISK_SPACE// /}"
-  DISK_SPACE=$(echo "${DISK_SPACE^^}" | sed 's/MB/M/g;s/GB/G/g;s/TB/T/g')
+  [ -z "$SPACE" ] && SPACE="16G"
-  [[ -z "${DISK_SPACE//[0-9]}" ]] && DISK_SPACE="${DISK_SPACE}G"
+  [ -z "${SPACE//[0-9. ]}" ] && SPACE="${SPACE}G"
-  DATA_SIZE=$(numfmt --from=iec "$DISK_SPACE")
+  SPACE=$(echo "${SPACE^^}" | sed 's/MB/M/g;s/GB/G/g;s/TB/T/g')
 
-  if (( DATA_SIZE < 1 )); then
+  if ! numfmt --from=iec "$SPACE" &>/dev/null; then
     error "Invalid value for ${DISK_DESC^^}_SIZE: $DISK_SPACE" && exit 73
   fi
 
+  DATA_SIZE=$(numfmt --from=iec "$SPACE")
+
   if (( DATA_SIZE < 6442450944 )); then
     error "Please increase ${DISK_DESC^^}_SIZE to at least 6 GB." && exit 73
   fi
@@ -465,12 +473,12 @@ addDisk () {
     CUR_SIZE=$(getSize "$DISK_FILE")
 
     if (( DATA_SIZE > CUR_SIZE )); then
-      resizeDisk "$DISK_FILE" "$DISK_SPACE" "$DISK_DESC" "$DISK_FMT" "$FS" || exit $?
+      resizeDisk "$DISK_FILE" "$SPACE" "$DISK_DESC" "$DISK_FMT" "$FS" || exit $?
     fi
 
   else
 
-    createDisk "$DISK_FILE" "$DISK_SPACE" "$DISK_DESC" "$DISK_FMT" "$FS" || exit $?
+    createDisk "$DISK_FILE" "$SPACE" "$DISK_DESC" "$DISK_FMT" "$FS" || exit $?
 
   fi
 

src/entry.sh

@@ -6,6 +6,7 @@ set -Eeuo pipefail
 
 cd /run
 
+. utils.sh      # Load functions
 . reset.sh      # Initialize system
 . install.sh    # Run installation
 . disk.sh       # Initialize disks

src/install.sh

@@ -5,6 +5,7 @@ set -Eeuo pipefail
 
 if [ -f "$STORAGE/dsm.ver" ]; then
   BASE=$(<"$STORAGE/dsm.ver")
+  BASE="${BASE//[![:print:]]/}"
   [ -z "$BASE" ] && BASE="DSM_VirtualDSM_69057"
 else
   # Fallback for old installs
@@ -85,9 +86,9 @@ else
   TMP="/tmp/dsm"
   TMP_SPACE=2147483648
   SPACE=$(df --output=avail -B 1 /tmp | tail -n 1)
-  SPACE_MB=$(( (SPACE + 1048575)/1048576 ))
+  SPACE_MB=$(formatBytes "$SPACE")
   if (( TMP_SPACE > SPACE )); then
-    error "Not enough free space inside the container, have $SPACE_MB MB available but need at least 2 GB." && exit 93
+    error "Not enough free space inside the container, have $SPACE_MB available but need at least 2 GB." && exit 93
   fi
 fi
 
@@ -96,13 +97,13 @@ rm -rf "$TMP" && mkdir -p "$TMP"
 # Check free diskspace
 ROOT_SPACE=536870912
 SPACE=$(df --output=avail -B 1 / | tail -n 1)
-SPACE_MB=$(( (SPACE + 1048575)/1048576 ))
+SPACE_MB=$(formatBytes "$SPACE" "down")
-(( ROOT_SPACE > SPACE )) && error "Not enough free space inside the container, have $SPACE_MB MB available but need at least 500 MB." && exit 96
+(( ROOT_SPACE > SPACE )) && error "Not enough free space inside the container, have $SPACE_MB available but need at least 500 MB." && exit 96
 
 MIN_SPACE=15032385536
 SPACE=$(df --output=avail -B 1 "$STORAGE" | tail -n 1)
-SPACE_GB=$(( (SPACE + 1073741823)/1073741824 ))
+SPACE_GB=$(formatBytes "$SPACE")
-(( MIN_SPACE > SPACE )) && error "Not enough free space for installation in $STORAGE, have $SPACE_GB GB available but need at least 14 GB." && exit 94
+(( MIN_SPACE > SPACE )) && error "Not enough free space for installation in $STORAGE, have $SPACE_GB available but need at least 14 GB." && exit 94
 
 # Check if output is to interactive TTY
 if [ -t 1 ]; then
@@ -310,10 +311,10 @@ rm -f "$SYSTEM"
 # Check free diskspace
 SYSTEM_SIZE=10738466816
 SPACE=$(df --output=avail -B 1 "$STORAGE" | tail -n 1)
-SPACE_MB=$(( (SPACE + 1048575)/1048576 ))
+SPACE_MB=$(formatBytes "$SPACE")
 
 if (( SYSTEM_SIZE > SPACE )); then
-  error "Not enough free space in $STORAGE to create a 10 GB system disk, have only $SPACE_MB MB available." && exit 97
+  error "Not enough free space in $STORAGE to create a 10 GB system disk, have only $SPACE_MB available." && exit 97
 fi
 
 if ! touch "$SYSTEM"; then
@@ -328,10 +329,12 @@ if [[ "${FS,,}" == "btrfs" ]]; then
   fi
 fi
 
-if ! fallocate -l "$SYSTEM_SIZE" "$SYSTEM"; then
+if ! fallocate -l "$SYSTEM_SIZE" "$SYSTEM" &>/dev/null; then
-  if ! truncate -s "$SYSTEM_SIZE" "$SYSTEM"; then
+  if ! fallocate -l -x "$SYSTEM_SIZE" "$SYSTEM"; then
-    rm -f "$SYSTEM"
+    if ! truncate -s "$SYSTEM_SIZE" "$SYSTEM"; then
-    error "Could not allocate file $SYSTEM for the system disk." && exit 98
+      rm -f "$SYSTEM"
+      error "Could not allocate file $SYSTEM for the system disk." && exit 98
+    fi
   fi
 fi
 

src/network.sh

@@ -49,7 +49,7 @@ configureDHCP() {
       error "Cannot create macvtap interface. Please make sure that the network type of the container is 'macvlan' and not 'ipvlan'."
       return 1 ;;
     "RTNETLINK answers: Operation not permitted"* )
-      error "No permission to create macvtap interface. Please make sure that your host kernel supports it and that the NET_ADMIN capability is set." 
+      error "No permission to create macvtap interface. Please make sure that your host kernel supports it and that the NET_ADMIN capability is set."
       return 1 ;;
     *)
       [ -n "$msg" ] && echo "$msg" >&2
@@ -59,8 +59,10 @@ configureDHCP() {
       fi ;;
   esac
 
-  if ! ip link set dev "$VM_NET_TAP" mtu "$MTU"; then
+  if [[ "$MTU" != "0" ]] && [[ "$MTU" != "1500" ]]; then
-    warn "Failed to set MTU size.."
+    if ! ip link set dev "$VM_NET_TAP" mtu "$MTU"; then
+      warn "Failed to set MTU size.."
+    fi
   fi
 
   while ! ip link set "$VM_NET_TAP" up; do
@@ -102,21 +104,33 @@ configureDHCP() {
 
 configureDNS() {
 
-  # dnsmasq configuration:
-  DNSMASQ_OPTS+=" --dhcp-range=$VM_NET_IP,$VM_NET_IP --dhcp-host=$VM_NET_MAC,,$VM_NET_IP,$VM_NET_HOST,infinite --dhcp-option=option:netmask,255.255.255.0"
-
   # Create lease file for faster resolve
   echo "0 $VM_NET_MAC $VM_NET_IP $VM_NET_HOST 01:$VM_NET_MAC" > /var/lib/misc/dnsmasq.leases
   chmod 644 /var/lib/misc/dnsmasq.leases
 
+  # dnsmasq configuration:
+  DNSMASQ_OPTS+=" --dhcp-authoritative"
+
+  # Set DHCP range and host
+  DNSMASQ_OPTS+=" --dhcp-range=$VM_NET_IP,$VM_NET_IP"
+  DNSMASQ_OPTS+=" --dhcp-host=$VM_NET_MAC,,$VM_NET_IP,$VM_NET_HOST,infinite"
+
   # Set DNS server and gateway
-  DNSMASQ_OPTS+=" --dhcp-option=option:dns-server,${VM_NET_IP%.*}.1 --dhcp-option=option:router,${VM_NET_IP%.*}.1"
+  DNSMASQ_OPTS+=" --dhcp-option=option:netmask,255.255.255.0"
+  DNSMASQ_OPTS+=" --dhcp-option=option:router,${VM_NET_IP%.*}.1"
+  DNSMASQ_OPTS+=" --dhcp-option=option:dns-server,${VM_NET_IP%.*}.1"
 
   # Add DNS entry for container
   DNSMASQ_OPTS+=" --address=/host.lan/${VM_NET_IP%.*}.1"
 
   DNSMASQ_OPTS=$(echo "$DNSMASQ_OPTS" | sed 's/\t/ /g' | tr -s ' ' | sed 's/^ *//')
 
+  if [[ "${DEBUG_DNS:-}" == [Yy1]* ]]; then
+   DNSMASQ_OPTS+=" -d"
+   $DNSMASQ ${DNSMASQ_OPTS:+ $DNSMASQ_OPTS} &
+   return 0
+  fi
+
   if ! $DNSMASQ ${DNSMASQ_OPTS:+ $DNSMASQ_OPTS}; then
     error "Failed to start dnsmasq, reason: $?" && return 1
   fi
@@ -185,19 +199,20 @@ configureNAT() {
   fi
 
   if [ ! -c /dev/net/tun ]; then
-    error "$tuntap" && return 1
+    [[ "$PODMAN" != [Yy1]* ]] && error "$tuntap"  
+    return 1
   fi
 
   # Check port forwarding flag
   if [[ $(< /proc/sys/net/ipv4/ip_forward) -eq 0 ]]; then
     { sysctl -w net.ipv4.ip_forward=1 > /dev/null; rc=$?; } || :
     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" && return 1
+      [[ "$PODMAN" != [Yy1]* ]] && error "IP forwarding is disabled. $ADD_ERR --sysctl net.ipv4.ip_forward=1"
+      return 1
     fi
   fi
 
   # Create a bridge with a static IP for the VM guest
-
   { ip link add dev dockerbridge type bridge ; rc=$?; } || :
 
   if (( rc != 0 )); then
@@ -205,7 +220,7 @@ configureNAT() {
   fi
 
   if ! ip address add "${VM_NET_IP%.*}.1/24" broadcast "${VM_NET_IP%.*}.255" dev dockerbridge; then
-    error "Failed to add IP address!" && return 1
+    error "Failed to add IP address pool!" && return 1
   fi
 
   while ! ip link set dockerbridge up; do
@@ -218,8 +233,10 @@ configureNAT() {
     error "$tuntap" && return 1
   fi
 
-  if ! ip link set dev "$VM_NET_TAP" mtu "$MTU"; then
+  if [[ "$MTU" != "0" ]] && [[ "$MTU" != "1500" ]]; then
-    warn "Failed to set MTU size.."
+    if ! ip link set dev "$VM_NET_TAP" mtu "$MTU"; then
+      warn "Failed to set MTU size.."
+    fi
   fi
 
   GATEWAY_MAC=$(echo "$VM_NET_MAC" | md5sum | sed 's/^\(..\)\(..\)\(..\)\(..\)\(..\).*$/02:\1:\2:\3:\4:\5/')
@@ -252,7 +269,7 @@ configureNAT() {
     error "Failed to configure IP tables!" && return 1
   fi
 
-  if ! iptables -t nat -A PREROUTING -i "$VM_NET_DEV" -d "$IP" -p udp  -j DNAT --to "$VM_NET_IP"; then
+  if ! iptables -t nat -A PREROUTING -i "$VM_NET_DEV" -d "$IP" -p udp -j DNAT --to "$VM_NET_IP"; then
     error "Failed to configure IP tables!" && return 1
   fi
 
@@ -275,6 +292,22 @@ configureNAT() {
   return 0
 }
 
+closeBridge() {
+
+  local pid="/var/run/dnsmasq.pid"
+  [ -s "$pid" ] && pKill "$(<"$pid")"
+
+  [[ "${NETWORK,,}" == "user"* ]] && return 0
+
+  ip link set "$VM_NET_TAP" down promisc off &> null || true
+  ip link delete "$VM_NET_TAP" &> null || true
+
+  ip link set dockerbridge down &> null || true
+  ip link delete dockerbridge &> null || true
+
+  return 0
+}
+
 closeNetwork() {
 
   if [[ "$DHCP" == [Yy1]* ]]; then
@@ -290,26 +323,16 @@ closeNetwork() {
   exec 30<&- || true
   exec 40<&- || true
 
-  if [[ "$DHCP" == [Yy1]* ]]; then
+  if [[ "$DHCP" != [Yy1]* ]]; then
 
-    ip link set "$VM_NET_TAP" down || true
+    closeBridge
-    ip link delete "$VM_NET_TAP" || true
+    return 0
-
-  else
-
-    local pid="/var/run/dnsmasq.pid"
-    [ -s "$pid" ] && pKill "$(<"$pid")"
-
-    [[ "${NETWORK,,}" == "user"* ]] && return 0
-
-    ip link set "$VM_NET_TAP" down promisc off || true
-    ip link delete "$VM_NET_TAP" || true
-
-    ip link set dockerbridge down || true
-    ip link delete dockerbridge || true
 
   fi
 
+  ip link set "$VM_NET_TAP" down || true
+  ip link delete "$VM_NET_TAP" || true
+
   return 0
 }
 
@@ -350,16 +373,33 @@ getInfo() {
 
   if [ ! -d "/sys/class/net/$VM_NET_DEV" ]; then
     error "Network interface '$VM_NET_DEV' does not exist inside the container!"
-    error "$ADD_ERR -e \"VM_NET_DEV=NAME\" to specify another interface name." && exit 27
+    error "$ADD_ERR -e \"VM_NET_DEV=NAME\" to specify another interface name." && exit 26
   fi
 
+  BASE_IP="${VM_NET_IP%.*}."
+
+  if [ "${VM_NET_IP/$BASE_IP/}" -lt "3" ]; then
+    error "Invalid VM_NET_IP, must end in a higher number than .3" && exit 27
+  fi
+  
   if [ -z "$MTU" ]; then
     MTU=$(cat "/sys/class/net/$VM_NET_DEV/mtu")
   fi
 
+  if [ "$MTU" -gt "1500" ]; then
+    info "MTU size is too large: $MTU, ignoring..." && MTU="0"
+  fi
+
+  if [[ "${ADAPTER,,}" != "virtio-net-pci" ]]; then
+    if [[ "$MTU" != "0" ]] && [[ "$MTU" != "1500" ]]; then
+      warn "MTU size is $MTU, but cannot be set for $ADAPTER adapters!" && MTU="0"
+    fi
+  fi
+
   if [ -z "$VM_NET_MAC" ]; then
     local file="$STORAGE/dsm.mac"
     [ -s "$file" ] && VM_NET_MAC=$(<"$file")
+    VM_NET_MAC="${VM_NET_MAC//[![:print:]]/}"
     if [ -z "$VM_NET_MAC" ]; then
       # Generate MAC address based on Docker container ID in hostname
       VM_NET_MAC=$(echo "$HOST" | md5sum | sed 's/^\(..\)\(..\)\(..\)\(..\)\(..\).*$/02:11:32:\3:\4:\5/')
@@ -379,8 +419,17 @@ getInfo() {
     error "Invalid MAC address: '$VM_NET_MAC', should be 12 or 17 digits long!" && exit 28
   fi
 
-  GATEWAY=$(ip route list dev "$VM_NET_DEV" | awk ' /^default/ {print $3}')
+  GATEWAY=$(ip route list dev "$VM_NET_DEV" | awk ' /^default/ {print $3}' | head -n 1)
-  IP=$(ip address show dev "$VM_NET_DEV" | grep inet | awk '/inet / { print $2 }' | cut -f1 -d/)
+  IP=$(ip address show dev "$VM_NET_DEV" | grep inet | awk '/inet / { print $2 }' | cut -f1 -d/ | head -n 1)
+
+  IP6=""
+  # shellcheck disable=SC2143
+  if [ -f /proc/net/if_inet6 ] && [ -n "$(ifconfig -a | grep inet6)" ]; then
+    IP6=$(ip -6 addr show dev "$VM_NET_DEV" scope global up)
+    [ -n "$IP6" ] && IP6=$(echo "$IP6" | sed -e's/^.*inet6 \([^ ]*\)\/.*$/\1/;t;d' | head -n 1)
+  fi
+
+  [ -f "/run/.containerenv" ] && PODMAN="Y" || PODMAN="N"
   echo "$IP" > /run/shm/qemu.ip
 
   return 0
@@ -399,8 +448,14 @@ getInfo
 html "Initializing network..."
 
 if [[ "$DEBUG" == [Yy1]* ]]; then
-  info "Host: $HOST  IP: $IP  Gateway: $GATEWAY  Interface: $VM_NET_DEV  MAC: $VM_NET_MAC  MTU: $MTU"
+  mtu=$(cat "/sys/class/net/$VM_NET_DEV/mtu")
-  [ -f /etc/resolv.conf ] && grep '^nameserver*' /etc/resolv.conf
+  line="Host: $HOST  IP: $IP  Gateway: $GATEWAY  Interface: $VM_NET_DEV  MAC: $VM_NET_MAC  MTU: $mtu"
+  [[ "$MTU" != "0" ]] && [[ "$MTU" != "$mtu" ]] && line+=" ($MTU)"
+  info "$line"
+  if [ -f /etc/resolv.conf ]; then
+    nameservers=$(grep '^nameserver*' /etc/resolv.conf | head -c -1 | sed 's/nameserver //g;' | sed -z 's/\n/, /g')
+    [ -n "$nameservers" ] && info "Nameservers: $nameservers"
+  fi
   echo
 fi
 
@@ -409,8 +464,8 @@ if [[ "$IP" == "172.17."* ]]; then
 fi
 
 if [[ -d "/sys/class/net/$VM_NET_TAP" ]]; then
-    info "Lingering interface will be removed..."
+  info "Lingering interface will be removed..."
-    ip link delete "$VM_NET_TAP" || true
+  ip link delete "$VM_NET_TAP" || true
 fi
 
 if [[ "$DHCP" == [Yy1]* ]]; then
@@ -442,14 +497,16 @@ else
     # Configure for tap interface
     if ! configureNAT; then
 
+      closeBridge
       NETWORK="user"
-      warn "falling back to usermode networking! Performance will be bad and port mapping will not work."
+      msg="falling back to user-mode networking!"
-
+      if [[ "$PODMAN" != [Yy1]* ]]; then
-      ip link set "$VM_NET_TAP" down promisc off &> null || true
+        msg="an error occured, $msg"
-      ip link delete "$VM_NET_TAP" &> null || true
+      else
-
+        msg="podman detected, $msg"
-      ip link set dockerbridge down &> null || true
+      fi
-      ip link delete dockerbridge &> null || true
+      warn "$msg"
+      [ -z "$USER_PORTS" ] && info "Notice: port mapping will not work without \"USER_PORTS\" now."
 
     fi
 
@@ -457,13 +514,14 @@ else
 
   if [[ "${NETWORK,,}" == "user"* ]]; then
 
-    # Configure for usermode networking (slirp)
+    # Configure for user-mode networking (slirp)
     configureUser || exit 24
 
   fi
 
 fi
 
-NET_OPTS+=" -device $ADAPTER,romfile=,netdev=hostnet0,mac=$VM_NET_MAC,host_mtu=$MTU,id=net0"
+NET_OPTS+=" -device $ADAPTER,id=net0,netdev=hostnet0,romfile=,mac=$VM_NET_MAC"
+[[ "$MTU" != "0" ]] && [[ "$MTU" != "1500" ]] && NET_OPTS+=",host_mtu=$MTU"
 
 return 0

src/proc.sh

@@ -9,6 +9,24 @@ set -Eeuo pipefail
 : "${CPU_MODEL:=""}"
 : "${DEF_MODEL:="qemu64"}"
 
+CLOCKSOURCE="tsc"
+[[ "${ARCH,,}" == "arm64" ]] && CLOCKSOURCE="arch_sys_counter"
+CLOCK="/sys/devices/system/clocksource/clocksource0/current_clocksource"
+
+if [ ! -f "$CLOCK" ]; then
+  warn "file \"$CLOCK\" cannot not found?"
+else
+  result=$(<"$CLOCK")
+  result="${result//[![:print:]]/}"
+  case "${result,,}" in
+    "${CLOCKSOURCE,,}" ) ;;
+    "kvm-clock" ) info "Nested KVM virtualization detected.." ;;
+    "hyperv_clocksource_tsc_page" ) info "Nested Hyper-V virtualization detected.." ;;
+    "hpet" ) warn "unsupported clock source detected: '$result'. Please set host clock source to '$CLOCKSOURCE'." ;;
+    *) warn "unexpected clock source detected: '$result'. Please set host clock source to '$CLOCKSOURCE'." ;;
+  esac
+fi
+
 if [[ "${ARCH,,}" != "amd64" ]]; then
   KVM="N"
   warn "your CPU architecture is ${ARCH^^} and cannot provide KVM acceleration for x64 instructions, this will cause a major loss of performance."
@@ -47,7 +65,6 @@ fi
 if [[ "$KVM" != [Nn]* ]]; then
 
   CPU_FEATURES="kvm=on,l3-cache=on,+hypervisor"
-  CLOCK="/sys/devices/system/clocksource/clocksource0/current_clocksource"
   KVM_OPTS=",accel=kvm -enable-kvm -global kvm-pit.lost_tick_policy=discard"
 
   if ! grep -qw "sse4_2" <<< "$flags"; then
@@ -61,15 +78,6 @@ if [[ "$KVM" != [Nn]* ]]; then
     CPU_FEATURES+=",migratable=no"
   fi
 
-  if [ -f "$CLOCK" ]; then
-    CLOCK=$(<"$CLOCK")
-    if [[ "${CLOCK,,}" != "tsc" ]]; then
-      warn "unexpected clocksource: $CLOCK"
-    fi
-  else
-    warn "file \"$CLOCK\" cannot not found?"
-  fi
-
   if grep -qw "svm" <<< "$flags"; then
 
     # AMD processor
@@ -127,7 +135,7 @@ else
 fi
 
 if [ -z "$HOST_CPU" ]; then
-  HOST_CPU=$(lscpu | grep -m 1 'Model name' | cut -f 2 -d ":" | awk '{$1=$1}1' | sed 's# @.*##g' | sed s/"(R)"//g | sed 's/[^[:alnum:] ]\+/ /g' | sed 's/  */ /g')
+  [[ "${CPU,,}" != "unknown" ]] && HOST_CPU="$CPU"
 fi
 
 if [ -n "$HOST_CPU" ]; then

src/progress.sh

@@ -26,7 +26,7 @@ do
     bytes=$(du -sb "$file" | cut -f1)
     if (( bytes > 1000 )); then
       if [ -z "$total" ] || [[ "$total" == "0" ]]; then
-        size=$(numfmt --to=iec --suffix=B  "$bytes" | sed -r 's/([A-Z])/ \1/')
+        size=$(numfmt --to=iec --suffix=B "$bytes" | sed -r 's/([A-Z])/ \1/')
       else
         size="$(echo "$bytes" "$total" | awk '{printf "%.1f", $1 * 100 / $2}')"
         size="$size%"

src/reset.sh

@@ -1,10 +1,6 @@
 #!/usr/bin/env bash
 set -Eeuo pipefail
 
-info () { printf "%b%s%b" "\E[1;34m❯ \E[1;36m" "${1:-}" "\E[0m\n"; }
-error () { printf "%b%s%b" "\E[1;31m❯ " "ERROR: ${1:-}" "\E[0m\n" >&2; }
-warn () { printf "%b%s%b" "\E[1;31m❯ " "Warning: ${1:-}" "\E[0m\n" >&2; }
-
 trap 'error "Status $? while: $BASH_COMMAND (line $LINENO/$BASH_LINENO)"' ERR
 
 [ ! -f "/run/entry.sh" ] && error "Script must run inside Docker container!" && exit 11
@@ -17,7 +13,6 @@ echo "❯ For support visit $SUPPORT"
 
 : "${TZ:=""}"              # System local timezone
 : "${DEBUG:="N"}"          # Disable debugging mode
-: "${COMMIT:="N"}"         # Commit to local image
 : "${COUNTRY:=""}"         # Country code for mirror
 : "${CONSOLE:="N"}"        # Disable console mode
 : "${ALLOCATE:=""}"        # Preallocate diskspace
@@ -39,7 +34,7 @@ TEMPLATE="/var/www/index.html"
 FOOTER1="$APP for Docker v$(</run/version)"
 FOOTER2="<a href='$SUPPORT'>$SUPPORT</a>"
 
-CPI=$(lscpu)
+CPU=$(cpu)
 SYS=$(uname -r)
 HOST=$(hostname -s)
 KERNEL=$(echo "$SYS" | cut -b 1)
@@ -47,34 +42,13 @@ MINOR=$(echo "$SYS" | cut -d '.' -f2)
 ARCH=$(dpkg --print-architecture)
 CORES=$(grep -c '^processor' /proc/cpuinfo)
 
-if ! grep -qi "socket(s)" <<< "$CPI"; then
+if ! grep -qi "socket(s)" <<< "$(lscpu)"; then
   SOCKETS=1
 else
-  SOCKETS=$(echo "$CPI" | grep -m 1 -i 'socket(s)' | awk '{print $(2)}')
+  SOCKETS=$(lscpu | grep -m 1 -i 'socket(s)' | awk '{print $(2)}')
 fi
 
-if ! grep -qi "model name" <<< "$CPI"; then
+[ -n "${CPU_CORES//[0-9 ]}" ] && error "Invalid amount of CPU_CORES: $CPU_CORES" && exit 15
-  CPU=""
-else
-  CPU=$(echo "$CPI" | grep -m 1 -i 'model name' | cut -f 2 -d ":" | awk '{$1=$1}1' | sed 's# @.*##g' | sed s/"(R)"//g | sed 's/[^[:alnum:] ]\+/ /g' | sed 's/  */ /g')
-fi
-
-if [ -z "${CPU// /}" ] && grep -qi "model:" <<< "$CPI"; then
-  CPU=$(echo "$CPI" | grep -m 1 -i 'model:' | cut -f 2 -d ":" | awk '{$1=$1}1' | sed 's# @.*##g' | sed s/"(R)"//g | sed 's/[^[:alnum:] ]\+/ /g' | sed 's/  */ /g')
-fi
-
-CPU="${CPU// CPU/}"
-CPU="${CPU// 8 Core/}"
-CPU="${CPU// 16 Core/}"
-CPU="${CPU// 32 Core/}"
-CPU="${CPU// 64 Core/}"
-CPU="${CPU// Processor/}"
-CPU="${CPU// Quad core/}"
-CPU="${CPU// Core TM/ Core}"
-CPU="${CPU// with Radeon Graphics/}"
-CPU="${CPU// with Radeon Vega Graphics/}"
-
-[ -z "${CPU// /}" ] && CPU="Unknown"
 
 # Check system
 
@@ -86,13 +60,13 @@ fi
 
 # Check folder
 
-if [[ "$COMMIT" != [Nn]* ]]; then
+if [[ "${COMMIT:-}" == [Yy1]* ]]; then
   STORAGE="/local"
   mkdir -p "$STORAGE"
-else
+fi
-  if [ ! -d "$STORAGE" ]; then
+
-    error "Storage folder ($STORAGE) not found!" && exit 13
+if [ ! -d "$STORAGE" ]; then
-  fi
+  error "Storage folder ($STORAGE) not found!" && exit 13
 fi
 
 # Check filesystem
@@ -107,11 +81,18 @@ fi
 RAM_SPARE=500000000
 RAM_AVAIL=$(free -b | grep -m 1 Mem: | awk '{print $7}')
 RAM_TOTAL=$(free -b | grep -m 1 Mem: | awk '{print $2}')
+
+RAM_SIZE="${RAM_SIZE// /}"
+[ -z "$RAM_SIZE" ] && error "RAM_SIZE not specified!" && exit 16
+
+if [ -z "${RAM_SIZE//[0-9. ]}" ]; then
+  [ "${RAM_SIZE%%.*}" -lt "130" ] && RAM_SIZE="${RAM_SIZE}G" || RAM_SIZE="${RAM_SIZE}M"
+fi
+
 RAM_SIZE=$(echo "${RAM_SIZE^^}" | sed 's/MB/M/g;s/GB/G/g;s/TB/T/g')
+! numfmt --from=iec "$RAM_SIZE" &>/dev/null && error "Invalid RAM_SIZE: $RAM_SIZE" && exit 16
 RAM_WANTED=$(numfmt --from=iec "$RAM_SIZE")
-AVAIL_GB=$(( RAM_AVAIL/1073741824 ))
+[ "$RAM_WANTED" -lt "136314880 " ] && error "RAM_SIZE is too low: $RAM_SIZE" && exit 16
-TOTAL_GB=$(( (RAM_TOTAL + 1073741823)/1073741824 ))
-WANTED_GB=$(( (RAM_WANTED + 1073741823)/1073741824 ))
 
 # Print system info
 SYS="${SYS/-generic/}"
@@ -119,18 +100,20 @@ FS="${FS/UNKNOWN //}"
 FS="${FS/ext2\/ext3/ext4}"
 FS=$(echo "$FS" | sed 's/[)(]//g')
 SPACE=$(df --output=avail -B 1 "$STORAGE" | tail -n 1)
-SPACE_GB=$(( (SPACE + 1073741823)/1073741824 ))
+SPACE_GB=$(formatBytes "$SPACE" "down")
+AVAIL_MEM=$(formatBytes "$RAM_AVAIL" "down")
+TOTAL_MEM=$(formatBytes "$RAM_TOTAL" "up")
 
-echo "❯ CPU: ${CPU} | RAM: $AVAIL_GB/$TOTAL_GB GB | DISK: $SPACE_GB GB (${FS}) | KERNEL: ${SYS}..."
+echo "❯ CPU: ${CPU} | RAM: ${AVAIL_MEM/ GB/}/$TOTAL_MEM | DISK: $SPACE_GB (${FS}) | KERNEL: ${SYS}..."
 echo
 
-# Check memory
+# Check available memory
 
-if [[ "$RAM_CHECK" != [Nn]* ]]; then
+if [[ "$RAM_CHECK" != [Nn]* ]] && (( (RAM_WANTED + RAM_SPARE) > RAM_AVAIL )); then
-  if (( (RAM_WANTED + RAM_SPARE) > RAM_AVAIL )); then
+  AVAIL_MEM=$(formatBytes "$RAM_AVAIL")
-    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."
+  msg="Your configured RAM_SIZE of ${RAM_SIZE/G/ GB} is too high for the $AVAIL_MEM of memory available, please set a lower value."
-    exit 17
+  [[ "${FS,,}" != "zfs" ]] && error "$msg" && exit 17
-  fi
+  info "$msg"
 fi
 
 # Cleanup files
@@ -141,91 +124,6 @@ rm -f /run/shm/dsm.url
 rm -rf /tmp/dsm
 rm -rf "$STORAGE/tmp"
 
-# Helper functions
-
-isAlive() {
-  local pid=$1
-
-  if kill -0 "$pid" 2>/dev/null; then
-    return 0
-  fi
-
-  return 1
-}
-
-pKill() {
-  local pid=$1
-
-  { kill -15 "$pid" || true; } 2>/dev/null
-
-  while isAlive "$pid"; do
-    sleep 0.2
-  done
-
-  return 0
-}
-
-fWait() {
-  local name=$1
-
-  while pgrep -f -l "$name" >/dev/null; do
-    sleep 0.2
-  done
-
-  return 0
-}
-
-fKill() {
-  local name=$1
-
-  { pkill -f "$name" || true; } 2>/dev/null
-  fWait "$name"
-
-  return 0
-}
-
-escape () {
-    local s
-    s=${1//&/\&amp;}
-    s=${s//</\&lt;}
-    s=${s//>/\&gt;}
-    s=${s//'"'/\&quot;}
-    printf -- %s "$s"
-    return 0
-}
-
-html()
-{
-    local title
-    local body
-    local script
-    local footer
-
-    title=$(escape "$APP")
-    title="<title>$title</title>"
-    footer=$(escape "$FOOTER1")
-
-    body=$(escape "$1")
-    if [[ "$body" == *"..." ]]; then
-      body="<p class=\"loading\">${body/.../}</p>"
-    fi
-
-    [ -n "${2:-}" ] && script="$2" || script=""
-
-    local HTML
-    HTML=$(<"$TEMPLATE")
-    HTML="${HTML/\[1\]/$title}"
-    HTML="${HTML/\[2\]/$script}"
-    HTML="${HTML/\[3\]/$body}"
-    HTML="${HTML/\[4\]/$footer}"
-    HTML="${HTML/\[5\]/$FOOTER2}"
-
-    echo "$HTML" > "$PAGE"
-    echo "$body" > "$INFO"
-
-    return 0
-}
-
 getCountry() {
   local url=$1
   local query=$2
@@ -286,6 +184,17 @@ addPackage() {
   return 0
 }
 
+# shellcheck disable=SC2143
+if [ -f /proc/net/if_inet6 ] && [ -n "$(ifconfig -a | grep inet6)" ]; then
+
+  sed -i "s/listen 5000 default_server;/listen [::]:5000 default_server ipv6only=off;/g" /etc/nginx/sites-enabled/web.conf
+
+else
+
+  sed -i "s/listen [::]:5000 default_server ipv6only=off;/listen 5000 default_server;/g" /etc/nginx/sites-enabled/web.conf
+
+fi
+
 # Start webserver
 cp -r /var/www/* /run/shm
 html "Starting $APP for Docker..."

src/utils.sh

@@ -0,0 +1,171 @@
+#!/usr/bin/env bash
+set -Eeuo pipefail
+
+# Helper functions
+
+info () { printf "%b%s%b" "\E[1;34m❯ \E[1;36m" "${1:-}" "\E[0m\n"; }
+error () { printf "%b%s%b" "\E[1;31m❯ " "ERROR: ${1:-}" "\E[0m\n" >&2; }
+warn () { printf "%b%s%b" "\E[1;31m❯ " "Warning: ${1:-}" "\E[0m\n" >&2; }
+
+formatBytes() {
+  local result
+  result=$(numfmt --to=iec --suffix=B "$1" | sed -r 's/([A-Z])/ \1/' | sed 's/ B/ bytes/g;')
+  local unit="${result//[0-9. ]}"
+  result="${result//[a-zA-Z ]/}"
+  if [[ "${2:-}" == "up" ]]; then
+    if [[ "$result" == *"."* ]]; then
+      result="${result%%.*}"
+      result=$((result+1))
+    fi
+  else
+    if [[ "${2:-}" == "down" ]]; then
+      result="${result%%.*}"
+    fi
+  fi
+  echo "$result $unit"
+  return 0
+}
+
+isAlive() {
+  local pid="$1"
+
+  if kill -0 "$pid" 2>/dev/null; then
+    return 0
+  fi
+
+  return 1
+}
+
+pKill() {
+  local pid="$1"
+
+  { kill -15 "$pid" || true; } 2>/dev/null
+
+  while isAlive "$pid"; do
+    sleep 0.2
+  done
+
+  return 0
+}
+
+fWait() {
+  local name="$1"
+
+  while pgrep -f -l "$name" >/dev/null; do
+    sleep 0.2
+  done
+
+  return 0
+}
+
+fKill() {
+  local name="$1"
+
+  { pkill -f "$name" || true; } 2>/dev/null
+  fWait "$name"
+
+  return 0
+}
+
+escape () {
+  local s
+  s=${1//&/\&}
+  s=${s//</\&lt;}
+  s=${s//>/\&gt;}
+  s=${s//'"'/\&quot;}
+  printf -- %s "$s"
+  return 0
+}
+
+html() {
+  local title
+  local body
+  local script
+  local footer
+
+  title=$(escape "$APP")
+  title="<title>$title</title>"
+  footer=$(escape "$FOOTER1")
+
+  body=$(escape "$1")
+  if [[ "$body" == *"..." ]]; then
+    body="<p class=\"loading\">${body/.../}</p>"
+  fi
+
+  [ -n "${2:-}" ] && script="$2" || script=""
+
+  local HTML
+  HTML=$(<"$TEMPLATE")
+  HTML="${HTML/\[1\]/$title}"
+  HTML="${HTML/\[2\]/$script}"
+  HTML="${HTML/\[3\]/$body}"
+  HTML="${HTML/\[4\]/$footer}"
+  HTML="${HTML/\[5\]/$FOOTER2}"
+
+  echo "$HTML" > "$PAGE"
+  echo "$body" > "$INFO"
+
+  return 0
+}
+
+cpu() {
+  local ret
+  local cpu=""
+
+  ret=$(lscpu)
+  
+  if grep -qi "model name" <<< "$ret"; then
+    cpu=$(echo "$ret" | grep -m 1 -i 'model name' | cut -f 2 -d ":" | awk '{$1=$1}1' | sed 's# @.*##g' | sed s/"(R)"//g | sed 's/[^[:alnum:] ]\+/ /g' | sed 's/  */ /g')
+  fi
+  
+  if [ -z "${cpu// /}" ] && grep -qi "model:" <<< "$ret"; then
+    cpu=$(echo "$ret" | grep -m 1 -i 'model:' | cut -f 2 -d ":" | awk '{$1=$1}1' | sed 's# @.*##g' | sed s/"(R)"//g | sed 's/[^[:alnum:] ]\+/ /g' | sed 's/  */ /g')
+  fi
+  
+  cpu="${cpu// CPU/}"
+  cpu="${cpu// 4 Core/}"
+  cpu="${cpu// 6 Core/}"
+  cpu="${cpu// 8 Core/}"
+  cpu="${cpu// 10 Core/}"
+  cpu="${cpu// 12 Core/}"
+  cpu="${cpu// 16 Core/}"
+  cpu="${cpu// 32 Core/}"
+  cpu="${cpu// 64 Core/}"
+  cpu="${cpu//7th Gen /}"
+  cpu="${cpu//8th Gen /}"
+  cpu="${cpu//9th Gen /}"
+  cpu="${cpu//10th Gen /}"
+  cpu="${cpu//11th Gen /}"
+  cpu="${cpu//12th Gen /}"
+  cpu="${cpu//13th Gen /}"
+  cpu="${cpu//14th Gen /}"
+  cpu="${cpu//15th Gen /}"
+  cpu="${cpu// Processor/}"
+  cpu="${cpu// Quad core/}"
+  cpu="${cpu// Dual core/}"
+  cpu="${cpu// Octa core/}"
+  cpu="${cpu// Core TM/ Core}"
+  cpu="${cpu// with Radeon Graphics/}"
+  cpu="${cpu// with Radeon Vega Graphics/}"
+  
+  [ -z "${cpu// /}" ] && cpu="Unknown"
+
+  echo "$cpu"
+  return 0
+}
+
+hasDisk() {
+
+  [ -b "/disk" ] && return 0
+  [ -b "/disk1" ] && return 0
+  [ -b "/dev/disk1" ] && return 0
+  [ -b "${DEVICE:-}" ] && return 0
+
+  [ -z "${DISK_NAME:-}" ] && DISK_NAME="data"
+  [ -s "$STORAGE/$DISK_NAME.img" ]  && return 0
+  [ -s "$STORAGE/$DISK_NAME.qcow2" ] && return 0
+
+  return 1
+}
+
+return 0

web/conf/nginx.conf

@@ -1,5 +1,4 @@
 server {
-    listen 80;
     listen 5000 default_server;
 
     autoindex on;