From ff3231cbb5ed054de71787bc00ae5c827e11f923 Mon Sep 17 00:00:00 2001
From: Ing <wjz304@qq.com>
Date: Fri, 7 Mar 2025 10:54:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=2025.3.0=20=E5=85=A8?=
 =?UTF-8?q?=E6=96=B0=E5=AE=89=E8=A3=85=E5=BE=AA=E7=8E=AF=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E5=9E=8B=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 files/initrd/opt/rr/menu.sh | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/files/initrd/opt/rr/menu.sh b/files/initrd/opt/rr/menu.sh
index f081eb6e..5f6b93c4 100755
--- a/files/initrd/opt/rr/menu.sh
+++ b/files/initrd/opt/rr/menu.sh
@@ -186,12 +186,13 @@ function modelMenu() {
           --menu "${MSG}" 0 0 20 --file "${TMP_PATH}/menu" \
           2>${TMP_PATH}/resp
         [ $? -ne 0 ] && return 0
-        respM=$(cat ${TMP_PATH}/resp)
+        resp=$(cat ${TMP_PATH}/resp)
         [ -z "${resp}" ] && return 1
         if [ "${resp}" = "f" ]; then
           RESTRICT=0
           continue
         fi
+        respM="${resp}"
         break
       done
     else
@@ -1738,7 +1739,7 @@ function formatDisks() {
     [ "${KNAME:0:7}" = "/dev/md" ] && continue
     [ "${KNAME}" = "${LOADER_DISK}" ] || [ "${PKNAME}" = "${LOADER_DISK}" ] && continue
     printf "\"%s\" \"%-6s %-4s %s\" \"off\"\n" "${KNAME}" "${SIZE}" "${TYPE}" "${ID}" >>"${TMP_PATH}/opts"
-  done <<<"$(lsblk -Jpno KNAME,ID,SIZE,TYPE,PKNAME 2>/dev/null | sed 's|null|"N/A"|g' | jq -r '.blockdevices[] | "\(.kname) \(.id) \(.size) \(.type) \(.pkname)"' 2>/dev/null)"
+  done <<<"$(lsblk -Jpno KNAME,ID,SIZE,TYPE,PKNAME 2>/dev/null | sed 's|null|"N/A"|g' | jq -r '.blockdevices[] | "\(.kname) \(.id) \(.size) \(.type) \(.pkname)"' 2>/dev/null | sort)"
   if [ ! -f "${TMP_PATH}/opts" ]; then
     DIALOG --title "$(TEXT "Advanced")" \
       --msgbox "$(TEXT "No disk found!")" 0 0
@@ -2318,7 +2319,7 @@ function cloneBootloaderDisk() {
     [ "${KNAME}" = "N/A" ] || [ "${SIZE:0:1}" = "0" ] && continue
     [ "${KNAME}" = "${LOADER_DISK}" ] || [ "${PKNAME}" = "${LOADER_DISK}" ] && continue
     printf "\"%s\" \"%-6s %s\" \"off\"\n" "${KNAME}" "${SIZE}" "${ID}" >>"${TMP_PATH}/opts"
-  done <<<"$(lsblk -Jdpno KNAME,ID,SIZE,PKNAME 2>/dev/null | sed 's|null|"N/A"|g' | jq -r '.blockdevices[] | "\(.kname) \(.id) \(.size) \(.pkname)"' 2>/dev/null)"
+  done <<<"$(lsblk -Jdpno KNAME,ID,SIZE,PKNAME 2>/dev/null | sed 's|null|"N/A"|g' | jq -r '.blockdevices[] | "\(.kname) \(.id) \(.size) \(.pkname)"' 2>/dev/null | sort)"
 
   if [ ! -f "${TMP_PATH}/opts" ]; then
     DIALOG --title "$(TEXT "Settings")" \