VERSION

@@ -1 +1 @@
-25.6.5
+25.6.2

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

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

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

@@ -445,7 +445,7 @@ function connectwlanif() {
 # Find and mount the DSM root filesystem
 function findDSMRoot() {
   local DSMROOTS=""
-  [ -z "${DSMROOTS}" ] && DSMROOTS="$(mdadm --detail --scan 2>/dev/null | grep -v "INACTIVE-ARRAY" | grep -E "name=SynologyNAS:0|name=DiskStation:0|name=SynologyNVR:0|name=BeeStation:0" | awk '{print $2}' | uniq)"
+  [ -z "${DSMROOTS}" ] && DSMROOTS="$(mdadm --detail --scan 2>/dev/null | grep -E "name=SynologyNAS:0|name=DiskStation:0|name=SynologyNVR:0|name=BeeStation:0" | awk '{print $2}' | uniq)"
   [ -z "${DSMROOTS}" ] && DSMROOTS="$(lsblk -pno KNAME,PARTN,FSTYPE,FSVER,LABEL | grep -E "sd[a-z]{1,2}1" | grep -w "linux_raid_member" | grep "0.9" | awk '{print $1}')"
   echo "${DSMROOTS}"
   return 0
@@ -458,13 +458,8 @@ function fixDSMRootPart() {
   if mdadm --detail "${1}" 2>/dev/null | grep -i "State" | grep -iEq "active|FAILED|Not Started"; then
     mdadm --stop "${1}" >/dev/null 2>&1
     mdadm --assemble --scan >/dev/null 2>&1
-    T="$(blkid -o value -s TYPE "${1}" 2>/dev/null | sed 's/linux_raid_member/ext4/')"
-    if [ "${T}" = "btrfs" ]; then
-      btrfs check --readonly "${1}" >/dev/null 2>&1
-    else
     fsck "${1}" >/dev/null 2>&1
   fi
-  fi
 }
 
 ###############################################################################

files/initrd/opt/rr/menu.sh

@@ -1839,7 +1839,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 | sed 's/linux_raid_member/ext4/')"
+      T="$(blkid -o value -s TYPE "${I}" 2>/dev/null)"
       mount -t "${T:-ext4}" "${I}" "${TMP_PATH}/mdX"
       [ $? -ne 0 ] && continue
       rm -f "${TMP_PATH}/mdX/etc/VERSION" "${TMP_PATH}/mdX/etc.defaults/VERSION"
@@ -1871,7 +1871,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 | sed 's/linux_raid_member/ext4/')"
+    T="$(blkid -o value -s TYPE "${I}" 2>/dev/null)"
     mount -t "${T:-ext4}" "${I}" "${TMP_PATH}/mdX"
     [ $? -ne 0 ] && continue
     if [ -f "${TMP_PATH}/mdX/etc/shadow" ]; then
@@ -1923,13 +1923,12 @@ 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 | sed 's/linux_raid_member/ext4/')"
+      T="$(blkid -o value -s TYPE "${I}" 2>/dev/null)"
       mount -t "${T:-ext4}" "${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"
       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
       sync
       echo "true" >"${TMP_PATH}/isOk"
       umount "${TMP_PATH}/mdX"
@@ -1966,7 +1965,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 | sed 's/linux_raid_member/ext4/')"
+      T="$(blkid -o value -s TYPE "${I}" 2>/dev/null)"
       mount -t "${T:-ext4}" "${I}" "${TMP_PATH}/mdX"
       [ $? -ne 0 ] && continue
       mkdir -p "${TMP_PATH}/mdX/usr/rr/once.d"
@@ -2004,7 +2003,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 | sed 's/linux_raid_member/ext4/')"
+      T="$(blkid -o value -s TYPE "${I}" 2>/dev/null)"
       mount -t "${T:-ext4}" "${I}" "${TMP_PATH}/mdX"
       [ $? -ne 0 ] && continue
       mkdir -p "${TMP_PATH}/mdX/usr/rr/once.d"
@@ -2048,7 +2047,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 | sed 's/linux_raid_member/ext4/')"
+      T="$(blkid -o value -s TYPE "${I}" 2>/dev/null)"
       mount -t "${T:-ext4}" "${I}" "${TMP_PATH}/mdX"
       [ $? -ne 0 ] && continue
       rm -f "${TMP_PATH}/mdX/etc/synoautoblock.db"
@@ -2081,7 +2080,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 | sed 's/linux_raid_member/ext4/')"
+      T="$(blkid -o value -s TYPE "${I}" 2>/dev/null)"
       mount -t "${T:-ext4}" "${I}" "${TMP_PATH}/mdX"
       [ $? -ne 0 ] && continue
       if [ -f "${TMP_PATH}/mdX/usr/syno/etc/esynoscheduler/esynoscheduler.db" ]; then
@@ -2122,7 +2121,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 | sed 's/linux_raid_member/ext4/')"
+      T="$(blkid -o value -s TYPE "${I}" 2>/dev/null)"
       mount -t "${T:-ext4}" "${I}" "${TMP_PATH}/mdX"
       [ $? -ne 0 ] && continue
       for F in ${TMP_PATH}/mdX/etc/sysconfig/network-scripts/ifcfg-* ${TMP_PATH}/mdX/etc.defaults/sysconfig/network-scripts/ifcfg-*; do
