更新工作流脚本，优化依赖安装步骤，确保环境准备更完整

.github/workflows/data.yml

@@ -33,17 +33,13 @@ jobs:
           git config --global user.name "github-actions[bot]"
           sudo timedatectl set-timezone "Asia/Shanghai"
 
-      - name: Delay
-        run: |
-          echo "Delaying for 1 minutes..."
-          sleep 60
-
       - name: Get Data
         run: |
           REPO="${{ github.server_url }}/${{ github.repository }}"
           PRERELEASE="true"
 
           TAG=""
+          for i in {1..3}; do
             if [ "${PRERELEASE}" = "true" ]; then
               TAG="$(curl -skL --connect-timeout 10 "${REPO}/tags" | grep "/refs/tags/.*\.zip" | sed -E 's/.*\/refs\/tags\/(.*)\.zip.*$/\1/' | sort -rV | head -1)"
             else
@@ -52,22 +48,20 @@ jobs:
             [ "${TAG:0:1}" = "v" ] && TAG="${TAG:1}"
             rm -f rr-${TAG}.img.zip
             STATUS=$(curl -kL --connect-timeout 10 -w "%{http_code}" "${REPO}/releases/download/${TAG}/rr-${TAG}.img.zip" -o "rr-${TAG}.img.zip")
-          if [ $? -ne 0 ] || [ ${STATUS:-0} -ne 200 ]; then
-            echo "Download failed"
+            if [ $? -eq 0 ] && [ ${STATUS:-0} -eq 200 ]; then
+              break
+            else
+              echo "Download failed, retry $i/3"
+              sleep 60
+            fi
+          done
+          if [ ! -f "rr-${TAG}.img.zip" ] || [ ${STATUS:-0} -ne 200 ]; then
+            echo "Download failed after 3 attempts"
             exit 1
           fi
 
           unzip rr-${TAG}.img.zip -d rr rr.img
 
-          . scripts/func.sh "${{ secrets.RRORG }}"
-
-          LOOPX=$(sudo losetup -f)
-          sudo losetup -P "${LOOPX}" "rr/rr.img"
-          rm -rf "/tmp/mnt/p3"
-          mkdir -p "/tmp/mnt/p3"
-          mount "${LOOPX}p3" "/tmp/mnt/p3"
-          unpackInitrd /tmp/mnt/p3/initrd-rr "rr/initrd"
-
           sudo apt update
           sudo apt install -y locales busybox dialog gettext sed gawk jq curl 
           sudo apt install -y python-is-python3 python3-pip libelf-dev qemu-utils cpio xz-utils lz4 lzma bzip2 gzip zstd
@@ -77,6 +71,15 @@ jobs:
           sudo mv -f "$(realpath $(which python3))/EXTERNALLY-MANAGED" "$(realpath $(which python3))/EXTERNALLY-MANAGED.bak" 2>/dev/null || true
           sudo pip3 install -U -r scripts/requirements.txt
 
+          . scripts/func.sh "${{ secrets.RRORG }}"
+
+          LOOPX=$(sudo losetup -f)
+          sudo losetup -P "${LOOPX}" "rr/rr.img"
+          rm -rf "/tmp/mnt/p3"
+          mkdir -p "/tmp/mnt/p3"
+          sudo mount "${LOOPX}p3" "/tmp/mnt/p3"
+          unpackInitrd /tmp/mnt/p3/initrd-rr "rr/initrd"
+
           python3 scripts/func.py getmodels -w "rr/initrd" -j "docs/models.json" -x "docs/models.xlsx"
           python3 scripts/func.py getpats -w "rr/initrd" -j "docs/pats.json" -x "docs/pats.xlsx"
           python3 scripts/func.py getaddons -w "/tmp" -j "docs/addons.json" -x "docs/addons.xlsx"

.github/workflows/issues.yml

@@ -148,6 +148,10 @@ jobs:
         run: |
           # 累了, 毁灭吧!
 
+          sudo apt update
+          sudo apt install -y locales busybox dialog gettext sed gawk jq curl
+          sudo apt install -y python-is-python3 python3-pip libelf-dev qemu-utils dosfstools cpio xz-utils lz4 lzma bzip2 gzip zstd
+
           . scripts/func.sh "${{ secrets.RRORG }}"
 
           REPO="${{ github.server_url }}/${{ github.repository }}"
