From 9265e271b71631876276bbaf6dada2eb5ba0e817 Mon Sep 17 00:00:00 2001
From: Ing <wjz304@qq.com>
Date: Sun, 7 Apr 2024 05:42:28 +0800
Subject: [PATCH] fix disks number gt 26 not displayed

---
 files/initrd/opt/rr/menu.sh | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/files/initrd/opt/rr/menu.sh b/files/initrd/opt/rr/menu.sh
index faecfce5..fc9471bb 100755
--- a/files/initrd/opt/rr/menu.sh
+++ b/files/initrd/opt/rr/menu.sh
@@ -1678,13 +1678,13 @@ function showDisksInfo() {
 # Format disk
 function formatDisks() {
   rm -f "${TMP_PATH}/opts"
-  while read KNAME ID; do
+  while read KNAME ID PKNAME; do
     [ -z "${KNAME}" ] && continue
     [[ "${KNAME}" = /dev/md* ]] && continue
-    echo "${KNAME}" | grep -q "${LOADER_DISK}" && continue
+    [ "${KNAME}" = "${LOADER_DISK}" -o "${PKNAME}" = "${LOADER_DISK}" ] && continue
     [ -z "${ID}" ] && ID="Unknown"
     echo "\"${KNAME}\" \"${ID}\" \"off\"" >>"${TMP_PATH}/opts"
-  done <<<$(lsblk -pno KNAME,ID)
+  done <<<$(lsblk -pno KNAME,ID,PKNAME)
   if [ ! -f "${TMP_PATH}/opts" ]; then
     DIALOG --title "$(TEXT "Advanced")" \
       --msgbox "$(TEXT "No disk found!")" 0 0
@@ -2100,11 +2100,11 @@ function removeBlockIPDB {
 # Clone bootloader disk
 function cloneBootloaderDisk() {
   rm -f "${TMP_PATH}/opts"
-  while read KNAME ID; do
+  while read KNAME ID PKNAME; do
     [ -z "${KNAME}" -o -z "${ID}" ] && continue
-    echo "${KNAME}" | grep -q "${LOADER_DISK}" && continue
+    [ "${KNAME}" = "${LOADER_DISK}" -o "${PKNAME}" = "${LOADER_DISK}" ] && continue
     echo "\"${KNAME}\" \"${ID}\" \"off\"" >>"${TMP_PATH}/opts"
-  done <<<$(lsblk -dpno KNAME,ID)
+  done <<<$(lsblk -dpno KNAME,ID,PKNAME)
   if [ ! -f "${TMP_PATH}/opts" ]; then
     DIALOG --title "$(TEXT "Advanced")" \
       --msgbox "$(TEXT "No disk found!")" 0 0