.github/workflows/issues.yml

@@ -29,9 +29,7 @@ jobs:
           # -*- coding: utf-8 -*-
           import json, subprocess
           def set_output(name, value):
-              subprocess.call(f'echo "{name}<<EOF" >> $GITHUB_ENV', shell=True)
+            subprocess.call(["echo '{}={}' >> $GITHUB_ENV".format(name, value)], shell=True)
-              subprocess.call(f'echo "{value}" >> $GITHUB_ENV', shell=True)
-              subprocess.call(f'echo "EOF" >> $GITHUB_ENV', shell=True)
 
           issuetitle = ${{ toJSON(github.event.issue.title) }}
           issuebody = ${{ toJSON(github.event.issue.body) }}
@@ -45,7 +43,6 @@ jobs:
           language= ''
           sn = ''
           macs = ''
-          tips = ''
           model = ''
           version = ''
           kernel = ''
@@ -61,7 +58,6 @@ jobs:
                   language = jsonbody.get('language', '')
                   sn = jsonbody.get('sn', '')
                   macs = jsonbody.get('macs', '')
-                  tips = jsonbody.get('tips', '')
                   model = jsonbody.get('model', '')
                   version = jsonbody.get('version', '')
                   kernel = jsonbody.get('kernel', '')
@@ -83,7 +79,6 @@ jobs:
           set_output("language", language)
           set_output("sn", sn)
           set_output("macs", macs)
-          set_output("tips", tips)
           set_output("model", model)
           set_output("version", version)
           set_output("kernel", kernel)
@@ -253,7 +248,7 @@ jobs:
             USER_CONFIG_FILE="rr/ws/mnt/p1/user-config.yml"
             writeConfigKey "sn" "${{ env.sn }}" "${USER_CONFIG_FILE}"
           fi
-
+          
           if [ -n "${{ env.macs }}" ]; then
             echo "set macs: ${{ env.macs }}"
             USER_CONFIG_FILE="rr/ws/mnt/p1/user-config.yml"
@@ -262,11 +257,6 @@ jobs:
             writeConfigKey "mac2" "${MACS[1]}" "${USER_CONFIG_FILE}"
           fi
 
-          if [ -n "${{ env.tips }}" ]; then
-            echo "set tips: ${{ env.tips }}"
-            echo -e "${{ env.tips }}" | sudo tee rr/ws/mnt/p3/AddTips
-          fi
-
           if [ -n "${{ env.addons }}" ]; then
             echo "set addons: ${{ env.addons }}"
             USER_CONFIG_FILE="rr/ws/mnt/p1/user-config.yml"
@@ -425,6 +415,14 @@ jobs:
             ----
           emoji: hooray
 
+      - name: Close Issues
+        if: env.iscustom == 'true' && success()
+        uses: actions-cool/issues-helper@v3
+        with:
+          actions: 'close-issue'
+          token: ${{ secrets.GITHUB_TOKEN }}
+          issue-number: ${{ github.event.issue.number }}
+
       - name: Update Comment Fail
         if: env.iscustom == 'true' && failure()
         uses: actions-cool/issues-helper@v3
@@ -439,11 +437,3 @@ jobs:
             > ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}  
             ----
           emoji: confused
-
-      - name: Close Issues
-        if: env.iscustom == 'true'
-        uses: actions-cool/issues-helper@v3
-        with:
-          actions: 'close-issue'
-          token: ${{ secrets.GITHUB_TOKEN }}
-          issue-number: ${{ github.event.issue.number }}

VERSION

@@ -1 +1 @@
-25.9.2
+25.8.0

docs/addons.json

@@ -359,26 +359,6 @@
             "zh_TW": "雜項功能. (一些必要的修改的集合.)"
         }
     },
-    "monitor": {
-        "system": false,
-        "description": {
-            "en_US": "Monitor Power Management (Only supports graphics card drivers).",
-            "ar_SA": "إدارة الطاقة للمراقبة(يدعم فقط برامج تشغيل بطاقة الرسومات).",
-            "de_DE": "Überwachung der Energieverwaltung (nur unterstützt Graphikkartendrivers).",
-            "es_ES": "Monitoreo de la gestión de energía (solo admite controladores de tarjeta gráfica).",
-            "fr_FR": "Surveillance de la gestion de l'alimentation (seulement les pilotes de carte graphique sont pris en charge).",
-            "ja_JP": "電源管理の監視 (グラフィックスカードドライバーのみサポート)。",
-            "ko_KR": "모니터 전원 관리 (그래픽 카드 드라이버만 지원)。",
-            "ru_RU": "Мониторинг управления питанием (только поддерживает драйверы графических карт).",
-            "th_TH": "การตรวจสอบการบริหารจัดการพลังงาน (แค่สนับสนุนไดรเวอร์การทำงานของการ์ดราฟิก).",
-            "tr_TR": "Monitör Güç Yönetimi (grafik kart sürücüsü destekliyor).",
-            "uk_UA": "Моніторинг управління живленням (тільки підтримує драйвери графічних карток).",
-            "vi_VN": "Quản lý nguồn điện (chỉ hỗ trợ các driver của card đồ họa).",
-            "zh_CN": "显示器电源管理 (仅支持显卡已驱动的环境)。",
-            "zh_HK": "顯示器電源管理 (僅支持显卡已驅動的环境)。",
-            "zh_TW": "顯示器電源管理 (僅支持显卡已驅動的环境)。"
-        }
-    },
     "mountloader": {
         "system": false,
         "description": {

docs/issues.html

@@ -29,23 +29,6 @@
     .textarea-style {
       width: 100%;
     }
-
-    #logo {
-      text-align: center;
-      margin: 20px auto !important;
-    }
-
-    #labels {
-      text-align: center;
-      margin: 20px auto !important;
-      height: auto !important;
-    }
-
-    #products {
-      text-align: center;
-      margin: 20px auto !important;
-      height: auto !important;
-    }
   </style>
   <script src="https://code.jquery.com/jquery-3.3.1.min.js"></script>
   <script src="https://polyfill.io/v3/polyfill.min.js"></script>