@@ -193,7 +197,7 @@ jobs:
 
           echo "Building..."
           {
-            echo ". include/functions.sh"
+            echo ". menu.sh"
             [ -n "${{ env.language }}" ] && echo "echo \"${{ env.language }}.UTF-8\" >/mnt/p1/.locale"
             [ -n "${{ env.tips }}" ] && echo "echo -e \"${{ env.tips }}\" >/mnt/p3/AddTips"
             [ -n "${{ env.kernel }}" ] && echo "writeConfigKey \"kernel\" \"${{ env.kernel }}\" \"\${USER_CONFIG_FILE}\""

VERSION

@@ -1 +1 @@
-25.9.5
+25.9.6

docs/pats.json

@@ -251,25 +251,444 @@
             "sum": "00000000000000000000000000000000"
         }
     },
-    "DS220+": {},
-    "DS224+": {},
-    "DS2419+": {},
-    "DS2419+II": {},
-    "DS2422+": {},
-    "DS3622xs+": {},
-    "DS420+": {},
-    "DS423+": {},
-    "DS620slim": {},
-    "DS720+": {},
-    "DS723+": {},
-    "DS920+": {},
-    "DS923+": {},
-    "DVA1622": {},
-    "DVA3219": {},
-    "DVA3221": {},
-    "FS2500": {},
-    "FS3400": {},
-    "FS3410": {},
+    "DS220+": {
+        "7.2.2-72806-0": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.2.2/72806/DSM_DS220%2B_72806.pat",
+            "sum": "00000000000000000000000000000000"
+        },
+        "7.0.1-42218-0": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.0.1/42218/DSM_DS220%2B_42218.pat",
+            "sum": "00000000000000000000000000000000"
+        },
+        "7.2.1-69057-1": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.2.1/69057-1/DSM_DS220%2B_69057.pat",
+            "sum": "00000000000000000000000000000000"
+        },
+        "7.2.0-64570-1": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.2/64570-1/DSM_DS220%2B_64570.pat",
+            "sum": "00000000000000000000000000000000"
+        },
+        "7.1.1-42962-1": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.1.1/42962-1/DSM_DS220%2B_42962.pat",
+            "sum": "00000000000000000000000000000000"
+        },
+        "7.1.0-42661-1": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.1/42661-1/DSM_DS220%2B_42661.pat",
+            "sum": "00000000000000000000000000000000"
+        }
+    },
+    "DS224+": {
+        "7.2.2-72806-0": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.2.2/72806/DSM_DS224%2B_72806.pat",
+            "sum": "00000000000000000000000000000000"
+        },
+        "7.2.1-69057-1": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.2.1/69057-1/DSM_DS224%2B_69057.pat",
+            "sum": "00000000000000000000000000000000"
+        }
+    },
+    "DS2419+": {
+        "7.2.2-72806-0": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.2.2/72806/DSM_DS2419%2B_72806.pat",
+            "sum": "00000000000000000000000000000000"
+        },
+        "7.0.1-42218-0": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.0.1/42218/DSM_DS2419%2B_42218.pat",
+            "sum": "00000000000000000000000000000000"
+        },
+        "7.2.1-69057-1": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.2.1/69057-1/DSM_DS2419%2B_69057.pat",
+            "sum": "00000000000000000000000000000000"
+        },
+        "7.2.0-64570-1": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.2/64570-1/DSM_DS2419%2B_64570.pat",
+            "sum": "00000000000000000000000000000000"
+        },
+        "7.1.1-42962-1": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.1.1/42962-1/DSM_DS2419%2B_42962.pat",
+            "sum": "00000000000000000000000000000000"
+        },
+        "7.1.0-42661-1": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.1/42661-1/DSM_DS2419%2B_42661.pat",
+            "sum": "00000000000000000000000000000000"
+        }
+    },
+    "DS2419+II": {
+        "7.2.2-72806-0": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.2.2/72806/DSM_DS2419%2BII_72806.pat",
+            "sum": "00000000000000000000000000000000"
+        },
+        "7.0.1-42218-0": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.0.1/42218/DSM_DS2419%2BII_42218.pat",
+            "sum": "00000000000000000000000000000000"
+        },
+        "7.2.1-69057-1": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.2.1/69057-1/DSM_DS2419%2BII_69057.pat",
+            "sum": "00000000000000000000000000000000"
+        },
+        "7.2.0-64570-1": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.2/64570-1/DSM_DS2419%2BII_64570.pat",
+            "sum": "00000000000000000000000000000000"
+        },
+        "7.1.1-42962-1": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.1.1/42962-1/DSM_DS2419%2BII_42962.pat",
+            "sum": "00000000000000000000000000000000"
+        },
+        "7.1.0-42661-1": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.1/42661-1/DSM_DS2419%2BII_42661.pat",
+            "sum": "00000000000000000000000000000000"
+        }
+    },
+    "DS2422+": {
+        "7.2.2-72806-0": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.2.2/72806/DSM_DS2422%2B_72806.pat",
+            "sum": "00000000000000000000000000000000"
+        },
+        "7.2.1-69057-1": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.2.1/69057-1/DSM_DS2422%2B_69057.pat",
+            "sum": "00000000000000000000000000000000"
+        },
+        "7.2.0-64570-1": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.2/64570-1/DSM_DS2422%2B_64570.pat",
+            "sum": "00000000000000000000000000000000"
+        },
+        "7.1.1-42962-1": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.1.1/42962-1/DSM_DS2422%2B_42962.pat",
+            "sum": "00000000000000000000000000000000"
+        },
+        "7.1.0-42661-1": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.1/42661-1/DSM_DS2422%2B_42661.pat",
+            "sum": "00000000000000000000000000000000"
+        },
+        "7.0.1-42218-0": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.0.1/42218/DSM_DS2422%2B_42218.pat",
+            "sum": "00000000000000000000000000000000"
+        }
+    },
+    "DS3622xs+": {
+        "7.2.2-72806-0": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.2.2/72806/DSM_DS3622xs%2B_72806.pat",
+            "sum": "00000000000000000000000000000000"
+        },
+        "7.2.1-69057-1": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.2.1/69057-1/DSM_DS3622xs%2B_69057.pat",
+            "sum": "00000000000000000000000000000000"
+        },
+        "7.2.0-64570-1": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.2/64570-1/DSM_DS3622xs%2B_64570.pat",
+            "sum": "00000000000000000000000000000000"
+        },
+        "7.1.1-42962-1": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.1.1/42962-1/DSM_DS3622xs%2B_42962.pat",
+            "sum": "00000000000000000000000000000000"
+        },
+        "7.1.0-42661-1": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.1/42661-1/DSM_DS3622xs%2B_42661.pat",
+            "sum": "00000000000000000000000000000000"
+        },
+        "7.0.1-42218-0": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.0.1/42218/DSM_DS3622xs%2B_42218.pat",
+            "sum": "00000000000000000000000000000000"
+        }
+    },
+    "DS420+": {
+        "7.2.2-72806-0": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.2.2/72806/DSM_DS420%2B_72806.pat",
+            "sum": "00000000000000000000000000000000"
+        },
+        "7.0.1-42218-0": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.0.1/42218/DSM_DS420%2B_42218.pat",
+            "sum": "00000000000000000000000000000000"
+        },
+        "7.2.1-69057-1": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.2.1/69057-1/DSM_DS420%2B_69057.pat",
+            "sum": "00000000000000000000000000000000"
+        },
+        "7.2.0-64570-1": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.2/64570-1/DSM_DS420%2B_64570.pat",
+            "sum": "00000000000000000000000000000000"
+        },
+        "7.1.1-42962-1": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.1.1/42962-1/DSM_DS420%2B_42962.pat",
+            "sum": "00000000000000000000000000000000"
+        },
+        "7.1.0-42661-1": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.1/42661-1/DSM_DS420%2B_42661.pat",
+            "sum": "00000000000000000000000000000000"
+        }
+    },
+    "DS423+": {
+        "7.2.2-72806-0": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.2.2/72806/DSM_DS423%2B_72806.pat",
+            "sum": "00000000000000000000000000000000"
+        },
+        "7.2.1-69057-1": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.2.1/69057-1/DSM_DS423%2B_69057.pat",
+            "sum": "00000000000000000000000000000000"
+        },
+        "7.2.0-64570-1": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.2/64570-1/DSM_DS423%2B_64570.pat",
+            "sum": "00000000000000000000000000000000"
+        },
+        "7.1.1-42962-0": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.1.1/42962/DSM_DS423%2B_42962.pat",
+            "sum": "00000000000000000000000000000000"
+        }
+    },
+    "DS620slim": {
+        "7.2.2-72806-0": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.2.2/72806/DSM_DS620slim_72806.pat",
+            "sum": "00000000000000000000000000000000"
+        },
+        "7.0.1-42218-0": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.0.1/42218/DSM_DS620slim_42218.pat",
+            "sum": "00000000000000000000000000000000"
+        },
+        "7.2.1-69057-0": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.2.1/69057/DSM_DS620slim_69057.pat",
+            "sum": "00000000000000000000000000000000"
+        },
+        "7.2.0-64570-1": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.2/64570-1/DSM_DS620slim_64570.pat",
+            "sum": "00000000000000000000000000000000"
+        },
+        "7.1.1-42962-1": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.1.1/42962-1/DSM_DS620slim_42962.pat",
+            "sum": "00000000000000000000000000000000"
+        },
+        "7.1.0-42661-1": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.1/42661-1/DSM_DS620slim_42661.pat",
+            "sum": "00000000000000000000000000000000"
+        }
+    },
+    "DS720+": {
+        "7.2.2-72806-0": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.2.2/72806/DSM_DS720%2B_72806.pat",
+            "sum": "00000000000000000000000000000000"
+        },
+        "7.0.1-42218-0": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.0.1/42218/DSM_DS720%2B_42218.pat",
+            "sum": "00000000000000000000000000000000"
+        },
+        "7.2.1-69057-1": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.2.1/69057-1/DSM_DS720%2B_69057.pat",
+            "sum": "00000000000000000000000000000000"
+        },
+        "7.2.0-64570-1": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.2/64570-1/DSM_DS720%2B_64570.pat",
+            "sum": "00000000000000000000000000000000"
+        },
+        "7.1.1-42962-1": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.1.1/42962-1/DSM_DS720%2B_42962.pat",
+            "sum": "00000000000000000000000000000000"
+        },
+        "7.1.0-42661-1": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.1/42661-1/DSM_DS720%2B_42661.pat",
+            "sum": "00000000000000000000000000000000"
+        }
+    },
+    "DS723+": {
+        "7.2.2-72806-0": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.2.2/72806/DSM_DS723%2B_72806.pat",
+            "sum": "00000000000000000000000000000000"
+        },
+        "7.2.1-69057-1": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.2.1/69057-1/DSM_DS723%2B_69057.pat",
+            "sum": "00000000000000000000000000000000"
+        },
+        "7.2.0-64570-1": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.2/64570-1/DSM_DS723%2B_64570.pat",
+            "sum": "00000000000000000000000000000000"
+        },
+        "7.1.1-42962-0": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.1.1/42962/DSM_DS723%2B_42962.pat",
+            "sum": "00000000000000000000000000000000"
+        }
+    },
+    "DS920+": {
+        "7.2.2-72806-0": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.2.2/72806/DSM_DS920%2B_72806.pat",
+            "sum": "00000000000000000000000000000000"
+        },
+        "7.0.1-42218-0": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.0.1/42218/DSM_DS920%2B_42218.pat",
+            "sum": "00000000000000000000000000000000"
+        },
+        "7.2.1-69057-1": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.2.1/69057-1/DSM_DS920%2B_69057.pat",
+            "sum": "00000000000000000000000000000000"
+        },
+        "7.2.0-64570-1": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.2/64570-1/DSM_DS920%2B_64570.pat",
+            "sum": "00000000000000000000000000000000"
+        },
+        "7.1.1-42962-1": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.1.1/42962-1/DSM_DS920%2B_42962.pat",
+            "sum": "00000000000000000000000000000000"
+        },
+        "7.1.0-42661-1": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.1/42661-1/DSM_DS920%2B_42661.pat",
+            "sum": "00000000000000000000000000000000"
+        }
+    },
+    "DS923+": {
+        "7.2.2-72806-0": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.2.2/72806/DSM_DS923%2B_72806.pat",
+            "sum": "00000000000000000000000000000000"
+        },
+        "7.2.1-69057-1": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.2.1/69057-1/DSM_DS923%2B_69057.pat",
+            "sum": "00000000000000000000000000000000"
+        },
+        "7.2.0-64570-1": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.2/64570-1/DSM_DS923%2B_64570.pat",
+            "sum": "00000000000000000000000000000000"
+        },
+        "7.1.1-42962-0": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.1.1/42962/DSM_DS923%2B_42962.pat",
+            "sum": "00000000000000000000000000000000"
+        }
+    },
+    "DVA1622": {
+        "7.2.2-72806-0": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.2.2/72806/DSM_DVA1622_72806.pat",
+            "sum": "00000000000000000000000000000000"
+        },
+        "7.2.1-69057-1": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.2.1/69057-1/DSM_DVA1622_69057.pat",
+            "sum": "00000000000000000000000000000000"
+        },
+        "7.2.0-64570-1": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.2/64570-1/DSM_DVA1622_64570.pat",
+            "sum": "00000000000000000000000000000000"
+        },
+        "7.1.1-42962-1": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.1.1/42962-1/DSM_DVA1622_42962.pat",
+            "sum": "00000000000000000000000000000000"
+        }
+    },
+    "DVA3219": {
+        "7.2.2-72806-0": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.2.2/72806/DSM_DVA3219_72806.pat",
+            "sum": "00000000000000000000000000000000"
+        },
+        "7.0.1-42218-0": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.0.1/42218/DSM_DVA3219_42218.pat",
+            "sum": "00000000000000000000000000000000"
+        },
+        "7.2.1-69057-1": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.2.1/69057-1/DSM_DVA3219_69057.pat",
+            "sum": "00000000000000000000000000000000"
+        },
+        "7.2.0-64570-1": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.2/64570-1/DSM_DVA3219_64570.pat",
+            "sum": "00000000000000000000000000000000"
+        },
+        "7.1.1-42962-1": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.1.1/42962-1/DSM_DVA3219_42962.pat",
+            "sum": "00000000000000000000000000000000"
+        },
+        "7.1.0-42661-1": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.1/42661-1/DSM_DVA3219_42661.pat",
+            "sum": "00000000000000000000000000000000"
+        }
+    },
+    "DVA3221": {
+        "7.2.2-72806-0": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.2.2/72806/DSM_DVA3221_72806.pat",
+            "sum": "00000000000000000000000000000000"
+        },
+        "7.0.1-42218-0": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.0.1/42218/DSM_DVA3221_42218.pat",
+            "sum": "00000000000000000000000000000000"
+        },
+        "7.2.1-69057-1": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.2.1/69057-1/DSM_DVA3221_69057.pat",
+            "sum": "00000000000000000000000000000000"
+        },
+        "7.2.0-64570-1": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.2/64570-1/DSM_DVA3221_64570.pat",
+            "sum": "00000000000000000000000000000000"
+        },
+        "7.1.1-42962-1": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.1.1/42962-1/DSM_DVA3221_42962.pat",
+            "sum": "00000000000000000000000000000000"
+        },
+        "7.1.0-42661-1": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.1/42661-1/DSM_DVA3221_42661.pat",
+            "sum": "00000000000000000000000000000000"
+        }
+    },
+    "FS2500": {
+        "7.2.2-72806-0": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.2.2/72806/DSM_FS2500_72806.pat",
+            "sum": "00000000000000000000000000000000"
+        },
+        "7.2.1-69057-1": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.2.1/69057-1/DSM_FS2500_69057.pat",
+            "sum": "00000000000000000000000000000000"
+        },
+        "7.2.0-64570-1": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.2/64570-1/DSM_FS2500_64570.pat",
+            "sum": "00000000000000000000000000000000"
+        },
+        "7.1.1-42962-1": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.1.1/42962-1/DSM_FS2500_42962.pat",
+            "sum": "00000000000000000000000000000000"
+        },
+        "7.1.0-42661-1": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.1/42661-1/DSM_FS2500_42661.pat",
+            "sum": "00000000000000000000000000000000"
+        },
+        "7.0.1-42218-0": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.0.1/42218/DSM_FS2500_42218.pat",
+            "sum": "00000000000000000000000000000000"
+        }
+    },
+    "FS3400": {
+        "7.2.2-72806-0": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.2.2/72806/DSM_FS3400_72806.pat",
+            "sum": "00000000000000000000000000000000"
+        },
+        "7.0.1-42218-0": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.0.1/42218/DSM_FS3400_42218.pat",
+            "sum": "00000000000000000000000000000000"
+        },
+        "7.2.1-69057-1": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.2.1/69057-1/DSM_FS3400_69057.pat",
+            "sum": "00000000000000000000000000000000"
+        },
+        "7.2.0-64570-1": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.2/64570-1/DSM_FS3400_64570.pat",
+            "sum": "00000000000000000000000000000000"
+        },
+        "7.1.1-42962-1": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.1.1/42962-1/DSM_FS3400_42962.pat",
+            "sum": "00000000000000000000000000000000"
+        },
+        "7.1.0-42661-1": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.1/42661-1/DSM_FS3400_42661.pat",
+            "sum": "00000000000000000000000000000000"
+        }
+    },
+    "FS3410": {
+        "7.2.2-72806-0": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.2.2/72806/DSM_FS3410_72806.pat",
+            "sum": "00000000000000000000000000000000"
+        },
+        "7.2.1-69057-1": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.2.1/69057-1/DSM_FS3410_69057.pat",
+            "sum": "00000000000000000000000000000000"
+        },
+        "7.2.0-64570-1": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.2/64570-1/DSM_FS3410_64570.pat",
+            "sum": "00000000000000000000000000000000"
+        },
+        "7.1.1-42962-1": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.1.1/42962-1/DSM_FS3410_42962.pat",
+            "sum": "00000000000000000000000000000000"
+        }
+    },
     "FS3600": {
         "7.2.2-72806-0": {
             "url": "https://global.synologydownload.com/download/DSM/release/7.2.2/72806/DSM_FS3600_72806.pat",
@@ -652,6 +1071,14 @@
         "7.2.0-64570-1": {
             "url": "https://global.synologydownload.com/download/DSM/release/7.2/64570-1/DSM_RS820%2B_64570.pat",
             "sum": "00000000000000000000000000000000"
+        },
+        "7.1.1-42962-1": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.1.1/42962-1/DSM_RS820%2B_42962.pat",
+            "sum": "00000000000000000000000000000000"
+        },
+        "7.1.0-42661-1": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.1/42661-1/DSM_RS820%2B_42661.pat",
+            "sum": "00000000000000000000000000000000"
         }
     },
     "RS820RP+": {
@@ -732,11 +1159,78 @@
         "7.2.0-64570-1": {
             "url": "https://global.synologydownload.com/download/DSM/release/7.2/64570-1/DSM_SA3200D_64570.pat",
             "sum": "00000000000000000000000000000000"
+        },
+        "7.1.1-42962-1": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.1.1/42962-1/DSM_SA3200D_42962.pat",
+            "sum": "00000000000000000000000000000000"
+        },
+        "7.1.0-42661-1": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.1/42661-1/DSM_SA3200D_42661.pat",
+            "sum": "00000000000000000000000000000000"
+        }
+    },
+    "SA3400": {
+        "7.2.2-72806-0": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.2.2/72806/DSM_SA3400_72806.pat",
+            "sum": "00000000000000000000000000000000"
+        },
+        "7.0.1-42218-0": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.0.1/42218/DSM_SA3400_42218.pat",
+            "sum": "00000000000000000000000000000000"
+        },
+        "7.2.1-69057-1": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.2.1/69057-1/DSM_SA3400_69057.pat",
+            "sum": "00000000000000000000000000000000"
+        },
+        "7.2.0-64570-1": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.2/64570-1/DSM_SA3400_64570.pat",
+            "sum": "00000000000000000000000000000000"
+        },
+        "7.1.1-42962-1": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.1.1/42962-1/DSM_SA3400_42962.pat",
+            "sum": "00000000000000000000000000000000"
+        },
+        "7.1.0-42661-1": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.1/42661-1/DSM_SA3400_42661.pat",
+            "sum": "00000000000000000000000000000000"
+        }
+    },
+    "SA3400D": {
+        "7.2.2-72806-0": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.2.2/72806/DSM_SA3400D_72806.pat",
+            "sum": "00000000000000000000000000000000"
+        },
+        "7.2.1-69057-1": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.2.1/69057-1/DSM_SA3400D_69057.pat",
+            "sum": "00000000000000000000000000000000"
+        },
+        "7.2.0-64570-1": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.2/64570-1/DSM_SA3400D_64570.pat",
+            "sum": "00000000000000000000000000000000"
+        },
+        "7.1.1-42962-0": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.1.1/42962/DSM_SA3400D_42962.pat",
+            "sum": "00000000000000000000000000000000"
+        }
+    },
+    "SA3410": {
+        "7.2.2-72806-0": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.2.2/72806/DSM_SA3410_72806.pat",
+            "sum": "00000000000000000000000000000000"
+        },
+        "7.2.1-69057-0": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.2.1/69057/DSM_SA3410_69057.pat",
+            "sum": "00000000000000000000000000000000"
+        },
+        "7.2.0-64570-1": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.2/64570-1/DSM_SA3410_64570.pat",
+            "sum": "00000000000000000000000000000000"
+        },
+        "7.1.1-42962-0": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.1.1/42962/DSM_SA3410_42962.pat",
+            "sum": "00000000000000000000000000000000"
         }
     },
