Rewrite the mount code to add NFS

https://github.com/alexbelgium/hassio-addons/issues/1987

.templates/00-smb_mounts.sh

@@ -27,7 +27,9 @@ test_mount() {
     [[ -e "/mnt/$diskname/testaze" ]] && rm -r "/mnt/$diskname/testaze"
     # shellcheck disable=SC2015
     mkdir "/mnt/$diskname/testaze" && touch "/mnt/$diskname/testaze/testaze" && rm -r "/mnt/$diskname/testaze" || ERROR_MOUNT=true
-    if [[ "$ERROR_MOUNT" == "true" ]]; then
+
+    # Only CIFS has the noserverino fallback
+    if [[ "$ERROR_MOUNT" == "true" && "$FSTYPE" == "cifs" ]]; then
         # Test write permissions
         if [[ "$MOUNTOPTIONS" == *"noserverino"* ]]; then
             bashio::log.fatal "Disk is mounted, however unable to write in the shared disk. Please check UID/GID for permissions, and if the share is rw"
@@ -51,10 +53,14 @@ mount_drive() {
     MOUNTED=true
     MOUNTOPTIONS="$1"
 
-    # Try mounting
+    # Try mounting (type depends on detected FSTYPE)
+    if [[ "$FSTYPE" == "cifs" ]]; then
         mount -t cifs -o "$MOUNTOPTIONS" "$disk" /mnt/"$diskname" 2> ERRORCODE || MOUNTED=false
+    elif [[ "$FSTYPE" == "nfs" ]]; then
+        mount -t nfs -o "$MOUNTOPTIONS" "$disk" /mnt/"$diskname" 2> ERRORCODE || MOUNTED=false
+    fi
 
-    # Test if succesful
+    # Test if successful
     if [[ "$MOUNTED" == "true" ]]; then
         # shellcheck disable=SC2015
         test_mount
@@ -63,7 +69,7 @@ mount_drive() {
 }
 
 ####################
-# MOUNT SMB SHARES #
+# MOUNT NETWORK SHARES #
 ####################
 
 if bashio::config.has_value 'networkdisks'; then
@@ -75,7 +81,7 @@ if bashio::config.has_value 'networkdisks'; then
         bashio::log.warning "------------------------"
     fi
 
-    echo 'Mounting smb share(s)...'
+    echo 'Mounting network share(s)...'
 
     ####################
     # Define variables #
@@ -89,12 +95,12 @@ if bashio::config.has_value 'networkdisks'; then
     SECVERS=""
     CHARSET=",iocharset=utf8"
 
-    # Clean data
+    # Clean data (keeps NFS entries intact)
     MOREDISKS=${MOREDISKS// \/\//,\/\/}
     MOREDISKS=${MOREDISKS//, /,}
     MOREDISKS=${MOREDISKS// /"\040"}
 
-    # Is domain set
+    # Is domain set (CIFS only)
     DOMAIN=""
     DOMAINCLIENT=""
     if bashio::config.has_value 'cifsdomain'; then
@@ -103,7 +109,7 @@ if bashio::config.has_value 'networkdisks'; then
         DOMAINCLIENT="--workgroup=$(bashio::config 'cifsdomain')"
     fi
 
-    # Is  UID/GID set
+    # Is  UID/GID set (used for CIFS mount options)
     PUID=",uid=$(id -u)"
     PGID=",gid=$(id -g)"
     if bashio::config.has_value 'PUID' && bashio::config.has_value 'PGID'; then
@@ -122,35 +128,64 @@ if bashio::config.has_value 'networkdisks'; then
         # Clean name of network share
         # shellcheck disable=SC2116,SC2001
         disk=$(echo $disk | sed "s,/$,,") # Remove / at end of name
-        disk="${disk//"\040"/ }"          #replace \040 with
+        disk="${disk//"\040"/ }"          # replace \040 with space
-        diskname="${disk//\\//}"          #replace \ with /
+
+        # Detect filesystem type by pattern (CIFS: //ip/share ; NFS: ip:/export[/path] or nfs://ip:/export[/path])
+        FSTYPE="cifs"
+        if [[ "$disk" =~ ^nfs:// ]]; then
+            FSTYPE="nfs"
+            disk="${disk#nfs://}"
+        elif [[ "$disk" =~ ^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+:/.+ ]]; then
+            FSTYPE="nfs"
+        fi
+
+        # Determine server for reachability checks
+        if [[ "$FSTYPE" == "cifs" ]]; then
+            server="$(echo "$disk" | grep -E -o "[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+")"
+        else
+            server="${disk%%:*}"
+        fi
+
+        diskname="$disk"
+        diskname="${diskname//\\//}"      # replace \ with /
         diskname="${diskname##*/}"        # Get only last part of the name
         MOUNTED=false
 
         # Start
-        echo "... mounting $disk"
+        echo "... mounting ($FSTYPE) $disk"
 
         # Data validation
+        if [[ "$FSTYPE" == "cifs" ]]; then
             if [[ ! "$disk" =~ ^.*+[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+[/]+.*+$ ]]; then
                 bashio::log.fatal "...... the structure of your \"networkdisks\" option : \"$disk\" doesn't seem correct, please use a structure like //123.12.12.12/sharedfolder,//123.12.12.12/sharedfolder2. If you don't use it, you can simply remove the text, this will avoid this error message in the future."
                 touch ERRORCODE
                 continue
             fi
+        else
+            if [[ ! "$disk" =~ ^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+:/.+ ]]; then
+                bashio::log.fatal "...... invalid NFS path \"$disk\". Use a structure like 123.12.12.12:/export/path"
+                touch ERRORCODE
+                continue
+            fi
+        fi
 
         # Prepare mount point
         mkdir -p /mnt/"$diskname"
         chown root:root /mnt/"$diskname"
 
         # Quickly try to mount with defaults
+        if [[ "$FSTYPE" == "cifs" ]]; then
             mount_drive "rw,file_mode=0775,dir_mode=0775,username=${USERNAME},password=${PASSWORD},nobrl${SMBVERS}${SECVERS}${PUID}${PGID}${CHARSET}${DOMAIN}"
+        elif [[ "$FSTYPE" == "nfs" ]]; then
+            mount_drive "rw,nfsvers=4.2,proto=tcp,hard,timeo=600,retrans=2"
+        fi
 
         # Deeper analysis if failed
         if [ "$MOUNTED" = false ]; then
 
-            # Extract ip part of server for further manipulation
+            if [[ "$FSTYPE" == "cifs" ]]; then
-            server="$(echo "$disk" | grep -E -o "[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+")"
 
-            # Does server exists
+                # Does server exist (SMB port 445)
                 output="$(nmap -F $server -T5 -oG -)"
                 if ! echo "$output" | grep 445/open &> /dev/null; then
                     if echo "$output" | grep /open &> /dev/null; then
@@ -233,6 +268,20 @@ if bashio::config.has_value 'networkdisks'; then
                     fi
                 done
 
+            elif [[ "$FSTYPE" == "nfs" ]]; then
+                # Add NFS-specific port check (2049) similar to SMB (445)
+                output="$(nmap -F $server -T5 -oG -)"
+                if ! echo "$output" | grep -E '(2049|111)/open' &> /dev/null; then
+                    bashio::log.fatal "...... $server is reachable but NFS ports not open"
+                    continue
+                fi
+                # NFS fallback attempts: try common versions until one works
+                for NFVER in 4.2 4.1 4 3; do
+                    if [ "$MOUNTED" = false ]; then
+                        mount_drive "rw,nfsvers=${NFVER},proto=tcp"
+                    fi
+                done
+            fi
         fi
 
         # Messages
@@ -245,7 +294,7 @@ if bashio::config.has_value 'networkdisks'; then
             fi
 
             # Alert if smbv1
-            if [[ "$MOUNTOPTIONS" == *"1.0"* ]]; then
+            if [[ "$FSTYPE" == "cifs" && "$MOUNTOPTIONS" == *"1.0"* ]]; then
                 bashio::log.warning ""
                 bashio::log.warning "Your smb system requires smbv1. This is an obsolete protocol. Please correct this to prevent issues."
                 bashio::log.warning ""
@@ -253,19 +302,22 @@ if bashio::config.has_value 'networkdisks'; then
 
         else
             # Mounting failed messages
+            if [[ "$FSTYPE" == "cifs" ]]; then
                 bashio::log.fatal "Error, unable to mount $disk to /mnt/$diskname with username $USERNAME, $PASSWORD. Please check your remote share path, username, password, domain, try putting 0 in UID and GID"
                 bashio::log.fatal "Here is some debugging info :"
-
-            # Provide debugging info
                 smbclient -t 2 -L $disk -U "$USERNAME%$PASSWORD" -c "exit"
-
-            # Error code
                 SMBVERS=""
                 SECVERS=""
                 PUID=""
                 PGID=""
                 CHARSET=""
                 mount_drive "rw,file_mode=0775,dir_mode=0775,username=${USERNAME},password=${PASSWORD},nobrl${SMBVERS}${SECVERS}${PUID}${PGID}${CHARSET}${DOMAIN}"
+            elif [[ "$FSTYPE" == "nfs" ]]; then
+                bashio::log.fatal "Error, unable to mount NFS share $disk to /mnt/$diskname. Please check the export path and that NFS server allows this client (and NFSv4)."
+                # last-ditch try with very basic options
+                mount_drive "rw"
+            fi
+
             bashio::log.fatal "Error read : $(< ERRORCODE), addon will stop in 1 min"
 
             # clean folder