@@ -107,11 +90,9 @@
               if (debug) {
                 $('#sn_item').show();
                 $('#macs_item').show();
-                $('#tips_item').show();
               } else {
                 $('#sn_item').hide();
                 $('#macs_item').hide();
-                $('#tips_item').hide();
               }
               setModels();
             });
@@ -281,7 +262,7 @@
       var body = {};
       var _parameters = ["title", "format", "size", "template", "language", "model", "version", "kernel", "addons", "modules"];
       if (debug) {
-        _parameters.push("sn", "macs", "tips");
+        _parameters.push("sn", "macs");
       }
       for (var key in _parameters) {
         var name = _parameters[key];
@@ -328,22 +309,29 @@
 ╚═╝  ╚═╝╚═╝  ╚═╝       ╚═════╝ ╚═════╝ ╚══════╝   ╚═╝    ╚═════╝ ╚═╝     ╚═╝
                                                                                                                                   
       </pre>
-    <div class="shields" id="labels">
+    <div class="image" id="products" style="height: 50px; margin-left: 200px;">
-      <a id="titleA" href="https://github.com/RROrg/rr">
-        <img alt="GitHub Release"
-          src="https://img.shields.io/github/v/release/rrorg/rr?include_prereleases&style=flat-square&label=current">
-      </a>
-      <a id="titleA" href="https://github.com/RROrg/rr">
-        <img alt="GitHub Issues"
-          src="https://img.shields.io/github/issues-closed-raw/rrorg/rr/custom?style=flat-square&label=custom">
-      </a>
-      <a id="titleB" href="./changelogs.html">
-        <img alt="GitHub Release" src="https://img.shields.io/badge/Changelogs-8A2BE2&style=flat">
-      </a>
-    </div>
-    <div class="image" id="products">
       <img src="https://www.synology.cn/img/products/detail/SA6400/heading.png" width="20%">
     </div>
+    <div class="flex-auto min-width-0 width-fit mr-3">
+      <div class="d-flex flex-wrap flex-items-center wb-break-word f3 text-normal">
+        <a id="titleA" href="https://github.com/RROrg/rr">
+          <img alt="GitHub Release"
+            src="https://img.shields.io/github/v/release/rrorg/rr?include_prereleases&style=flat-square&label=current">
+          <img alt="GitHub Issues"
+            src="https://img.shields.io/github/issues-closed-raw/rrorg/rr/custom?style=flat-square&label=custom">
+        </a>
+      </div>
+      <div class="d-flex flex-wrap flex-items-center wb-break-word f3 text-normal">
+        <a id="titleB" href="./changelogs.html">
+          <img alt="GitHub Release" src="https://img.shields.io/badge/Changelogs-8A2BE2&style=flat">
+        </a>
+      </div>
+      <div class="btn-link tabnav-tab preview-tab js-preview-tab flex-1 flex-md-auto width-full">
+        <marquee id="content" direction="up" height="36" scrollamount="1" onMouseOut="this.start()"
+          onMouseOver="this.stop()">
+        </marquee>
+      </div>
+    </div>
     <div class="form-group mt-1 mb-2" id="title_item">
       <div class="form-group-header">
         <label class="color-fg-default text-mono f6">Title: (Please do not delete the "custom " in the title of
@@ -434,14 +422,6 @@
         <input class="form-control input-contrast input-sm" type="text" id="macs" name="inputs[macs]" value=""></input>
       </div>
     </div>
-    <div class="form-group mt-1 mb-2" id="tips_item">
-      <div class="form-group-header">
-        <label class="color-fg-default text-mono f6">Tips:</label>
-      </div>
-      <div class="form-group-body">
-        <input class="form-control input-contrast input-sm" type="text" id="tips" name="inputs[tips]" value=""></input>
-      </div>
-    </div>
     <div class="form-group mt-1 mb-2" id="model_item">
       <div class="form-group-header">
         <label class="color-fg-default text-mono f6">Model:</label>

docs/modules.json

@@ -812,10 +812,6 @@
             "description": "low-level driver for Silicon Image SATA controller (Compiled by RR for DSM)",
             "depends": ""
         },
-        "scsi_debug": {
-            "description": "SCSI debug adapter driver (Compiled by RR for DSM)",
-            "depends": ""
-        },
         "scsi_transport_sas": {
             "description": "SAS Transport Attributes",
             "depends": ""
@@ -2070,10 +2066,6 @@
             "description": "Stochastic Fairness Queueing discipline (Compiled by RR for DSM)",
             "depends": ""
         },
-        "scsi_debug": {
-            "description": "SCSI debug adapter driver (Compiled by RR for DSM)",
-            "depends": ""
-        },
         "scsi_transport_sas": {
             "description": "SAS Transport Attributes",
             "depends": ""
@@ -3088,10 +3080,6 @@
             "description": "low-level driver for Silicon Image SATA controller (Compiled by RR for DSM)",
             "depends": ""
         },
-        "scsi_debug": {
-            "description": "SCSI debug adapter driver (Compiled by RR for DSM)",
-            "depends": ""
-        },
         "scsi_transport_fc": {
             "description": "FC Transport Attributes",
             "depends": ""
@@ -4274,10 +4262,6 @@
             "description": "Stochastic Fairness Queueing discipline (Compiled by RR for DSM)",
             "depends": ""
         },
-        "scsi_debug": {
-            "description": "SCSI debug adapter driver (Compiled by RR for DSM)",
-            "depends": ""
-        },
         "scsi_transport_fc": {
             "description": "FC Transport Attributes",
             "depends": ""
@@ -5276,10 +5260,6 @@
             "description": "low-level driver for Silicon Image SATA controller (Compiled by RR for DSM)",
             "depends": ""
         },
-        "scsi_debug": {
-            "description": "SCSI debug adapter driver (Compiled by RR for DSM)",
-            "depends": ""
-        },
         "scsi_transport_fc": {
             "description": "FC Transport Attributes",
             "depends": ""
@@ -6462,10 +6442,6 @@
             "description": "Stochastic Fairness Queueing discipline (Compiled by RR for DSM)",
             "depends": ""
         },
-        "scsi_debug": {
-            "description": "SCSI debug adapter driver (Compiled by RR for DSM)",
-            "depends": ""
-        },
         "scsi_transport_fc": {
             "description": "FC Transport Attributes",
             "depends": ""
@@ -7464,10 +7440,6 @@
             "description": "low-level driver for Silicon Image SATA controller (Compiled by RR for DSM)",
             "depends": ""
         },
-        "scsi_debug": {
-            "description": "SCSI debug adapter driver (Compiled by RR for DSM)",
-            "depends": ""
-        },
         "scsi_transport_fc": {
             "description": "FC Transport Attributes",
             "depends": ""
@@ -8650,10 +8622,6 @@
             "description": "Stochastic Fairness Queueing discipline (Compiled by RR for DSM)",
             "depends": ""
         },
-        "scsi_debug": {
-            "description": "SCSI debug adapter driver (Compiled by RR for DSM)",
-            "depends": ""
-        },
         "scsi_transport_fc": {
             "description": "FC Transport Attributes",
             "depends": ""
@@ -9664,10 +9632,6 @@
             "description": "low-level driver for Silicon Image SATA controller (Compiled by RR for DSM)",
             "depends": ""
         },
-        "scsi_debug": {
-            "description": "SCSI debug adapter driver (Compiled by RR for DSM)",
-            "depends": ""
-        },
         "scsi_transport_fc": {
             "description": "FC Transport Attributes",
             "depends": ""
@@ -10858,10 +10822,6 @@
             "description": "Stochastic Fairness Queueing discipline (Compiled by RR for DSM)",
             "depends": ""
         },
-        "scsi_debug": {
-            "description": "SCSI debug adapter driver (Compiled by RR for DSM)",
-            "depends": ""
-        },
         "scsi_transport_fc": {
             "description": "FC Transport Attributes",
             "depends": ""
@@ -11872,10 +11832,6 @@
             "description": "low-level driver for Silicon Image SATA controller (Compiled by RR for DSM)",
             "depends": ""
         },
-        "scsi_debug": {
-            "description": "SCSI debug adapter driver (Compiled by RR for DSM)",
-            "depends": ""
-        },
         "scsi_transport_sas": {
             "description": "SAS Transport Attributes",
             "depends": ""
@@ -13070,10 +13026,6 @@
             "description": "Stochastic Fairness Queueing discipline (Compiled by RR for DSM)",
             "depends": ""
         },
-        "scsi_debug": {
-            "description": "SCSI debug adapter driver (Compiled by RR for DSM)",
-            "depends": ""
-        },
         "scsi_transport_sas": {
             "description": "SAS Transport Attributes",
             "depends": ""
@@ -13568,10 +13520,6 @@
             "description": "DME1737 sensors",
             "depends": "hwmon-vid"
         },
-        "drivetemp": {
-            "description": "Hard drive temperature monitor (Compiled by RR for DSM)",
-            "depends": ""
-        },
         "drm": {
             "description": "DRM shared core routines",
             "depends": "dmabuf,drm_mipi_dsi,i915-compat,drm_panel_orientation_quirks"
@@ -14580,10 +14528,6 @@
             "description": "Stochastic Fairness Queueing discipline (Compiled by RR for DSM)",
             "depends": ""
         },
-        "scsi_debug": {
-            "description": "SCSI debug adapter driver (Compiled by RR for DSM)",
-            "depends": ""
-        },
         "scsi_transport_fc": {
             "description": "FC Transport Attributes",
             "depends": ""
@@ -15222,10 +15166,6 @@
             "description": "DME1737 sensors",
             "depends": "hwmon-vid"
         },
-        "drivetemp": {
-            "description": "Hard drive temperature monitor (Compiled by RR for DSM)",
-            "depends": ""
-        },
         "drm": {
             "description": "DRM shared core routines",
             "depends": "dmabuf,drm_mipi_dsi,i915-compat,drm_panel_orientation_quirks"
@@ -16238,10 +16178,6 @@
             "description": "Stochastic Fairness Queueing discipline (Compiled by RR for DSM)",
             "depends": ""
         },
-        "scsi_debug": {
-            "description": "SCSI debug adapter driver (Compiled by RR for DSM)",
-            "depends": ""
-        },
         "scsi_transport_fc": {
             "description": "FC Transport Attributes",
             "depends": ""
@@ -17441,10 +17377,6 @@
             "description": "low-level driver for Silicon Image SATA controller (Compiled by RR for DSM)",
             "depends": ""
         },
-        "scsi_debug": {
-            "description": "SCSI debug adapter driver (Compiled by RR for DSM)",
-            "depends": ""
-        },
         "scsi_transport_sas": {
             "description": "SAS Transport Attributes",
             "depends": ""
@@ -18687,10 +18619,6 @@
             "description": "Stochastic Fairness Queueing discipline (Compiled by RR for DSM)",
             "depends": ""
         },
-        "scsi_debug": {
-            "description": "SCSI debug adapter driver (Compiled by RR for DSM)",
-            "depends": ""
-        },
         "scsi_transport_sas": {
             "description": "SAS Transport Attributes",
             "depends": ""
@@ -19197,10 +19125,6 @@
             "description": "DME1737 sensors",
             "depends": "hwmon-vid"
         },
-        "drivetemp": {
-            "description": "Hard drive temperature monitor (Compiled by RR for DSM)",
-            "depends": ""
-        },
         "drm": {
             "description": "DRM panel infrastructure",
             "depends": "dmabuf,drm_panel_orientation_quirks"
@@ -20121,10 +20045,6 @@
             "description": "Stochastic Fairness Queueing discipline (Compiled by RR for DSM)",
             "depends": ""
         },
-        "scsi_debug": {
-            "description": "SCSI debug adapter driver (Compiled by RR for DSM)",
-            "depends": ""
-        },
         "scsi_transport_sas": {
             "description": "SAS Transport Attributes",
             "depends": ""
@@ -21295,10 +21215,6 @@
             "description": "low-level driver for Silicon Image SATA controller (Compiled by RR for DSM)",
             "depends": ""
         },
-        "scsi_debug": {
-            "description": "SCSI debug adapter driver (Compiled by RR for DSM)",
-            "depends": ""
-        },
         "scsi_transport_fc": {
             "description": "FC Transport Attributes",
             "depends": ""
@@ -22497,10 +22413,6 @@
             "description": "Stochastic Fairness Queueing discipline (Compiled by RR for DSM)",
             "depends": ""
         },
-        "scsi_debug": {
-            "description": "SCSI debug adapter driver (Compiled by RR for DSM)",
-            "depends": ""
-        },
         "scsi_transport_fc": {
             "description": "FC Transport Attributes",
             "depends": ""
@@ -23535,10 +23447,6 @@
             "description": "low-level driver for Silicon Image SATA controller (Compiled by RR for DSM)",
             "depends": ""
         },
-        "scsi_debug": {
-            "description": "SCSI debug adapter driver (Compiled by RR for DSM)",
-            "depends": ""
-        },
         "scsi_transport_sas": {
             "description": "SAS Transport Attributes",
             "depends": ""
@@ -24757,10 +24665,6 @@
             "description": "Stochastic Fairness Queueing discipline (Compiled by RR for DSM)",
             "depends": ""
         },
-        "scsi_debug": {
-            "description": "SCSI debug adapter driver (Compiled by RR for DSM)",
-            "depends": ""
-        },
         "scsi_transport_sas": {
             "description": "SAS Transport Attributes",
             "depends": ""
@@ -25251,10 +25155,6 @@
             "description": "DME1737 sensors",
             "depends": "hwmon-vid"
         },
-        "drivetemp": {
-            "description": "Hard drive temperature monitor (Compiled by RR for DSM)",
-            "depends": ""
-        },
         "drm": {
             "description": "DRM shared core routines",
             "depends": "dmabuf,drm_mipi_dsi,i915-compat,drm_panel_orientation_quirks"
@@ -26235,10 +26135,6 @@
             "description": "Stochastic Fairness Queueing discipline (Compiled by RR for DSM)",
             "depends": ""
         },
-        "scsi_debug": {
-            "description": "SCSI debug adapter driver (Compiled by RR for DSM)",
-            "depends": ""
-        },
         "scsi_transport_sas": {
             "description": "SAS Transport Attributes",
             "depends": ""
@@ -27437,10 +27333,6 @@
             "description": "low-level driver for Silicon Image SATA controller (Compiled by RR for DSM)",
             "depends": ""
         },
-        "scsi_debug": {
-            "description": "SCSI debug adapter driver (Compiled by RR for DSM)",
-            "depends": ""
-        },
         "scsi_transport_fc": {
             "description": "FC Transport Attributes",
             "depends": ""
@@ -28671,10 +28563,6 @@
             "description": "Stochastic Fairness Queueing discipline (Compiled by RR for DSM)",
             "depends": ""
         },
-        "scsi_debug": {
-            "description": "SCSI debug adapter driver (Compiled by RR for DSM)",
-            "depends": ""
-        },
         "scsi_transport_fc": {
             "description": "FC Transport Attributes",
             "depends": ""
@@ -29173,10 +29061,6 @@
             "description": "DME1737 sensors",
             "depends": "hwmon-vid"
         },
-        "drivetemp": {
-            "description": "Hard drive temperature monitor (Compiled by RR for DSM)",
-            "depends": ""
-        },
         "drm": {
             "description": "DRM shared core routines",
             "depends": "dmabuf,drm_mipi_dsi,i915-compat,drm_panel_orientation_quirks"
@@ -30161,10 +30045,6 @@
             "description": "Stochastic Fairness Queueing discipline (Compiled by RR for DSM)",
             "depends": ""
         },
-        "scsi_debug": {
-            "description": "SCSI debug adapter driver (Compiled by RR for DSM)",
-            "depends": ""
-        },
         "scsi_transport_fc": {
             "description": "FC Transport Attributes",
             "depends": ""

docs/pats.json

@@ -1,40 +1,4 @@
 {
-    "DS1525+": {
-        "7.2.2-72806-0": {
-            "url": "https://global.synologydownload.com/download/DSM/release/7.2.2/72806/DSM_DS1525%2B_72806.pat",
-            "sum": "00000000000000000000000000000000"
-        }
-    },
-    "DS1825+": {
-        "7.2.2-72806-0": {
-            "url": "https://global.synologydownload.com/download/DSM/release/7.2.2/72806/DSM_DS1825%2B_72806.pat",
-            "sum": "00000000000000000000000000000000"
-        }
-    },
-    "DS225+": {
-        "7.2.2-72806-0": {
-            "url": "https://global.synologydownload.com/download/DSM/release/7.2.2/72806/DSM_DS225%2B_72806.pat",
-            "sum": "00000000000000000000000000000000"
-        }
-    },
-    "DS425+": {
-        "7.2.2-72806-0": {
-            "url": "https://global.synologydownload.com/download/DSM/release/7.2.2/72806/DSM_DS425%2B_72806.pat",
-            "sum": "00000000000000000000000000000000"
-        }
-    },
-    "DS725+": {
-        "7.2.2-72806-0": {
-            "url": "https://global.synologydownload.com/download/DSM/release/7.2.2/72806/DSM_DS725%2B_72806.pat",
-            "sum": "00000000000000000000000000000000"
-        }
-    },
-    "DS925+": {
-        "7.2.2-72806-0": {
-            "url": "https://global.synologydownload.com/download/DSM/release/7.2.2/72806/DSM_DS925%2B_72806.pat",
-            "sum": "00000000000000000000000000000000"
-        }
-    },
     "HD6500": {
         "7.2.2-72806-0": {
             "url": "https://global.synologydownload.com/download/DSM/release/7.2.2/72806/DSM_HD6500_72806.pat",
@@ -53,12 +17,6 @@
             "sum": "00000000000000000000000000000000"
         }
     },
-    "RS2825RP+": {
-        "7.2.2-72806-0": {
-            "url": "https://global.synologydownload.com/download/DSM/release/7.2.2/72806/DSM_RS2825RP%2B_72806.pat",
-            "sum": "00000000000000000000000000000000"
-        }
-    },
     "DS1019+": {
         "7.2.2-72806-0": {
             "url": "https://global.synologydownload.com/download/DSM/release/7.2.2/72806/DSM_DS1019%2B_72806.pat",
@@ -129,6 +87,12 @@
             "sum": "00000000000000000000000000000000"
         }
     },
+    "DS1525+": {
+        "7.2.2-72806-0": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.2.2/72806/DSM_DS1525%2B_72806.pat",
+            "sum": "00000000000000000000000000000000"
+        }
+    },
     "DS1621+": {
         "7.2.2-72806-0": {
             "url": "https://global.synologydownload.com/download/DSM/release/7.2.2/72806/DSM_DS1621%2B_72806.pat",
@@ -251,6 +215,12 @@
             "sum": "00000000000000000000000000000000"
         }
     },
+    "DS1825+": {
+        "7.2.2-72806-0": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.2.2/72806/DSM_DS1825%2B_72806.pat",
+            "sum": "00000000000000000000000000000000"
+        }
+    },
     "DS220+": {
         "7.2.2-72806-0": {
             "url": "https://global.synologydownload.com/download/DSM/release/7.2.2/72806/DSM_DS220%2B_72806.pat",
@@ -287,6 +257,12 @@
             "sum": "00000000000000000000000000000000"
         }
     },
+    "DS225+": {
+        "7.2.2-72806-0": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.2.2/72806/DSM_DS225%2B_72806.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",
@@ -435,6 +411,12 @@
             "sum": "00000000000000000000000000000000"
         }
     },
