.github/workflows/issues.yml

@@ -39,7 +39,6 @@ jobs:
 
           format = ''
           size = ''
-          template = ''
           language= ''
           model = ''
           version = ''
@@ -52,7 +51,6 @@ jobs:
                   iscustom = 'true'
                   format = jsonbody.get('format', '')
                   size = jsonbody.get('size', '')
-                  template = jsonbody.get('template', '')
                   language = jsonbody.get('language', '')
                   model = jsonbody.get('model', '')
                   version = jsonbody.get('version', '')
@@ -71,7 +69,6 @@ jobs:
 
           set_output("format", format)
           set_output("size", size)
-          set_output("template", template)
           set_output("language", language)
           set_output("model", model)
           set_output("version", version)
@@ -262,14 +259,6 @@ jobs:
             exit 1
           fi
 
-          if [ "true" = "${{ env.template }}" ]; then
-            echo "set template: ${{ env.template }}"
-            USER_CONFIG_FILE="rr/ws/mnt/p1/user-config.yml"
-            writeConfigKey "sn" "" "${USER_CONFIG_FILE}"
-            writeConfigKey "mac1" "" "${USER_CONFIG_FILE}"
-            writeConfigKey "mac2" "" "${USER_CONFIG_FILE}"
-          fi
-
           sudo ./localbuild.sh pack rr/rr.img
           if [ $? -ne 0 ]; then
             echo "pack failed"

VERSION

@@ -1 +1 @@
-25.5.4
+25.5.2

docs/issues.html

@@ -207,7 +207,7 @@
       let formData = new FormData(form);
       var title = "custom";
       var body = {};