-    "SA3400": {},
-    "SA3400D": {},
-    "SA3410": {},
     "SA3600": {
         "7.2.2-72806-0": {
             "url": "https://global.synologydownload.com/download/DSM/release/7.2.2/72806/DSM_SA3600_72806.pat",
@@ -1049,13 +1543,196 @@
         "7.2.0-64570-1": {
             "url": "https://global.synologydownload.com/download/DSM/release/7.2/64570-1/DSM_FS2017_64570.pat",
             "sum": "00000000000000000000000000000000"
+        },
+        "7.1.1-42962-1": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.1.1/42962-1/DSM_FS2017_42962.pat",
+            "sum": "00000000000000000000000000000000"
+        },
+        "7.1.0-42661-1": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.1/42661-1/DSM_FS2017_42661.pat",
+            "sum": "00000000000000000000000000000000"
         }
     },
-    "RS18017xs+": {},
-    "RS2418+": {},
-    "RS2418RP+": {},
-    "RS2818RP+": {},
-    "RS3617RPxs": {},
-    "RS3617xs+": {},
-    "RS4017xs+": {}
+    "RS18017xs+": {
+        "7.2.2-72806-0": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.2.2/72806/DSM_RS18017xs%2B_72806.pat",
+            "sum": "00000000000000000000000000000000"
+        },
+        "7.0.1-42218-0": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.0.1/42218/DSM_RS18017xs%2B_42218.pat",
+            "sum": "00000000000000000000000000000000"
+        },
+        "7.2.1-69057-1": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.2.1/69057-1/DSM_RS18017xs%2B_69057.pat",
+            "sum": "00000000000000000000000000000000"
+        },
+        "7.2.0-64570-1": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.2/64570-1/DSM_RS18017xs%2B_64570.pat",
+            "sum": "00000000000000000000000000000000"
+        },
+        "7.1.1-42962-1": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.1.1/42962-1/DSM_RS18017xs%2B_42962.pat",
+            "sum": "00000000000000000000000000000000"
+        },
+        "7.1.0-42661-1": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.1/42661-1/DSM_RS18017xs%2B_42661.pat",
+            "sum": "00000000000000000000000000000000"
+        }
+    },
+    "RS2418+": {
+        "7.2.2-72806-0": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.2.2/72806/DSM_RS2418%2B_72806.pat",
+            "sum": "00000000000000000000000000000000"
+        },
+        "7.0.1-42218-0": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.0.1/42218/DSM_RS2418%2B_42218.pat",
+            "sum": "00000000000000000000000000000000"
+        },
+        "7.2.1-69057-1": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.2.1/69057-1/DSM_RS2418%2B_69057.pat",
+            "sum": "00000000000000000000000000000000"
+        },
+        "7.2.0-64570-1": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.2/64570-1/DSM_RS2418%2B_64570.pat",
+            "sum": "00000000000000000000000000000000"
+        },
+        "7.1.1-42962-1": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.1.1/42962-1/DSM_RS2418%2B_42962.pat",
+            "sum": "00000000000000000000000000000000"
+        },
+        "7.1.0-42661-1": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.1/42661-1/DSM_RS2418%2B_42661.pat",
+            "sum": "00000000000000000000000000000000"
+        }
+    },
+    "RS2418RP+": {
+        "7.2.2-72806-0": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.2.2/72806/DSM_RS2418RP%2B_72806.pat",
+            "sum": "00000000000000000000000000000000"
+        },
+        "7.0.1-42218-0": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.0.1/42218/DSM_RS2418RP%2B_42218.pat",
+            "sum": "00000000000000000000000000000000"
+        },
+        "7.2.1-69057-1": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.2.1/69057-1/DSM_RS2418RP%2B_69057.pat",
+            "sum": "00000000000000000000000000000000"
+        },
+        "7.2.0-64570-1": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.2/64570-1/DSM_RS2418RP%2B_64570.pat",
+            "sum": "00000000000000000000000000000000"
+        },
+        "7.1.1-42962-1": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.1.1/42962-1/DSM_RS2418RP%2B_42962.pat",
+            "sum": "00000000000000000000000000000000"
+        },
+        "7.1.0-42661-1": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.1/42661-1/DSM_RS2418RP%2B_42661.pat",
+            "sum": "00000000000000000000000000000000"
+        }
+    },
+    "RS2818RP+": {
+        "7.2.2-72806-0": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.2.2/72806/DSM_RS2818RP%2B_72806.pat",
+            "sum": "00000000000000000000000000000000"
+        },
+        "7.0.1-42218-0": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.0.1/42218/DSM_RS2818RP%2B_42218.pat",
+            "sum": "00000000000000000000000000000000"
+        },
+        "7.2.1-69057-1": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.2.1/69057-1/DSM_RS2818RP%2B_69057.pat",
+            "sum": "00000000000000000000000000000000"
+        },
+        "7.2.0-64570-1": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.2/64570-1/DSM_RS2818RP%2B_64570.pat",
+            "sum": "00000000000000000000000000000000"
+        },
+        "7.1.1-42962-1": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.1.1/42962-1/DSM_RS2818RP%2B_42962.pat",
+            "sum": "00000000000000000000000000000000"
+        },
+        "7.1.0-42661-1": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.1/42661-1/DSM_RS2818RP%2B_42661.pat",
+            "sum": "00000000000000000000000000000000"
+        }
+    },
+    "RS3617RPxs": {
+        "7.2.2-72806-0": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.2.2/72806/DSM_RS3617RPxs_72806.pat",
+            "sum": "00000000000000000000000000000000"
+        },
+        "7.0.1-42218-0": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.0.1/42218/DSM_RS3617RPxs_42218.pat",
+            "sum": "00000000000000000000000000000000"
+        },
+        "7.2.1-69057-1": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.2.1/69057-1/DSM_RS3617RPxs_69057.pat",
+            "sum": "00000000000000000000000000000000"
+        },
+        "7.2.0-64570-1": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.2/64570-1/DSM_RS3617RPxs_64570.pat",
+            "sum": "00000000000000000000000000000000"
+        },
+        "7.1.1-42962-1": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.1.1/42962-1/DSM_RS3617RPxs_42962.pat",
+            "sum": "00000000000000000000000000000000"
+        },
+        "7.1.0-42661-1": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.1/42661-1/DSM_RS3617RPxs_42661.pat",
+            "sum": "00000000000000000000000000000000"
+        }
+    },
+    "RS3617xs+": {
+        "7.2.2-72806-0": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.2.2/72806/DSM_RS3617xs%2B_72806.pat",
+            "sum": "00000000000000000000000000000000"
+        },
+        "7.0.1-42218-0": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.0.1/42218/DSM_RS3617xs%2B_42218.pat",
+            "sum": "00000000000000000000000000000000"
+        },
+        "7.2.1-69057-1": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.2.1/69057-1/DSM_RS3617xs%2B_69057.pat",
+            "sum": "00000000000000000000000000000000"
+        },
+        "7.2.0-64570-1": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.2/64570-1/DSM_RS3617xs%2B_64570.pat",
+            "sum": "00000000000000000000000000000000"
+        },
+        "7.1.1-42962-1": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.1.1/42962-1/DSM_RS3617xs%2B_42962.pat",
+            "sum": "00000000000000000000000000000000"
+        },
+        "7.1.0-42661-1": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.1/42661-1/DSM_RS3617xs%2B_42661.pat",
+            "sum": "00000000000000000000000000000000"
+        }
+    },
+    "RS4017xs+": {
+        "7.2.2-72806-0": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.2.2/72806/DSM_RS4017xs%2B_72806.pat",
+            "sum": "00000000000000000000000000000000"
+        },
+        "7.0.1-42218-0": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.0.1/42218/DSM_RS4017xs%2B_42218.pat",
+            "sum": "00000000000000000000000000000000"
+        },
+        "7.2.1-69057-1": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.2.1/69057-1/DSM_RS4017xs%2B_69057.pat",
+            "sum": "00000000000000000000000000000000"
+        },
+        "7.2.0-64570-1": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.2/64570-1/DSM_RS4017xs%2B_64570.pat",
+            "sum": "00000000000000000000000000000000"
+        },
+        "7.1.1-42962-1": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.1.1/42962-1/DSM_RS4017xs%2B_42962.pat",
+            "sum": "00000000000000000000000000000000"
+        },
+        "7.1.0-42661-1": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.1/42661-1/DSM_RS4017xs%2B_42661.pat",
+            "sum": "00000000000000000000000000000000"
+        }
+    }
 }

