modify grub color

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
-    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
+    [ -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
   done
 
   # Clear logs for dbgutils addons

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

@@ -376,17 +376,9 @@ function connectwlanif() {
 # Find and mount the DSM root filesystem
 # (based on pocopico's TCRP code)
 function findDSMRoot() {
-  local DSMROOTS=""
+  DSMROOTS=""
-  local RAIDS="$(lsblk -pno KNAME,PARTN,FSTYPE,FSVER,LABEL | grep -w " 1" | grep -w "linux_raid_member")"
+  [ -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)"
-  if echo "${RAIDS}" | grep -q "1.2"; then
+  [ -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}')"
-    # SynologyNAS:0, DiskStation:0, SynologyNVR:0, BeeStation:0
+  echo "${DSMROOTS}"
-    local LABELS="$(echo "${RAIDS}" | grep "1.2" | awk '{print $5}' | uniq)"
-    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
 }

files/initrd/opt/rr/menu.sh

@@ -1743,7 +1743,7 @@ function tryRecoveryDSM() {
   fi
 
   mkdir -p "${TMP_PATH}/mdX"
-  mount "$(echo "${DSMROOTS}" | head -n 1 | cut -d' ' -f1)" "${TMP_PATH}/mdX"
+  mount -t ext4 "$(echo "${DSMROOTS}" | head -n 1 | cut -d' ' -f1)" "${TMP_PATH}/mdX"
   if [ $? -ne 0 ]; then
     DIALOG --title "$(TEXT "Advanced")" \
       --msgbox "$(TEXT "mount DSM system partition(md0) failed!\nPlease insert all disks before continuing.")" 0 0
@@ -1921,7 +1921,7 @@ function allowDSMDowngrade() {
   (
     mkdir -p "${TMP_PATH}/mdX"
     for I in ${DSMROOTS}; do
-      mount "${I}" "${TMP_PATH}/mdX"
+      mount -t ext4 "${I}" "${TMP_PATH}/mdX"
       [ $? -ne 0 ] && continue
       [ -f "${TMP_PATH}/mdX/etc/VERSION" ] && rm -f "${TMP_PATH}/mdX/etc/VERSION"
       [ -f "${TMP_PATH}/mdX/etc.defaults/VERSION" ] && rm -f "${TMP_PATH}/mdX/etc.defaults/VERSION"
@@ -1948,7 +1948,7 @@ function resetDSMPassword() {
   rm -f "${TMP_PATH}/menu"
   mkdir -p "${TMP_PATH}/mdX"
   for I in ${DSMROOTS}; do
-    mount ${I} "${TMP_PATH}/mdX"
+    mount -t ext4 "${I}" "${TMP_PATH}/mdX"
     [ $? -ne 0 ] && continue
     if [ -f "${TMP_PATH}/mdX/etc/shadow" ]; then
       while read L; do
@@ -1989,7 +1989,7 @@ function resetDSMPassword() {
   (
     mkdir -p "${TMP_PATH}/mdX"
     for I in ${DSMROOTS}; do
-      mount "${I}" "${TMP_PATH}/mdX"
+      mount -t ext4 "${I}" "${TMP_PATH}/mdX"
       [ $? -ne 0 ] && continue
       OLDPASSWD="$(cat "${TMP_PATH}/mdX/etc/shadow" 2>/dev/null | grep "^${USER}:" | awk -F ':' '{print $2}')"
       if [ -n "${NEWPASSWD}" -a -n "${OLDPASSWD}" ]; then
@@ -2032,7 +2032,7 @@ function addNewDSMUser() {
 
     mkdir -p "${TMP_PATH}/mdX"
     for I in ${DSMROOTS}; do
-      mount "${I}" "${TMP_PATH}/mdX"
+      mount -t ext4 "${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
@@ -2069,7 +2069,7 @@ function forceEnableDSMTelnetSSH() {
     ONBOOTUP="${ONBOOTUP}echo \"DELETE FROM task WHERE task_name LIKE ''RRONBOOTUPRR_SSH'';\" | sqlite3 /usr/syno/etc/esynoscheduler/esynoscheduler.db\n"
     mkdir -p "${TMP_PATH}/mdX"
     for I in ${DSMROOTS}; do
-      mount "${I}" "${TMP_PATH}/mdX"
+      mount -t ext4 "${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
@@ -2109,7 +2109,7 @@ function removeBlockIPDB {
   (
     mkdir -p "${TMP_PATH}/mdX"
     for I in ${DSMROOTS}; do
-      mount "${I}" "${TMP_PATH}/mdX"
+      mount -t ext4 "${I}" "${TMP_PATH}/mdX"
       [ $? -ne 0 ] && continue
       [ -f "${TMP_PATH}/mdX/etc/synoautoblock.db" ] && rm -f "${TMP_PATH}/mdX/etc/synoautoblock.db"
       sync

files/initrd/opt/rr/model-configs/DS1019+.yml

@@ -4,6 +4,7 @@ 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:

files/initrd/opt/rr/model-configs/DS1520+.yml

@@ -4,6 +4,7 @@ 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"

files/initrd/opt/rr/model-configs/DS1522+.yml

@@ -4,6 +4,7 @@ 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"

files/initrd/opt/rr/model-configs/DS1621+.yml

@@ -4,6 +4,7 @@ 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"

files/initrd/opt/rr/model-configs/DS1821+.yml

@@ -4,6 +4,7 @@ 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"

files/initrd/opt/rr/model-configs/DS1823xs+.yml

@@ -6,6 +6,7 @@ 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"

files/initrd/opt/rr/model-configs/DS220+.yml

@@ -4,6 +4,7 @@ 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"

files/initrd/opt/rr/model-configs/DS224+.yml

@@ -6,6 +6,7 @@ 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"

files/initrd/opt/rr/model-configs/DS2422+.yml

@@ -4,6 +4,7 @@ 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"

files/initrd/opt/rr/model-configs/DS3617xs.yml

@@ -6,6 +6,7 @@ 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"

files/initrd/opt/rr/model-configs/DS423+.yml

@@ -6,6 +6,7 @@ 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"

files/initrd/opt/rr/model-configs/DS718+.yml

@@ -4,6 +4,7 @@ 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:

files/initrd/opt/rr/model-configs/DS720+.yml

@@ -4,6 +4,7 @@ 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"

files/initrd/opt/rr/model-configs/DS723+.yml

@@ -6,6 +6,7 @@ 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"

files/initrd/opt/rr/model-configs/DS918+.yml

@@ -4,6 +4,7 @@ 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:

files/initrd/opt/rr/model-configs/DS920+.yml

@@ -4,6 +4,7 @@ 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"

files/initrd/opt/rr/model-configs/DS923+.yml

@@ -6,6 +6,7 @@ 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"

files/initrd/opt/rr/model-configs/DVA1622.yml

@@ -4,6 +4,7 @@ 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"

files/initrd/opt/rr/model-configs/FS2500.yml

@@ -7,6 +7,7 @@ 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"

files/initrd/opt/rr/model-configs/FS6400.yml

@@ -7,6 +7,7 @@ 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"

files/initrd/opt/rr/model-configs/HD6500.yml

@@ -7,6 +7,7 @@ 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:

files/initrd/opt/rr/model-configs/RS2423+.yml

@@ -7,6 +7,7 @@ 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"

files/initrd/opt/rr/model-configs/RS2423RP+.yml

@@ -7,6 +7,7 @@ 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"

files/initrd/opt/rr/model-configs/RS3618xs.yml

@@ -7,6 +7,7 @@ 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:

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_disk_hibernation: "yes"
   support_bde_internal_10g: "no"
+  support_disk_hibernation: "yes"
   support_syno_hybrid_raid:
   supportraidgroup:
   HddEnableDynamicPower: "yes"

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_disk_hibernation: "yes"
   support_bde_internal_10g: "no"
+  support_disk_hibernation: "yes"
   support_syno_hybrid_raid:
   supportraidgroup:
   HddEnableDynamicPower: "yes"

files/initrd/opt/rr/model-configs/SA6400.yml

@@ -7,6 +7,7 @@ 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:

files/initrd/opt/rr/model-configs/VirtualDSM.yml.disabled

@@ -4,6 +4,7 @@ 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:

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

@@ -49,8 +49,8 @@ if loadfont unicode; then
   terminal_output gfxterm
 fi
 
-set menu_color_normal=light-green/blue
+set menu_color_normal=light-cyan/dark-gray
-set menu_color_highlight=black/green
+set menu_color_highlight=black/cyan
 
 if serial --unit=0 --speed=115200; then
   terminal_input --append serial_com0