-      var _parameters = ["title", "format", "size", "template", "language", "model", "version", "kernel", "addons", "modules"];
+      var _parameters = ["title", "format", "size", "language", "model", "version", "kernel", "addons", "modules"];
       for (var key in _parameters) {
         var name = _parameters[key];
         if ($("#" + name).is(":hidden")) { continue; }
@@ -313,17 +313,6 @@
         </select>
       </div>
     </div>
-    <div class="form-group mt-1 mb-2" id="template_item">
-      <div class="form-group-header">
-        <label class="color-fg-default text-mono f6">Template:</label>
-      </div>
-      <div class="form-group-body">
-        <select class="form-select form-control select-sm input-contrast" id="template" name="inputs[template]" value="">
-          <option value="true">true</option>
-          <option selected="selected" value="false">false</option>
-        </select>
-      </div>
-    </div>
     <div class="form-group mt-1 mb-2" id="language_item">
       <div class="form-group-header">
         <label class="color-fg-default text-mono f6">Language:</label>

files/initrd/opt/rr/boot.sh

@@ -156,6 +156,8 @@ if [ -z "${MAC1}" ]; then
     MAC2=""
     writeConfigKey "mac1" "${MAC1}" "${USER_CONFIG_FILE}"
     writeConfigKey "mac2" "${MAC2}" "${USER_CONFIG_FILE}"
+    CMDLINE['mac1']="${MAC1}"
+    CMDLINE['netif_num']="0"
   else
     NETIF_NUM=2
     MACS="$(generateMacAddress "${MODEL}" ${NETIF_NUM})"
@@ -163,10 +165,11 @@ if [ -z "${MAC1}" ]; then
       eval MAC${I}="$(echo ${MACS} | cut -d' ' -f${I})"
       writeConfigKey "mac${I}" "$(echo ${MACS} | cut -d' ' -f${I})" "${USER_CONFIG_FILE}"
     done
+    CMDLINE['mac1']="${MAC1}"
+    CMDLINE['mac2']="${MAC2}"
+    CMDLINE['netif_num']="${NETIF_NUM}"
   fi
 fi
-[ -n "${MAC1}" ] && CMDLINE['mac1']="${MAC1}" && CMDLINE['netif_num']="1"
-[ -n "${MAC2}" ] && CMDLINE['mac2']="${MAC2}" && CMDLINE['netif_num']="2"
 
 CMDLINE['skip_vender_mac_interfaces']="$(seq -s, 0 $((${CMDLINE['netif_num']:-1} - 1)))"
 

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

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

files/initrd/opt/rr/menu.sh

@@ -1838,8 +1838,7 @@ function allowDSMDowngrade() {
     mkdir -p "${TMP_PATH}/mdX"
     for I in ${DSMROOTS}; do
       fixDSMRootPart "${I}"
-      T="$(blkid -o value -s TYPE "${I}" 2>/dev/null)"
-      mount -t "${T:-ext4}" "${I}" "${TMP_PATH}/mdX"
+      mount -t "$(blkid -o value -s TYPE "${I}")" "${I}" "${TMP_PATH}/mdX"
       [ $? -ne 0 ] && continue
       rm -f "${TMP_PATH}/mdX/etc/VERSION" "${TMP_PATH}/mdX/etc.defaults/VERSION"
       sync
@@ -1870,8 +1869,7 @@ function resetDSMPassword() {
   mkdir -p "${TMP_PATH}/mdX"
   for I in ${DSMROOTS}; do
     fixDSMRootPart "${I}"
-    T="$(blkid -o value -s TYPE "${I}" 2>/dev/null)"
-    mount -t "${T:-ext4}" "${I}" "${TMP_PATH}/mdX"
+    mount -t "$(blkid -o value -s TYPE "${I}")" "${I}" "${TMP_PATH}/mdX"
     [ $? -ne 0 ] && continue
     if [ -f "${TMP_PATH}/mdX/etc/shadow" ]; then
       while read -r L; do
@@ -1922,8 +1920,7 @@ function resetDSMPassword() {
     NEWPASSWD="$(openssl passwd -6 -salt "$(openssl rand -hex 8)" "${STRPASSWD}")"
     for I in ${DSMROOTS}; do
       fixDSMRootPart "${I}"
-      T="$(blkid -o value -s TYPE "${I}" 2>/dev/null)"
-      mount -t "${T:-ext4}" "${I}" "${TMP_PATH}/mdX"
+      mount -t "$(blkid -o value -s TYPE "${I}")" "${I}" "${TMP_PATH}/mdX"
       [ $? -ne 0 ] && continue
       sed -i "s|^${USER}:[^:]*|${USER}:${NEWPASSWD}|" "${TMP_PATH}/mdX/etc/shadow"
       sed -i "/^${USER}:/ s/^\(${USER}:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:\)[^:]*:/\1:/" "${TMP_PATH}/mdX/etc/shadow"
@@ -1969,8 +1966,7 @@ function addNewDSMUser() {
     mkdir -p "${TMP_PATH}/mdX"
     for I in ${DSMROOTS}; do
       fixDSMRootPart "${I}"
-      T="$(blkid -o value -s TYPE "${I}" 2>/dev/null)"
-      mount -t "${T:-ext4}" "${I}" "${TMP_PATH}/mdX"
+      mount -t "$(blkid -o value -s TYPE "${I}")" "${I}" "${TMP_PATH}/mdX"
       [ $? -ne 0 ] && continue
       if [ -f "${TMP_PATH}/mdX/usr/syno/etc/esynoscheduler/esynoscheduler.db" ]; then
         sqlite3 "${TMP_PATH}/mdX/usr/syno/etc/esynoscheduler/esynoscheduler.db" <<EOF
@@ -2011,8 +2007,7 @@ function forceEnableDSMTelnetSSH() {
     mkdir -p "${TMP_PATH}/mdX"
     for I in ${DSMROOTS}; do
       fixDSMRootPart "${I}"
-      T="$(blkid -o value -s TYPE "${I}" 2>/dev/null)"
-      mount -t "${T:-ext4}" "${I}" "${TMP_PATH}/mdX"
+      mount -t "$(blkid -o value -s TYPE "${I}")" "${I}" "${TMP_PATH}/mdX"
       [ $? -ne 0 ] && continue
       if [ -f "${TMP_PATH}/mdX/usr/syno/etc/esynoscheduler/esynoscheduler.db" ]; then
         sqlite3 "${TMP_PATH}/mdX/usr/syno/etc/esynoscheduler/esynoscheduler.db" <<EOF
@@ -2055,8 +2050,7 @@ function removeBlockIPDB {
     mkdir -p "${TMP_PATH}/mdX"
     for I in ${DSMROOTS}; do
       fixDSMRootPart "${I}"
-      T="$(blkid -o value -s TYPE "${I}" 2>/dev/null)"
-      mount -t "${T:-ext4}" "${I}" "${TMP_PATH}/mdX"
+      mount -t "$(blkid -o value -s TYPE "${I}")" "${I}" "${TMP_PATH}/mdX"
       [ $? -ne 0 ] && continue
       rm -f "${TMP_PATH}/mdX/etc/synoautoblock.db"
       sync
@@ -2088,8 +2082,7 @@ function disablescheduledTasks {
     mkdir -p "${TMP_PATH}/mdX"
     for I in ${DSMROOTS}; do
       fixDSMRootPart "${I}"
-      T="$(blkid -o value -s TYPE "${I}" 2>/dev/null)"
-      mount -t "${T:-ext4}" "${I}" "${TMP_PATH}/mdX"
+      mount -t "$(blkid -o value -s TYPE "${I}")" "${I}" "${TMP_PATH}/mdX"
       [ $? -ne 0 ] && continue
       if [ -f "${TMP_PATH}/mdX/usr/syno/etc/esynoscheduler/esynoscheduler.db" ]; then
         echo "UPDATE task SET enable = 0;" | sqlite3 "${TMP_PATH}/mdX/usr/syno/etc/esynoscheduler/esynoscheduler.db"
@@ -2129,8 +2122,7 @@ function initDSMNetwork {
     mkdir -p "${TMP_PATH}/mdX"
     for I in ${DSMROOTS}; do
       fixDSMRootPart "${I}"
-      T="$(blkid -o value -s TYPE "${I}" 2>/dev/null)"
-      mount -t "${T:-ext4}" "${I}" "${TMP_PATH}/mdX"
+      mount -t "$(blkid -o value -s TYPE "${I}")" "${I}" "${TMP_PATH}/mdX"
       [ $? -ne 0 ] && continue
       rm -f "${TMP_PATH}/mdX/etc/sysconfig/network-scripts/ifcfg-bond"* "${TMP_PATH}/mdX/etc/sysconfig/network-scripts/ifcfg-eth"*
       rm -f "${TMP_PATH}/mdX/etc.defaults/sysconfig/network-scripts/ifcfg-bond"* "${TMP_PATH}/mdX/etc.defaults/sysconfig/network-scripts/ifcfg-eth"*
@@ -2266,8 +2258,7 @@ function tryRecoveryDSM() {
 
   mkdir -p "${TMP_PATH}/mdX"
   fixDSMRootPart "${DSMROOTPART}"
-  T="$(blkid -o value -s TYPE "${DSMROOTPART}" 2>/dev/null)"
-  mount -t "${T:-ext4}" "${DSMROOTPART}" "${TMP_PATH}/mdX"
+  mount -t "$(blkid -o value -s TYPE "${I}")" "${DSMROOTPART}" "${TMP_PATH}/mdX"
   if [ $? -ne 0 ]; then
     DIALOG --title "$(TEXT "Settings")" \
       --msgbox "$(TEXT "Mount DSM system partition(md0) failed!\nPlease insert all disks before continuing.")" 0 0
@@ -2500,8 +2491,7 @@ function reportBugs() {
     mkdir -p "${TMP_PATH}/mdX"
     for I in ${DSMROOTS}; do
       fixDSMRootPart "${I}"
-      T="$(blkid -o value -s TYPE "${I}" 2>/dev/null)"
-      mount -t "${T:-ext4}" "${I}" "${TMP_PATH}/mdX"
+      mount -t "$(blkid -o value -s TYPE "${I}")" "${I}" "${TMP_PATH}/mdX"
       [ $? -ne 0 ] && continue
       mkdir -p "${TMP_PATH}/logs/md0/log"
       cp -rf ${TMP_PATH}/mdX/.log.junior "${TMP_PATH}/logs/md0" 2>/dev/null

files/initrd/opt/rr/platforms.yml

@@ -14,8 +14,8 @@ synoinfo: &synoinfo
   support_syno_hybrid_raid: "no"
   supportraidgroup: "no"
   enableRCPower: "yes"
-  # mem_max_mb: ""  # Impact Creating an SSD Cache
-  # mem_min_mb: ""  # Impact Creating an SSD Cache
+  mem_max_mb: ""
+  mem_min_mb: ""
   support_fan: "no"
   support_fan_adjust_dual_mode: "no"
   supportadt7490: "no"
@@ -116,7 +116,6 @@ platforms:
     synoinfo:
       <<: *synoinfo
       netif_seq_by_dts: "no"
-      show_autoupdatetype_notify: "yes"
     productvers: *productvers5
   epyc7002:
     dt: true

files/mnt/p1/RR_VERSION

@@ -1 +1 @@
-25.5.4
+25.5.2