files/initrd/opt/rr/include/consts.sh

@@ -8,7 +8,7 @@
 
 # shellcheck disable=SC2034
 
-RR_VERSION="25.9.5"
+RR_VERSION="25.9.6"
 RR_RELEASE=""
 RR_TITLE="RR v${RR_VERSION}"
 

files/initrd/opt/rr/menu.sh

@@ -4067,8 +4067,9 @@ function notepadMenu() {
 
 ###############################################################################
 ###############################################################################
-if [ $# -ge 1 ]; then
+if [ ! "$(basename -- "${0}")" = "$(basename -- "${BASH_SOURCE[0]}")" ] || [ $# -gt 0 ]; then
   "$@"
+	cleanup_lock
 else
   if [ -z "${MODEL}" ] && [ -z "${PRODUCTVER}" ] && [ -n "$(findDSMRoot)" ]; then
     DIALOG --title "$(TEXT "Main menu")" \

files/mnt/p1/RR_VERSION

@@ -1 +1 @@
-25.9.5
+25.9.6

scripts/func.py

@@ -197,7 +197,7 @@ def getpats(workpath, jsonpath, xlsxpath):
                         continue
                     V = __fullversion(f"{S['build_ver']}-{S['build_num']}-{S['nano']}")
                     if V not in pats[M]:
-                        reqPat = session.head(S['files'][0]['url'].split('?')[0], timeout=10, verify=False)
+                        reqPat = session.head(S['files'][0]['url'].split('?')[0].replace("global.synologydownload.com", "global.download.synology.com"), timeout=10, verify=False)
                         if reqPat.status_code == 403:
                             continue
                         pats[M][V] = {