yuan/RROrg-rr
1
0
Fork 0
mirror of https://github.com/RROrg/rr.git synced 2025-06-21 05:51:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix disks number gt 26 not displayed

Browse Source
This commit is contained in:
Ing 2024-04-07 05:42:28 +08:00
parent 589bb306c8
commit 9265e271b7
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
files/initrd/opt/rr/menu.sh
View File

@ -1678,13 +1678,13 @@ function showDisksInfo() {
# Format disk # Format disk
function formatDisks() { function formatDisks() {
rm -f "${TMP_PATH}/opts" rm -f "${TMP_PATH}/opts"
while read KNAME ID; do while read KNAME ID PKNAME; do
[ -z "${KNAME}" ] && continue [ -z "${KNAME}" ] && continue
[[ "${KNAME}" = /dev/md* ]] && continue [[ "${KNAME}" = /dev/md* ]] && continue
echo "${KNAME}" | grep -q "${LOADER_DISK}" && continue [ "${KNAME}" = "${LOADER_DISK}" -o "${PKNAME}" = "${LOADER_DISK}" ] && continue
[ -z "${ID}" ] && ID="Unknown" [ -z "${ID}" ] && ID="Unknown"
echo "\"${KNAME}\" \"${ID}\" \"off\"" >>"${TMP_PATH}/opts" echo "\"${KNAME}\" \"${ID}\" \"off\"" >>"${TMP_PATH}/opts"
done <<<$(lsblk -pno KNAME,ID) done <<<$(lsblk -pno KNAME,ID,PKNAME)
if [ ! -f "${TMP_PATH}/opts" ]; then if [ ! -f "${TMP_PATH}/opts" ]; then
DIALOG --title "$(TEXT "Advanced")" \ DIALOG --title "$(TEXT "Advanced")" \
--msgbox "$(TEXT "No disk found!")" 0 0 --msgbox "$(TEXT "No disk found!")" 0 0
@ -2100,11 +2100,11 @@ function removeBlockIPDB {
# Clone bootloader disk # Clone bootloader disk
function cloneBootloaderDisk() { function cloneBootloaderDisk() {
rm -f "${TMP_PATH}/opts" rm -f "${TMP_PATH}/opts"
while read KNAME ID; do while read KNAME ID PKNAME; do
[ -z "${KNAME}" -o -z "${ID}" ] && continue [ -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" echo "\"${KNAME}\" \"${ID}\" \"off\"" >>"${TMP_PATH}/opts"
done <<<$(lsblk -dpno KNAME,ID) done <<<$(lsblk -dpno KNAME,ID,PKNAME)
if [ ! -f "${TMP_PATH}/opts" ]; then if [ ! -f "${TMP_PATH}/opts" ]; then
DIALOG --title "$(TEXT "Advanced")" \ DIALOG --title "$(TEXT "Advanced")" \
--msgbox "$(TEXT "No disk found!")" 0 0 --msgbox "$(TEXT "No disk found!")" 0 0