Fix md0 related operations

2025-08-21 20:17:11 +08:00 · 2024-04-23 00:00:00 +08:00
31 changed files with 17 additions and 35 deletions
--- a/files/initrd/opt/rr/boot.sh
+++ b/files/initrd/opt/rr/boot.sh
@ -272,7 +272,7 @@ else
  kexec ${KEXECARGS} -l "${MOD_ZIMAGE_FILE}" --initrd "${MOD_RDGZ_FILE}" --command-line="${CMDLINE_LINE}" >"${LOG_FILE}" 2>&1 || dieLog
  echo -e "\033[1;37m$(TEXT "Booting ...")\033[0m"
  for T in $(w 2>/dev/null | grep -v "TTY" | awk -F' ' '{print $2}'); do
-    [ -w "/dev/${T}" ] && echo -e "\n\033[1;43m$(TEXT "[This interface will not be operational. Please wait a few minutes.\nFind DSM via http://find.synology.com/ or Synology Assistant and connect.]")\033[0m\n" >"/dev/${T}" 2>/dev/null || true
+    echo -e "\n\033[1;43m$(TEXT "[This interface will not be operational. Please wait a few minutes.\nFind DSM via http://find.synology.com/ or Synology Assistant and connect.]")\033[0m\n" >"/dev/${T}" 2>/dev/null || true
  done

  # Clear logs for dbgutils addons
--- a/files/initrd/opt/rr/include/functions.sh
+++ b/files/initrd/opt/rr/include/functions.sh
@ -376,9 +376,17 @@ function connectwlanif() {
 # Find and mount the DSM root filesystem
 # (based on pocopico's TCRP code)
 function findDSMRoot() {
-  DSMROOTS=""
-  [ -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}"
+  local DSMROOTS=""
+  local RAIDS="$(lsblk -pno KNAME,PARTN,FSTYPE,FSVER,LABEL | grep -w " 1" | grep -w "linux_raid_member")"
+  # SynologyNAS:0, DiskStation:0, SynologyNVR:0, BeeStation:0
+  local LABELS="$(echo "${RAIDS}" | grep "1.2" | grep -E "SynologyNAS:0|DiskStation:0|SynologyNVR:0|BeeStation:0" | awk '{print $5}' | uniq)"
+  if [ -n "${LABELS}" ]; then
+    for I in ${LABELS}; do
+       [ -L "/dev/md/${I}" ] && DSMROOTS="${DSMROOTS} /dev/md/${I}"
+    done
+  elif echo "${RAIDS}" | grep -q "0.9"; then
+     DSMROOTS="$(echo "${RAIDS}" | grep "0.9" | awk '{print $1}')"
+  fi
+  echo ${DSMROOTS}
  return 0
 }
--- a/files/initrd/opt/rr/model-configs/DS1019+.yml
+++ b/files/initrd/opt/rr/model-configs/DS1019+.yml
@ -4,7 +4,6 @@ synoinfo: &synoinfo
  support_disk_compatibility: "no"
  support_memory_compatibility: "no"
  support_led_brightness_adjustment: "no"
-  support_bde_internal_10g: "no"
  support_leds_lp3943: "no"
  support_syno_hybrid_raid:
  supportraidgroup:
--- a/files/initrd/opt/rr/model-configs/DS1520+.yml
+++ b/files/initrd/opt/rr/model-configs/DS1520+.yml
@ -4,7 +4,6 @@ synoinfo: &synoinfo
  support_disk_compatibility: "no"
  support_memory_compatibility: "no"
  support_led_brightness_adjustment: "no"
-  support_bde_internal_10g: "no"
  support_syno_hybrid_raid:
  supportraidgroup:
  HddEnableDynamicPower: "yes"
--- a/files/initrd/opt/rr/model-configs/DS1522+.yml
+++ b/files/initrd/opt/rr/model-configs/DS1522+.yml
@ -4,7 +4,6 @@ synoinfo: &synoinfo
  support_disk_compatibility: "no"
  support_memory_compatibility: "no"
  support_led_brightness_adjustment: "no"
-  support_bde_internal_10g: "no"
  support_syno_hybrid_raid:
  supportraidgroup:
  HddEnableDynamicPower: "yes"
--- a/files/initrd/opt/rr/model-configs/DS1621+.yml
+++ b/files/initrd/opt/rr/model-configs/DS1621+.yml
@ -4,7 +4,6 @@ synoinfo: &synoinfo
  support_disk_compatibility: "no"
  support_memory_compatibility: "no"
  support_led_brightness_adjustment: "no"
-  support_bde_internal_10g: "no"
  support_syno_hybrid_raid:
  supportraidgroup:
  HddEnableDynamicPower: "yes"
--- a/files/initrd/opt/rr/model-configs/DS1821+.yml
+++ b/files/initrd/opt/rr/model-configs/DS1821+.yml
@ -4,7 +4,6 @@ synoinfo: &synoinfo
  support_disk_compatibility: "no"
  support_memory_compatibility: "no"
  support_led_brightness_adjustment: "no"
-  support_bde_internal_10g: "no"
  support_syno_hybrid_raid:
  supportraidgroup:
  HddEnableDynamicPower: "yes"
--- a/files/initrd/opt/rr/model-configs/DS1823xs+.yml
+++ b/files/initrd/opt/rr/model-configs/DS1823xs+.yml
@ -6,7 +6,6 @@ synoinfo: &synoinfo
  support_disk_compatibility: "no"
  support_memory_compatibility: "no"
  support_led_brightness_adjustment: "no"
-  support_bde_internal_10g: "no"
  support_syno_hybrid_raid:
  supportraidgroup:
  HddEnableDynamicPower: "yes"
--- a/files/initrd/opt/rr/model-configs/DS220+.yml
+++ b/files/initrd/opt/rr/model-configs/DS220+.yml
@ -4,7 +4,6 @@ synoinfo: &synoinfo
  support_disk_compatibility: "no"
  support_memory_compatibility: "no"
  support_led_brightness_adjustment: "no"
-  support_bde_internal_10g: "no"
  support_syno_hybrid_raid:
  supportraidgroup:
  HddEnableDynamicPower: "yes"
--- a/files/initrd/opt/rr/model-configs/DS224+.yml
+++ b/files/initrd/opt/rr/model-configs/DS224+.yml
@ -6,7 +6,6 @@ synoinfo: &synoinfo
  support_disk_compatibility: "no"
  support_memory_compatibility: "no"
  support_led_brightness_adjustment: "no"
-  support_bde_internal_10g: "no"
  support_syno_hybrid_raid:
  supportraidgroup:
  HddEnableDynamicPower: "yes"
--- a/files/initrd/opt/rr/model-configs/DS2422+.yml
+++ b/files/initrd/opt/rr/model-configs/DS2422+.yml
@ -4,7 +4,6 @@ synoinfo: &synoinfo
  support_disk_compatibility: "no"
  support_memory_compatibility: "no"
  support_led_brightness_adjustment: "no"
-  support_bde_internal_10g: "no"
  support_syno_hybrid_raid:
  supportraidgroup:
  HddEnableDynamicPower: "yes"
--- a/files/initrd/opt/rr/model-configs/DS3617xs.yml
+++ b/files/initrd/opt/rr/model-configs/DS3617xs.yml
@ -6,7 +6,6 @@ synoinfo: &synoinfo
  support_disk_compatibility: "no"
  support_memory_compatibility: "no"
  support_led_brightness_adjustment: "no"
-  support_bde_internal_10g: "no"
  support_syno_hybrid_raid:
  supportraidgroup:
  HddEnableDynamicPower: "yes"
--- a/files/initrd/opt/rr/model-configs/DS423+.yml
+++ b/files/initrd/opt/rr/model-configs/DS423+.yml
@ -6,7 +6,6 @@ synoinfo: &synoinfo
  support_disk_compatibility: "no"
  support_memory_compatibility: "no"
  support_led_brightness_adjustment: "no"
-  support_bde_internal_10g: "no"
  support_syno_hybrid_raid:
  supportraidgroup:
  HddEnableDynamicPower: "yes"
--- a/files/initrd/opt/rr/model-configs/DS718+.yml
+++ b/files/initrd/opt/rr/model-configs/DS718+.yml
@ -4,7 +4,6 @@ synoinfo: &synoinfo
  support_disk_compatibility: "no"
  support_memory_compatibility: "no"
  support_led_brightness_adjustment: "no"
-  support_bde_internal_10g: "no"
  support_leds_lp3943: "no"
  support_syno_hybrid_raid:
  supportraidgroup:
--- a/files/initrd/opt/rr/model-configs/DS720+.yml
+++ b/files/initrd/opt/rr/model-configs/DS720+.yml
@ -4,7 +4,6 @@ synoinfo: &synoinfo
  support_disk_compatibility: "no"
  support_memory_compatibility: "no"
  support_led_brightness_adjustment: "no"
-  support_bde_internal_10g: "no"
  support_syno_hybrid_raid:
  supportraidgroup:
  HddEnableDynamicPower: "yes"
--- a/files/initrd/opt/rr/model-configs/DS723+.yml
+++ b/files/initrd/opt/rr/model-configs/DS723+.yml
@ -6,7 +6,6 @@ synoinfo: &synoinfo
  support_disk_compatibility: "no"
  support_memory_compatibility: "no"
  support_led_brightness_adjustment: "no"
-  support_bde_internal_10g: "no"
  support_syno_hybrid_raid:
  supportraidgroup:
  HddEnableDynamicPower: "yes"
--- a/files/initrd/opt/rr/model-configs/DS918+.yml
+++ b/files/initrd/opt/rr/model-configs/DS918+.yml
@ -4,7 +4,6 @@ synoinfo: &synoinfo
  support_disk_compatibility: "no"
  support_memory_compatibility: "no"
  support_led_brightness_adjustment: "no"
-  support_bde_internal_10g: "no"
  support_leds_lp3943: "no"
  support_syno_hybrid_raid:
  supportraidgroup:
--- a/files/initrd/opt/rr/model-configs/DS920+.yml
+++ b/files/initrd/opt/rr/model-configs/DS920+.yml
@ -4,7 +4,6 @@ synoinfo: &synoinfo
  support_disk_compatibility: "no"
  support_memory_compatibility: "no"
  support_led_brightness_adjustment: "no"
-  support_bde_internal_10g: "no"
  support_syno_hybrid_raid:
  supportraidgroup:
  HddEnableDynamicPower: "yes"
--- a/files/initrd/opt/rr/model-configs/DS923+.yml
+++ b/files/initrd/opt/rr/model-configs/DS923+.yml
@ -6,7 +6,6 @@ synoinfo: &synoinfo
  support_disk_compatibility: "no"
  support_memory_compatibility: "no"
  support_led_brightness_adjustment: "no"
-  support_bde_internal_10g: "no"
  support_syno_hybrid_raid:
  supportraidgroup:
  HddEnableDynamicPower: "yes"
--- a/files/initrd/opt/rr/model-configs/DVA1622.yml
+++ b/files/initrd/opt/rr/model-configs/DVA1622.yml
@ -4,7 +4,6 @@ synoinfo: &synoinfo
  support_disk_compatibility: "no"
  support_memory_compatibility: "no"
  support_led_brightness_adjustment: "no"
-  support_bde_internal_10g: "no"
  support_syno_hybrid_raid:
  supportraidgroup:
  HddEnableDynamicPower: "yes"
--- a/files/initrd/opt/rr/model-configs/FS2500.yml
+++ b/files/initrd/opt/rr/model-configs/FS2500.yml
@ -7,7 +7,6 @@ synoinfo: &synoinfo
  support_disk_compatibility: "no"
  support_memory_compatibility: "no"
  support_led_brightness_adjustment: "no"
-  support_bde_internal_10g: "no"
  support_syno_hybrid_raid:
  supportraidgroup:
  HddEnableDynamicPower: "yes"
--- a/files/initrd/opt/rr/model-configs/FS6400.yml
+++ b/files/initrd/opt/rr/model-configs/FS6400.yml
@ -7,7 +7,6 @@ synoinfo: &synoinfo
  support_disk_compatibility: "no"
  support_memory_compatibility: "no"
  support_led_brightness_adjustment: "no"
-  support_bde_internal_10g: "no"
  support_syno_hybrid_raid:
  supportraidgroup:
  HddEnableDynamicPower: "yes"
--- a/files/initrd/opt/rr/model-configs/HD6500.yml
+++ b/files/initrd/opt/rr/model-configs/HD6500.yml
@ -7,7 +7,6 @@ synoinfo: &synoinfo
  support_disk_compatibility: "no"
  support_memory_compatibility: "no"
  support_led_brightness_adjustment: "no"
-  support_bde_internal_10g: "no"
  internal_disk_without_led_mask: "no"
  support_syno_hybrid_raid:
  supportraidgroup:
--- a/files/initrd/opt/rr/model-configs/RS2423+.yml
+++ b/files/initrd/opt/rr/model-configs/RS2423+.yml
@ -7,7 +7,6 @@ synoinfo: &synoinfo
  support_disk_compatibility: "no"
  support_memory_compatibility: "no"
  support_led_brightness_adjustment: "no"
-  support_bde_internal_10g: "no"
  support_syno_hybrid_raid:
  supportraidgroup:
  HddEnableDynamicPower: "yes"
--- a/files/initrd/opt/rr/model-configs/RS2423RP+.yml
+++ b/files/initrd/opt/rr/model-configs/RS2423RP+.yml
@ -7,7 +7,6 @@ synoinfo: &synoinfo
  support_disk_compatibility: "no"
  support_memory_compatibility: "no"
  support_led_brightness_adjustment: "no"
-  support_bde_internal_10g: "no"
  support_leds_atmega1608: "no"
  support_leds_lp3943: "no"
  supportadt7490: "no"
--- a/files/initrd/opt/rr/model-configs/RS3618xs.yml
+++ b/files/initrd/opt/rr/model-configs/RS3618xs.yml
@ -7,7 +7,6 @@ synoinfo: &synoinfo
  support_disk_compatibility: "no"
  support_memory_compatibility: "no"
  support_led_brightness_adjustment: "no"
-  support_bde_internal_10g: "no"
  supportssdcache: "no"
  support_syno_hybrid_raid:
  supportraidgroup:
--- a/files/initrd/opt/rr/model-configs/SA3200D.yml.disabled
+++ b/files/initrd/opt/rr/model-configs/SA3200D.yml.disabled
@ -8,8 +8,8 @@ synoinfo: &synoinfo
  support_disk_compatibility: "no"
  support_memory_compatibility: "no"
  support_led_brightness_adjustment: "no"
-  support_bde_internal_10g: "no"
  support_disk_hibernation: "yes"
+  support_bde_internal_10g: "no"
  support_syno_hybrid_raid:
  supportraidgroup:
  HddEnableDynamicPower: "yes"
--- a/files/initrd/opt/rr/model-configs/SA3400D.yml.disabled
+++ b/files/initrd/opt/rr/model-configs/SA3400D.yml.disabled
@ -8,8 +8,8 @@ synoinfo: &synoinfo
  support_disk_compatibility: "no"
  support_memory_compatibility: "no"
  support_led_brightness_adjustment: "no"
-  support_bde_internal_10g: "no"
  support_disk_hibernation: "yes"
+  support_bde_internal_10g: "no"
  support_syno_hybrid_raid:
  supportraidgroup:
  HddEnableDynamicPower: "yes"
--- a/files/initrd/opt/rr/model-configs/SA6400.yml
+++ b/files/initrd/opt/rr/model-configs/SA6400.yml
@ -7,7 +7,6 @@ synoinfo: &synoinfo
  support_disk_compatibility: "no"
  support_memory_compatibility: "no"
  support_led_brightness_adjustment: "no"
-  support_bde_internal_10g: "no"
  support_oob_ctl: "no"
  support_syno_hybrid_raid:
  supportraidgroup:
--- a/files/initrd/opt/rr/model-configs/VirtualDSM.yml.disabled
+++ b/files/initrd/opt/rr/model-configs/VirtualDSM.yml.disabled
@ -4,7 +4,6 @@ synoinfo: &synoinfo
  support_disk_compatibility: "no"
  support_memory_compatibility: "no"
  support_led_brightness_adjustment: "no"
-  support_bde_internal_10g: "no"
  support_syno_hybrid_raid:
  supportraid: "yes"
  supportraidgroup:
--- a/files/mnt/p1/boot/grub/grub.cfg
+++ b/files/mnt/p1/boot/grub/grub.cfg
@ -49,8 +49,8 @@ if loadfont unicode; then
  terminal_output gfxterm
 fi

-set menu_color_normal=light-cyan/dark-gray
-set menu_color_highlight=black/cyan
+set menu_color_normal=light-green/blue
+set menu_color_highlight=black/green

 if serial --unit=0 --speed=115200; then
  terminal_input --append serial_com0