@@ -2306,7 +2305,7 @@ function tryRecoveryDSM() {
 
   mkdir -p "${TMP_PATH}/mdX"
   fixDSMRootPart "${DSMROOTPART}"
-  T="$(blkid -o value -s TYPE "${DSMROOTPART}" 2>/dev/null | sed 's/linux_raid_member/ext4/')"
+  T="$(blkid -o value -s TYPE "${DSMROOTPART}" 2>/dev/null)"
   mount -t "${T:-ext4}" "${DSMROOTPART}" "${TMP_PATH}/mdX"
   if [ $? -ne 0 ]; then
     DIALOG --title "$(TEXT "Settings")" \
@@ -2541,7 +2540,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 | sed 's/linux_raid_member/ext4/')"
+      T="$(blkid -o value -s TYPE "${I}" 2>/dev/null)"
       mount -t "${T:-ext4}" "${I}" "${TMP_PATH}/mdX"
       [ $? -ne 0 ] && continue
       mkdir -p "${TMP_PATH}/logs/md0/log"

files/initrd/opt/rr/patch/modulelist

@@ -34,8 +34,6 @@ N nct6775.ko
 F mii.ko
 F cdc_ether.ko
 F rndis_host.ko
-F thunderbolt.ko
-F thunderbolt-net.ko
 F r8152.ko
 F aqc111.ko
 F ax88179_178a.ko

files/initrd/opt/rr/serialnumber.yml

@@ -102,13 +102,6 @@
   middle:
     - "V5R"
   suffix: "alpha"
-"DS1825+":
-  prefix:
-    - "2540"
-  middle:
-    - "WDR"
-  suffix: "alpha"
-  macpre: 9009d0
 "DS2419+":
   prefix:
     - "1880"

files/mnt/p1/RR_VERSION

@@ -1 +1 @@
-25.6.5
+25.6.2

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

@@ -49,8 +49,6 @@ else
   font=${prefix}/fonts/unicode.pf2
 fi
 
-terminal_output console 
-
 if loadfont ${font}; then
   set gfxmode=auto
   load_video
@@ -58,9 +56,10 @@ 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
@@ -73,6 +72,10 @@ set menu_color_highlight=black/cyan
 insmod png
 background_image ${prefix}/logo.png
 
+function gfxmode {
+	set gfxpayload="${linux_gfx_mode}"
+}
+
 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"
 
 search --set=root --label "RR3"
@@ -86,7 +89,7 @@ if [ -s /zImage-dsm -a -s /initrd-dsm ]; then
       load_env --skip-sig --file=${prefix}/rsysenv
     fi
     menuentry 'Boot DSM kernel directly' ${menuentry_id_option} direct {
-      set gfxpayload="${linux_gfx_mode}"
+      gfxmode
       echo "RRVersion: ${rr_version}"
       echo "${rr_booting}"
       echo -n "Boot Time: "; date
@@ -111,7 +114,7 @@ if [ -s /zImage-dsm -a -s /initrd-dsm ]; then
     }
   fi
   menuentry 'Boot DSM' ${menuentry_id_option} boot {
-    set gfxpayload="${linux_gfx_mode}"
+    gfxmode
     echo "Loading kernel..."
     linux /bzImage-rr ${RR_CMDLINE} ${rr_cmdline}
     echo "Loading initramfs..."
@@ -119,7 +122,7 @@ if [ -s /zImage-dsm -a -s /initrd-dsm ]; then
     echo "Booting..."
   }
   menuentry 'Boot Recovery' ${menuentry_id_option} recovery {
-    set gfxpayload="${linux_gfx_mode}"
+    gfxmode
     echo "Loading kernel..."
     linux /bzImage-rr ${RR_CMDLINE} ${rr_cmdline} recovery
     echo "Loading initramfs..."
@@ -127,7 +130,7 @@ if [ -s /zImage-dsm -a -s /initrd-dsm ]; then
     echo "Booting..."
   }
   menuentry 'Force re-install DSM' ${menuentry_id_option} junior {
-    set gfxpayload="${linux_gfx_mode}"
+    gfxmode
     echo "Loading kernel..."
     linux /bzImage-rr ${RR_CMDLINE} ${rr_cmdline} force_junior
     echo "Loading initramfs..."
@@ -137,7 +140,7 @@ if [ -s /zImage-dsm -a -s /initrd-dsm ]; then
 fi
 
 menuentry 'Configure loader' ${menuentry_id_option} config {
-  set gfxpayload="${linux_gfx_mode}"
+  gfxmode
   echo "Loading kernel..."
   linux /bzImage-rr earlycon=uart8250,io,0x3f8,115200n8 console=ttyS0,115200n8 ${RR_CMDLINE} ${rr_cmdline} IWANTTOCHANGETHECONFIG
   echo "Loading initramfs..."
@@ -146,7 +149,7 @@ menuentry 'Configure loader' ${menuentry_id_option} config {
 }
 
 menuentry 'Configure loader (verbose)' ${menuentry_id_option} verbose {
-  set gfxpayload="${linux_gfx_mode}"
+  gfxmode
   echo "Loading kernel..."
   linux /bzImage-rr ${RR_CMDLINE} ${rr_cmdline} earlycon=tty2 console=tty2 IWANTTOCHANGETHECONFIG
   echo "Loading initramfs..."