+    "DS425+": {
+        "7.2.2-72806-0": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.2.2/72806/DSM_DS425%2B_72806.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",
@@ -505,6 +487,12 @@
             "sum": "00000000000000000000000000000000"
         }
     },
+    "DS725+": {
+        "7.2.2-72806-0": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.2.2/72806/DSM_DS725%2B_72806.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",
@@ -549,6 +537,12 @@
             "sum": "00000000000000000000000000000000"
         }
     },
+    "DS925+": {
+        "7.2.2-72806-0": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.2.2/72806/DSM_DS925%2B_72806.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",
@@ -933,6 +927,12 @@
             "sum": "00000000000000000000000000000000"
         }
     },
+    "RS2825RP+": {
+        "7.2.2-72806-0": {
+            "url": "https://global.synologydownload.com/download/DSM/release/7.2.2/72806/DSM_RS2825RP%2B_72806.pat",
+            "sum": "00000000000000000000000000000000"
+        }
+    },
     "RS3618xs": {
         "7.2.2-72806-0": {
             "url": "https://global.synologydownload.com/download/DSM/release/7.2.2/72806/DSM_RS3618xs_72806.pat",

files/initrd/opt/rr/boot.sh

@@ -433,7 +433,6 @@ else
 
   _bootwait || exit 0
 
-  [ -n "$(cat "${ADD_TIPS_FILE}" 2>/dev/null)" ] && printf "$(TEXT "%s\n")" "$(cat "${ADD_TIPS_FILE}" 2>/dev/null)"
   printf "\033[1;37m%s\033[0m\n" "$(TEXT "Loading DSM kernel ...")"
 
   DSMLOGO="$(readConfigKey "dsmlogo" "${USER_CONFIG_FILE}")"

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

@@ -8,7 +8,7 @@
 
 # shellcheck disable=SC2034
 
-RR_VERSION="25.9.2"
+RR_VERSION="25.8.0"
 RR_RELEASE=""
 RR_TITLE="RR v${RR_VERSION}"
 
@@ -38,7 +38,6 @@ RR_RAMUSER_FILE="${PART3_PATH}/initrd-rru"
 MC_RAMDISK_FILE="${PART3_PATH}/microcode.img"
 MOD_ZIMAGE_FILE="${PART3_PATH}/zImage-dsm"
 MOD_RDGZ_FILE="${PART3_PATH}/initrd-dsm"
-ADD_TIPS_FILE="${PART3_PATH}/AddTips"
 
 CKS_PATH="${PART3_PATH}/cks"
 LKMS_PATH="${PART3_PATH}/lkms"

files/initrd/opt/rr/init.sh

@@ -86,7 +86,6 @@ if [ -z "$(readConfigMap "addons" "${USER_CONFIG_FILE}")" ]; then
   initConfigKey "addons.acpid" "" "${USER_CONFIG_FILE}"
   initConfigKey "addons.trivial" "" "${USER_CONFIG_FILE}"
   initConfigKey "addons.vmtools" "" "${USER_CONFIG_FILE}"
-  initConfigKey "addons.monitor" "" "${USER_CONFIG_FILE}"
   initConfigKey "addons.mountloader" "" "${USER_CONFIG_FILE}"
   initConfigKey "addons.powersched" "" "${USER_CONFIG_FILE}"
   initConfigKey "addons.reboottoloader" "" "${USER_CONFIG_FILE}"
@@ -133,14 +132,13 @@ BUSLIST="usb sata sas scsi nvme mmc ide virtio vmbus xen"
 if [ "${BUS}" = "usb" ]; then
   VID="0x$(udevadm info --query property --name "${LOADER_DISK}" 2>/dev/null | grep "ID_VENDOR_ID" | cut -d= -f2)"
   PID="0x$(udevadm info --query property --name "${LOADER_DISK}" 2>/dev/null | grep "ID_MODEL_ID" | cut -d= -f2)"
-  [ "${VID}" = "0x" ] || [ "${PID}" = "0x" ] && die "$(TEXT "The loader disk does not support the current USB Portable Hard Disk.")"
   TYPE="flashdisk"
 elif ! echo "${BUSLIST}" | grep -wq "${BUS}"; then
   if [ "LOCALBUILD" = "${LOADER_DISK}" ]; then
     echo "LOCALBUILD MODE"
     TYPE="PC"
   else
-    die "$(printf "$(TEXT "The loader disk does not support the current %s, only %s DoM is supported.")" "${BUS}" "${BUSLIST// /\/}")"
+    die "$(printf "$(TEXT "The boot disk does not support the current %s, only %s DoM is supported.")" "${BUS}" "${BUSLIST// /\/}")"
   fi
 fi
 
@@ -241,7 +239,6 @@ printf "\n"
 printf "$(TEXT "Call \033[1;32minit.sh\033[0m to re get init info\n")"
 printf "$(TEXT "Call \033[1;32mmenu.sh\033[0m to configure loader\n")"
 printf "\n"
-[ -n "$(cat "${ADD_TIPS_FILE}" 2>/dev/null)" ] && printf "$(TEXT "%s\n")" "$(cat "${ADD_TIPS_FILE}" 2>/dev/null)"
 printf "$(TEXT "User config is on \033[1;32m%s\033[0m\n")" "${USER_CONFIG_FILE}"
 printf "$(TEXT "HTTP: \033[1;34mhttp://%s:%d\033[0m\n")" "rr" "${HTTP:-7080}"
 printf "$(TEXT "DUFS: \033[1;34mhttp://%s:%d\033[0m\n")" "rr" "${DUFS:-7304}"

files/initrd/opt/rr/menu.sh

@@ -1225,7 +1225,7 @@ function synoinfoMenu() {
 # Extract linux and ramdisk files from the DSM .pat
 function getSynoExtractor() {
   rm -f "${LOG_FILE}"
-  mirrors=("global.download.synology.com" "global.synologydownload.com"  "cndl.synology.cn")
+  mirrors=("global.synologydownload.com" "global.download.synology.com" "cndl.synology.cn")
   fastest=$(_get_fastest "${mirrors[@]}")
   if [ $? -ne 0 ]; then
     echo -e "$(TEXT "The current network status is unknown, using the default mirror.")"
@@ -1240,7 +1240,7 @@ function getSynoExtractor() {
 
   echo "$(TEXT "Downloading old pat to extract synology .pat extractor...")"
   rm -f "${OLDPAT_PATH}"
-  STATUS=$(curl -kL --http1.1 --connect-timeout 10 -w "%{http_code}" "${OLDPAT_URL}" -o "${OLDPAT_PATH}")
+  STATUS=$(curl -kL --connect-timeout 10 -w "%{http_code}" "${OLDPAT_URL}" -o "${OLDPAT_PATH}")
   RET=$?
   if [ ${RET} -ne 0 ] || [ ${STATUS:-0} -ne 200 ]; then
     rm -f "${OLDPAT_PATH}"
@@ -1368,7 +1368,7 @@ function extractDsmFiles() {
       CLEARCACHE=0
     fi
     mkdir -p "${PART3_PATH}/dl"
-    mirrors=("global.download.synology.com" "global.synologydownload.com"  "cndl.synology.cn")
+    mirrors=("global.synologydownload.com" "global.download.synology.com" "cndl.synology.cn")
     fastest=$(_get_fastest "${mirrors[@]}")
     if [ $? -ne 0 ]; then
       echo -e "$(TEXT "The current network status is unknown, using the default mirror.")"
@@ -1382,13 +1382,13 @@ function extractDsmFiles() {
     # Check disk space left
     SPACELEFT=$(df --block-size=1 "${PART3_PATH}" 2>/dev/null | awk 'NR==2 {print $4}')
     # Discover remote file size
-    FILESIZE=$(curl -skLI --http1.1 --connect-timeout 10 "${PATURL}" | grep -i Content-Length | tail -n 1 | tr -d '\r\n' | awk '{print $2}')
+    FILESIZE=$(curl -skLI --connect-timeout 10 "${PATURL}" | grep -i Content-Length | tail -n 1 | tr -d '\r\n' | awk '{print $2}')
     if [ ${FILESIZE:-0} -ge ${SPACELEFT:-0} ]; then
       # No disk space to download, change it to RAMDISK
       PAT_PATH="${TMP_PATH}/${PAT_FILE}"
     fi
     touch "${PAT_PATH}.downloading"
-    STATUS=$(curl -kL --http1.1 --connect-timeout 10 -w "%{http_code}" "${PATURL}" -o "${PAT_PATH}")
+    STATUS=$(curl -kL --connect-timeout 10 -w "%{http_code}" "${PATURL}" -o "${PAT_PATH}")
     RET=$?
     rm -f "${PAT_PATH}.downloading"
     if [ ${RET} -ne 0 ] || [ ${STATUS:-0} -ne 200 ]; then
@@ -1930,16 +1930,6 @@ function resetDSMPassword() {
       sed -i "/^${USER}:/ s/^\(${USER}:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:\)[^:]*:/\1:/" "${TMP_PATH}/mdX/etc/shadow"
       sed -i "s|status=on|status=off|g" "${TMP_PATH}/mdX/usr/syno/etc/packages/SecureSignIn/preference/${USER}/method.config" 2>/dev/null
       sed -i "s|list=*$|list=|; s|type=*$|type=none|" "${TMP_PATH}/mdX/usr/syno/etc/packages/SecureSignIn/secure_signin.conf" 2>/dev/null
-
-      mkdir -p "${TMP_PATH}/mdX/usr/rr/once.d"
-      {
-        echo "#!/usr/bin/env bash"
-        echo "synowebapi -s --exec api=SYNO.Core.OTP.EnforcePolicy method=set version=1 enable_otp_enforcement=false otp_enforce_option='\"none\"'"
-        echo "synowebapi -s --exec api=SYNO.SecureSignIn.AMFA.Policy method=set version=1 type='\"none\"'"
-				echo "synowebapi -s --exec api=SYNO.Core.SmartBlock method=set version=1 enabled=false untrust_try=5 untrust_minute=1 untrust_lock=30 trust_try=10 trust_minute=1 trust_lock=30"
-				echo "synowebapi -s --exec api=SYNO.SecureSignIn.Method.Admin method=reset version=1 account='\"${USER}\"' keep_amfa_settings=true"
-      } >"${TMP_PATH}/mdX/usr/rr/once.d/addNewDSMUser.sh"
-
       sync
       echo "true" >"${TMP_PATH}/isOk"
       umount "${TMP_PATH}/mdX"
@@ -2138,7 +2128,7 @@ function initDSMNetwork {
       for F in ${TMP_PATH}/mdX/etc/sysconfig/network-scripts/ifcfg-* ${TMP_PATH}/mdX/etc.defaults/sysconfig/network-scripts/ifcfg-*; do
         [ ! -e "${F}" ] && continue
         echo "${F}" | grep -Eq "\-lo$|\-tun$|\-eth99$" && continue
-        sed -i "s|^BOOTPROTO=.*|BOOTPROTO=dhcp|; s|^ONBOOT=.*|ONBOOT=yes|; s|^IPV6INIT=.*|IPV6INIT=auto_dhcp|; /^IPADDR/d; /NETMASK/d; /GATEWAY/d; /DNS1/d; /DNS2/d" "${F}"
+        sed -i "s|^BOOTPROTO=.*|BOOTPROTO=dhcp|; s|^ONBOOT=.*|ONBOOT=yes|; s|^IPV6INIT=.*|IPV6INIT=dhcp|; /^IPADDR/d; /NETMASK/d; /GATEWAY/d; /DNS1/d; /DNS2/d" "${F}"
       done
       sed -i 's/_mtu=".*"$/_mtu="1500"/g' ${TMP_PATH}/mdX/etc/synoinfo.conf ${TMP_PATH}/mdX/etc.defaults/synoinfo.conf
       # systemctl restart rc-network.service

files/initrd/opt/rr/patch/modulelist

@@ -19,8 +19,6 @@ N acpi_call.ko
 N check_signature.ko
 N rfkill.ko
 N rfkill-gpio.ko
-N scsi_debug.ko
-N drivetemp.ko
 
 # sensors
 N coretemp.ko

files/initrd/opt/rr/ramdisk-patch.sh

@@ -229,7 +229,7 @@ done
 
 # Network card configuration file
 for N in $(seq 0 7); do
-  echo -e "DEVICE=eth${N}\nBOOTPROTO=dhcp\nONBOOT=yes\nIPV6INIT=auto_dhcp\nIPV6_ACCEPT_RA=1" >"${RAMDISK_PATH}/etc/sysconfig/network-scripts/ifcfg-eth${N}"
+  echo -e "DEVICE=eth${N}\nBOOTPROTO=dhcp\nONBOOT=yes\nIPV6INIT=dhcp\nIPV6_ACCEPT_RA=1" >"${RAMDISK_PATH}/etc/sysconfig/network-scripts/ifcfg-eth${N}"
 done
 
 # issues/313

files/mnt/p1/RR_VERSION

@@ -1 +1 @@
-25.9.2
+25.8.0

files/mnt/p1/boot/grub/grub.cfg

@@ -49,6 +49,8 @@ else
   font=${prefix}/fonts/unicode.pf2
 fi
 
+terminal_output console 
+
 if loadfont ${font}; then
   set gfxmode=auto
   load_video
@@ -56,10 +58,9 @@ if loadfont ${font}; then
   set locale_dir=$prefix/locale
   set lang=en_US
   insmod gettext
+  terminal_output --append gfxterm
 fi
 
-terminal_output gfxterm
-
 if serial --unit=0 --speed=115200 --word=8 --parity=no --stop=1; then
   terminal_input --append serial
   terminal_output --append serial
@@ -74,9 +75,7 @@ background_image ${prefix}/logo.png
 
 set RR_CMDLINE="earlyprintk earlycon=uart8250,io,0x3f8,115200n8 console=ttyS0,115200n8 root=/dev/ram rootwait intremap=off amd_iommu_intr=legacy net.ifnames=0 panic=5 split_lock_detect=off pcie_aspm=off intel_pstate=disable amd_pstate=disable nox2apic nomodeset nowatchdog"
 
-insmod part_gpt
+search --set=root --label "RR3"
-insmod lvm
-search --set=root --label "RR3" --no-floppy
 if [ -e /initrd-rru ]; then set RRU=/initrd-rru; fi
 if [ -e /microcode.img ]; then set MCI=/microcode.img; fi
 

guide.md

@@ -340,7 +340,7 @@
   # API
   # 获取系统信息
   synowebapi --exec api=SYNO.Core.System method=info version=3
-  synowebapi --exec api=SYNO.Core.System method=info version=3 type='"firmware"'
+  synowebapi --exec api=SYNO.Core.System method=info version=3 type="firmware"
   # 获取设备信息
   synowebapi --exec api=SYNO.Core.System.Utilization method=get version=1
   # 关机
@@ -352,26 +352,7 @@
   synowebapi --exec api=SYNO.Core.Web.DSM method=set version=2 enable_https_redirect=false
   # 开启 telnet/ssh
   synowebapi --exec api=SYNO.Core.Terminal method=set version=3 enable_telnet=true enable_ssh=true ssh_port=22 forbid_console=false
-
+  
-  # 强制以下用户启用双重验证
-  synowebapi --exec api=SYNO.Core.OTP.EnforcePolicy method=set version=1 enable_otp_enforcement=true otp_enforce_option='"none"'    # 开 管理员群组用户
-  synowebapi --exec api=SYNO.Core.OTP.EnforcePolicy method=set version=1 enable_otp_enforcement=true otp_enforce_option='"user"'    # 开 所有用户
-  synowebapi --exec api=SYNO.Core.OTP.EnforcePolicy method=custom_set version=1 type='"local_user"' settings='[{"id":"1026","is_enforced":true}]'
-  synowebapi --exec api=SYNO.Core.OTP.EnforcePolicy method=set version=1 enable_otp_enforcement=true otp_enforce_option='"custom"'  # 开 指定用户或群组
-  synowebapi --exec api=SYNO.Core.OTP.EnforcePolicy method=set version=1 enable_otp_enforcement=false otp_enforce_option='"none"'   # 关
-
-  # 为管理员群组的用户启用自适应多重验证
-  synowebapi --exec api=SYNO.SecureSignIn.AMFA.Policy method=set version=1 type='"admin"'  # 开
-  synowebapi --exec api=SYNO.SecureSignIn.AMFA.Policy method=set version=1 type='"none"'   # 关
-
-  # 启用帐户保护
-  synowebapi --exec api=SYNO.Core.SmartBlock method=set version=1 enabled=true untrust_try=5 untrust_minute=1 untrust_lock=30 trust_try=10 trust_minute=1 trust_lock=30   # 开
-  synowebapi --exec api=SYNO.Core.SmartBlock method=set version=1 enabled=false untrust_try=5 untrust_minute=1 untrust_lock=30 trust_try=10 trust_minute=1 trust_lock=30  # 关
-
-  # 禁用双重验证 (admin 用户)
-  synowebapi --exec api=SYNO.SecureSignIn.Method.Admin method=reset version=1 account='"admin"' keep_amfa_settings=true
-
-
   # Get MD5
   certutil -hashfile xxx.pat MD5                   # windows
   md5sum xxx.pat                                   # linux/mac