Update readme.md

readme.md

@@ -72,11 +72,9 @@ 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://127.0.0.1:5000/) using your web browser.
+  - Start the container and connect to [port 5000](http://localhost:5000) using your web browser.
 
-  - Wait until DSM finishes its installation
- 
-  - Choose an username and password, and you will be taken to the desktop.
+  - Wait until DSM is ready, 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!
 
@@ -105,7 +103,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 will be 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 variable:
 
@@ -129,21 +127,20 @@ kubectl apply -f https://raw.githubusercontent.com/vdsm/virtual-dsm/refs/heads/m
 
 ### How do I pass-through a disk?
 
-   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:
+   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
   ```
 
-  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 might all get lost without warning when DSM creates the volume.
+> 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 change the amount of CPU or RAM?
 
@@ -259,7 +256,7 @@ kubectl apply -f https://raw.githubusercontent.com/vdsm/virtual-dsm/refs/heads/m
 
   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:

src/disk.sh

@@ -141,12 +141,10 @@ createDisk() {
       else
 
         # Create an empty file
-        if ! fallocate -l "$DATA_SIZE" "$DISK_FILE" &>/dev/null; then
-          if ! fallocate -l -x "$DATA_SIZE" "$DISK_FILE"; then
-            if ! truncate -s "$DATA_SIZE" "$DISK_FILE"; then
-              rm -f "$DISK_FILE"
-              error "$FAIL" && exit 77
-            fi
+        if ! fallocate -l "$DATA_SIZE" "$DISK_FILE"; then
+          if ! truncate -s "$DATA_SIZE" "$DISK_FILE"; then
+            rm -f "$DISK_FILE"
+            error "$FAIL" && exit 77
           fi
         fi
 
@@ -221,11 +219,9 @@ resizeDisk() {
       else
 
         # Resize file by allocating more space
-        if ! fallocate -l "$DATA_SIZE" "$DISK_FILE" &>/dev/null; then
-          if ! fallocate -l -x "$DATA_SIZE" "$DISK_FILE"; then
-            if ! truncate -s "$DATA_SIZE" "$DISK_FILE"; then
-              error "$FAIL" && exit 75
-            fi
+        if ! fallocate -l "$DATA_SIZE" "$DISK_FILE"; then
+          if ! truncate -s "$DATA_SIZE" "$DISK_FILE"; then
+            error "$FAIL" && exit 75
           fi
         fi
 
@@ -300,10 +296,8 @@ convertDisk() {
     if [[ "$ALLOCATE" != [Nn]* ]]; then
       # Work around qemu-img bug
       CUR_SIZE=$(stat -c%s "$TMP_FILE")
-      if ! fallocate -l "$CUR_SIZE" "$TMP_FILE" &>/dev/null; then
-        if ! fallocate -l -x "$CUR_SIZE" "$TMP_FILE"; then
+      if ! fallocate -l "$CUR_SIZE" "$TMP_FILE"; then
           error "Failed to allocate $CUR_SIZE bytes for $DISK_DESC image $TMP_FILE"
-        fi
       fi
     fi
   fi
@@ -375,7 +369,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"
       ;;

src/install.sh

@@ -328,12 +328,10 @@ if [[ "${FS,,}" == "btrfs" ]]; then
   fi
 fi
 
-if ! fallocate -l "$SYSTEM_SIZE" "$SYSTEM" &>/dev/null; then
-  if ! fallocate -l -x "$SYSTEM_SIZE" "$SYSTEM"; then
-    if ! truncate -s "$SYSTEM_SIZE" "$SYSTEM"; then
-      rm -f "$SYSTEM"
-      error "Could not allocate file $SYSTEM for the system disk." && exit 98
-    fi
+if ! fallocate -l "$SYSTEM_SIZE" "$SYSTEM"; then
+  if ! truncate -s "$SYSTEM_SIZE" "$SYSTEM"; then
+    rm -f "$SYSTEM"
+    error "Could not allocate file $SYSTEM for the system disk." && exit 98
   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
@@ -119,12 +119,6 @@ configureDNS() {
 
   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
@@ -212,7 +206,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 pool!" && return 1
+    error "Failed to add IP address!" && return 1
   fi
 
   while ! ip link set dockerbridge up; do
@@ -261,7 +255,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
 
@@ -404,16 +398,8 @@ 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}' | head -n 1)
-  IP=$(ip address show dev "$VM_NET_DEV" | grep inet | awk '/inet / { print $2 }' | cut -f1 -d/ | head -n 1)
-
-  IP6=""
-  # shellcheck disable=SC2143
-  if [ -f /proc/net/if_inet6 ] && [ -n "$(ifconfig -a | grep inet6)" ]; then
-    IP6=$(ip -6 addr show dev "$VM_NET_DEV" scope global up)
-    [ -n "$IP6" ] && IP6=$(echo "$IP6" | sed -e's/^.*inet6 \([^ ]*\)\/.*$/\1/;t;d' | head -n 1)
-  fi
-
+  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
 
   return 0
@@ -445,8 +431,8 @@ if [[ "$IP" == "172.17."* ]]; then
 fi
 
 if [[ -d "/sys/class/net/$VM_NET_TAP" ]]; then
-  info "Lingering interface will be removed..."
-  ip link delete "$VM_NET_TAP" || true
+    info "Lingering interface will be removed..."
+    ip link delete "$VM_NET_TAP" || true
 fi
 
 if [[ "$DHCP" == [Yy1]* ]]; then
@@ -480,7 +466,7 @@ else
 
       closeBridge
       NETWORK="user"
-      warn "falling back to user-mode networking! Performance will be bad and port mapping will not work."
+      warn "falling back to usermode networking! Performance will be bad and port mapping will not work."
 
     fi
 
@@ -488,7 +474,7 @@ else
 
   if [[ "${NETWORK,,}" == "user"* ]]; then
 
-    # Configure for user-mode networking (slirp)
+    # Configure for usermode networking (slirp)
     configureUser || exit 24
 
   fi

src/reset.sh

@@ -63,17 +63,10 @@ if [ -z "${CPU// /}" ] && grep -qi "model:" <<< "$CPI"; then
 fi
 
 CPU="${CPU// CPU/}"
-CPU="${CPU// 6 Core/}"
 CPU="${CPU// 8 Core/}"
 CPU="${CPU// 16 Core/}"
 CPU="${CPU// 32 Core/}"
 CPU="${CPU// 64 Core/}"
-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// Core TM/ Core}"
@@ -326,17 +319,6 @@ addPackage() {
   return 0
 }
 
-# shellcheck disable=SC2143
-if [ -f /proc/net/if_inet6 ] && [ -n "$(ifconfig -a | grep inet6)" ]; then
-
-  sed -i "s/listen 5000 default_server;/listen [::]:5000 default_server ipv6only=off;/g" /etc/nginx/sites-enabled/web.conf
-
-else
-
-  sed -i "s/listen [::]:5000 default_server ipv6only=off;/listen 5000 default_server;/g" /etc/nginx/sites-enabled/web.conf
-
-fi
-
 # Start webserver
 cp -r /var/www/* /run/shm
 html "Starting $APP for Docker..."

web/conf/nginx.conf

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