mirror of
https://github.com/RROrg/rr.git
synced 2025-06-21 05:51:05 +08:00
fix something
This commit is contained in:
parent
b40620a937
commit
c52ee8bcc0
7
.github/workflows/issues.yml
vendored
7
.github/workflows/issues.yml
vendored
@ -38,7 +38,8 @@ jobs:
|
|||||||
body: |
|
body: |
|
||||||
<img src="https://user-images.githubusercontent.com/5615843/235939097-6798da58-24fd-44cc-9970-c8d2f9609704.jpg" width="400">
|
<img src="https://user-images.githubusercontent.com/5615843/235939097-6798da58-24fd-44cc-9970-c8d2f9609704.jpg" width="400">
|
||||||
|
|
||||||
Please fill in the following information.
|
请填写以下信息.
|
||||||
|
Please fill in the following information.
|
||||||
|
|
||||||
Install ENV: (You can find it in the boot interface.)
|
Install ENV: (You can find it in the boot interface.)
|
||||||
* DMI:
|
* DMI:
|
||||||
@ -59,7 +60,11 @@ jobs:
|
|||||||
|
|
||||||
logs:
|
logs:
|
||||||
|
|
||||||
|
(请先看一下#173、#175、#226的内容)
|
||||||
(Plz review the content of #173, #175, #226 first)
|
(Plz review the content of #173, #175, #226 first)
|
||||||
...
|
...
|
||||||
|
|
||||||
|
... 如果你提供不了详细信息,那就等有缘人吧!
|
||||||
|
... If you can't provide detailed information, then wait for someone who is destined!
|
||||||
|
|
||||||
emoji: heart
|
emoji: heart
|
||||||
|
@ -282,9 +282,9 @@ function getBus() {
|
|||||||
# usb/ata(sata/ide)/scsi
|
# usb/ata(sata/ide)/scsi
|
||||||
[ -z "${BUS}" ] && BUS=$(udevadm info --query property --name "${1}" 2>/dev/null | grep ID_BUS | cut -d= -f2 | sed 's/ata/sata/')
|
[ -z "${BUS}" ] && BUS=$(udevadm info --query property --name "${1}" 2>/dev/null | grep ID_BUS | cut -d= -f2 | sed 's/ata/sata/')
|
||||||
# usb/sata(sata/ide)/nvme
|
# usb/sata(sata/ide)/nvme
|
||||||
[ -z "${BUS}" ] && BUS=$(lsblk -dpno KNAME,TRAN 2>/dev/null | grep "${1}" | awk '{print $2}')
|
[ -z "${BUS}" ] && BUS=$(lsblk -dpno KNAME,TRAN 2>/dev/null | grep "${1} " | awk '{print $2}') #Spaces are intentional
|
||||||
# usb/scsi(sata/ide)/virtio(scsi/virtio)/mmc/nvme
|
# usb/scsi(sata/ide)/virtio(scsi/virtio)/mmc/nvme
|
||||||
[ -z "${BUS}" ] && BUS=$(lsblk -dpno KNAME,SUBSYSTEMS 2>/dev/null | grep "${1}" | awk -F':' '{print $(NF-1)}' | sed 's/_host//')
|
[ -z "${BUS}" ] && BUS=$(lsblk -dpno KNAME,SUBSYSTEMS 2>/dev/null | grep "${1} " | awk -F':' '{print $(NF-1)}' | sed 's/_host//') #Spaces are intentional
|
||||||
echo "${BUS}"
|
echo "${BUS}"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -466,13 +466,13 @@ msgstr ""
|
|||||||
|
|
||||||
#: menu.sh:607
|
#: menu.sh:607
|
||||||
msgid ""
|
msgid ""
|
||||||
" * \\Zi915.enable_guc=2\\Zn\\n Enable the GuC firmware on Intel graphics "
|
" * \\Z4i915.enable_guc=2\\Zn\\n Enable the GuC firmware on Intel graphics "
|
||||||
"hardware.(value: 1,2 or 3)\\n"
|
"hardware.(value: 1,2 or 3)\\n"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: menu.sh:608
|
#: menu.sh:608
|
||||||
msgid ""
|
msgid ""
|
||||||
" * \\Zi915.max_vfs=7\\Zn\\n Set the maximum number of virtual functions "
|
" * \\Z4i915.max_vfs=7\\Zn\\n Set the maximum number of virtual functions "
|
||||||
"(VFs) that can be created for Intel graphics hardware.\\n"
|
"(VFs) that can be created for Intel graphics hardware.\\n"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
@ -476,18 +476,18 @@ msgstr " * \\Z4DiskIdxMap=??\\Zn\\n Disk Index Map, 修改磁盘名称顺序.
|
|||||||
|
|
||||||
#: menu.sh:607
|
#: menu.sh:607
|
||||||
msgid ""
|
msgid ""
|
||||||
" * \\Zi915.enable_guc=2\\Zn\\n Enable the GuC firmware on Intel graphics "
|
" * \\Z4i915.enable_guc=2\\Zn\\n Enable the GuC firmware on Intel graphics "
|
||||||
"hardware.(value: 1,2 or 3)\\n"
|
"hardware.(value: 1,2 or 3)\\n"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
" * \\Zi915.enable_guc=2\\Zn\\n 启用 Intel 核显上的 GuC 固件.(值: 1,2 or "
|
" * \\Z4i915.enable_guc=2\\Zn\\n 启用 Intel 核显上的 GuC 固件.(值: 1,2 or "
|
||||||
"3)\\n"
|
"3)\\n"
|
||||||
|
|
||||||
#: menu.sh:608
|
#: menu.sh:608
|
||||||
msgid ""
|
msgid ""
|
||||||
" * \\Zi915.max_vfs=7\\Zn\\n Set the maximum number of virtual functions "
|
" * \\Z4i915.max_vfs=7\\Zn\\n Set the maximum number of virtual functions "
|
||||||
"(VFs) that can be created for Intel graphics hardware.\\n"
|
"(VFs) that can be created for Intel graphics hardware.\\n"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
" * \\Zi915.max_vfs=7\\Zn\\n 设置可创建虚拟核显 (VFs) 的最大数量.\\n"
|
" * \\Z4i915.max_vfs=7\\Zn\\n 设置可创建虚拟核显 (VFs) 的最大数量.\\n"
|
||||||
|
|
||||||
#: menu.sh:609 menu.sh:740
|
#: menu.sh:609 menu.sh:740
|
||||||
msgid "\\nEnter the parameter name and value you need to add.\\n"
|
msgid "\\nEnter the parameter name and value you need to add.\\n"
|
||||||
|
@ -476,18 +476,18 @@ msgstr " * \\Z4DiskIdxMap=??\\Zn\\n Disk Index Map, 修改磁碟名稱順序.
|
|||||||
|
|
||||||
#: menu.sh:607
|
#: menu.sh:607
|
||||||
msgid ""
|
msgid ""
|
||||||
" * \\Zi915.enable_guc=2\\Zn\\n Enable the GuC firmware on Intel graphics "
|
" * \\Z4i915.enable_guc=2\\Zn\\n Enable the GuC firmware on Intel graphics "
|
||||||
"hardware.(value: 1,2 or 3)\\n"
|
"hardware.(value: 1,2 or 3)\\n"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
" * \\Zi915.enable_guc=2\\Zn\\n 啟用 Intel 核顯上的 GuC 韌體.(值: 1,2 or "
|
" * \\Z4i915.enable_guc=2\\Zn\\n 啟用 Intel 核顯上的 GuC 韌體.(值: 1,2 or "
|
||||||
"3)\\n"
|
"3)\\n"
|
||||||
|
|
||||||
#: menu.sh:608
|
#: menu.sh:608
|
||||||
msgid ""
|
msgid ""
|
||||||
" * \\Zi915.max_vfs=7\\Zn\\n Set the maximum number of virtual functions "
|
" * \\Z4i915.max_vfs=7\\Zn\\n Set the maximum number of virtual functions "
|
||||||
"(VFs) that can be created for Intel graphics hardware.\\n"
|
"(VFs) that can be created for Intel graphics hardware.\\n"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
" * \\Zi915.max_vfs=7\\Zn\\n 設定可建立虛擬核顯 (VFs) 的最大數量.\\n"
|
" * \\Z4i915.max_vfs=7\\Zn\\n 設定可建立虛擬核顯 (VFs) 的最大數量.\\n"
|
||||||
|
|
||||||
#: menu.sh:609 menu.sh:740
|
#: menu.sh:609 menu.sh:740
|
||||||
msgid "\\nEnter the parameter name and value you need to add.\\n"
|
msgid "\\nEnter the parameter name and value you need to add.\\n"
|
||||||
|
@ -431,12 +431,12 @@ msgid " * \\Z4DiskIdxMap=??\\Zn\\n Disk Index Map, Modify disk name sequence.
|
|||||||
msgstr " * \\Z4DiskIdxMap=??\\Zn\\n 磁碟索引地圖,修改磁碟名稱順序。\\n"
|
msgstr " * \\Z4DiskIdxMap=??\\Zn\\n 磁碟索引地圖,修改磁碟名稱順序。\\n"
|
||||||
|
|
||||||
#: menu.sh:607
|
#: menu.sh:607
|
||||||
msgid " * \\Zi915.enable_guc=2\\Zn\\n Enable the GuC firmware on Intel graphics hardware.(value: 1,2 or 3)\\n"
|
msgid " * \\Z4i915.enable_guc=2\\Zn\\n Enable the GuC firmware on Intel graphics hardware.(value: 1,2 or 3)\\n"
|
||||||
msgstr " * \\Zi915.enable_guc=2\\Zn\\n 在 Intel 圖形硬體上啟用 GuC 韌體。(值: 1,2 或 3)\\n"
|
msgstr " * \\Z4i915.enable_guc=2\\Zn\\n 在 Intel 圖形硬體上啟用 GuC 韌體。(值: 1,2 或 3)\\n"
|
||||||
|
|
||||||
#: menu.sh:608
|
#: menu.sh:608
|
||||||
msgid " * \\Zi915.max_vfs=7\\Zn\\n Set the maximum number of virtual functions (VFs) that can be created for Intel graphics hardware.\\n"
|
msgid " * \\Z4i915.max_vfs=7\\Zn\\n Set the maximum number of virtual functions (VFs) that can be created for Intel graphics hardware.\\n"
|
||||||
msgstr " * \\Zi915.max_vfs=7\\Zn\\n 設定可在在 Intel 圖形硬體上建立的最大虛擬函式數量。\\n"
|
msgstr " * \\Z4i915.max_vfs=7\\Zn\\n 設定可在在 Intel 圖形硬體上建立的最大虛擬函式數量。\\n"
|
||||||
|
|
||||||
#: menu.sh:609 menu.sh:740
|
#: menu.sh:609 menu.sh:740
|
||||||
msgid "\\nEnter the parameter name and value you need to add.\\n"
|
msgid "\\nEnter the parameter name and value you need to add.\\n"
|
||||||
|
@ -604,8 +604,8 @@ function cmdlineMenu() {
|
|||||||
MSG+="$(TEXT " * \Z4intel_idle.max_cstate=1\Zn\n Set the maximum C-state depth allowed by the intel_idle driver.\n")"
|
MSG+="$(TEXT " * \Z4intel_idle.max_cstate=1\Zn\n Set the maximum C-state depth allowed by the intel_idle driver.\n")"
|
||||||
MSG+="$(TEXT " * \Z4SataPortMap=??\Zn\n Sata Port Map.\n")"
|
MSG+="$(TEXT " * \Z4SataPortMap=??\Zn\n Sata Port Map.\n")"
|
||||||
MSG+="$(TEXT " * \Z4DiskIdxMap=??\Zn\n Disk Index Map, Modify disk name sequence.\n")"
|
MSG+="$(TEXT " * \Z4DiskIdxMap=??\Zn\n Disk Index Map, Modify disk name sequence.\n")"
|
||||||
MSG+="$(TEXT " * \Zi915.enable_guc=2\Zn\n Enable the GuC firmware on Intel graphics hardware.(value: 1,2 or 3)\n")"
|
MSG+="$(TEXT " * \Z4i915.enable_guc=2\Zn\n Enable the GuC firmware on Intel graphics hardware.(value: 1,2 or 3)\n")"
|
||||||
MSG+="$(TEXT " * \Zi915.max_vfs=7\Zn\n Set the maximum number of virtual functions (VFs) that can be created for Intel graphics hardware.\n")"
|
MSG+="$(TEXT " * \Z4i915.max_vfs=7\Zn\n Set the maximum number of virtual functions (VFs) that can be created for Intel graphics hardware.\n")"
|
||||||
MSG+="$(TEXT "\nEnter the parameter name and value you need to add.\n")"
|
MSG+="$(TEXT "\nEnter the parameter name and value you need to add.\n")"
|
||||||
LINENUM=$(($(echo -e "${MSG}" | wc -l) + 8))
|
LINENUM=$(($(echo -e "${MSG}" | wc -l) + 8))
|
||||||
while true; do
|
while true; do
|
||||||
@ -1007,9 +1007,6 @@ function make() {
|
|||||||
break
|
break
|
||||||
fi
|
fi
|
||||||
rm -f ${PART1_PATH}/.build
|
rm -f ${PART1_PATH}/.build
|
||||||
PRODUCTVER="$(readConfigKey "productver" "${USER_CONFIG_FILE}")"
|
|
||||||
BUILDNUM="$(readConfigKey "buildnum" "${USER_CONFIG_FILE}")"
|
|
||||||
SMALLNUM="$(readConfigKey "smallnum" "${USER_CONFIG_FILE}")"
|
|
||||||
echo "$(TEXT "Cleaning ...")"
|
echo "$(TEXT "Cleaning ...")"
|
||||||
rm -rf "${UNTAR_PAT_PATH}"
|
rm -rf "${UNTAR_PAT_PATH}"
|
||||||
echo "$(TEXT "Ready!")"
|
echo "$(TEXT "Ready!")"
|
||||||
@ -1023,6 +1020,9 @@ function make() {
|
|||||||
--msgbox "$(cat ${MKERR_FILE})" 0 0
|
--msgbox "$(cat ${MKERR_FILE})" 0 0
|
||||||
return 1
|
return 1
|
||||||
else
|
else
|
||||||
|
PRODUCTVER="$(readConfigKey "productver" "${USER_CONFIG_FILE}")"
|
||||||
|
BUILDNUM="$(readConfigKey "buildnum" "${USER_CONFIG_FILE}")"
|
||||||
|
SMALLNUM="$(readConfigKey "smallnum" "${USER_CONFIG_FILE}")"
|
||||||
return 0
|
return 0
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
@ -1287,7 +1287,7 @@ function advancedMenu() {
|
|||||||
[ $(ls -l /sys/class/mmc_host | grep mmc_host | wc -l) -gt 0 ] && MSG+="\nMMC:\n"
|
[ $(ls -l /sys/class/mmc_host | grep mmc_host | wc -l) -gt 0 ] && MSG+="\nMMC:\n"
|
||||||
for PCI in $(lspci -d ::805 | awk '{print $1}'); do
|
for PCI in $(lspci -d ::805 | awk '{print $1}'); do
|
||||||
NAME=$(lspci -s "${PCI}" | sed "s/\ .*://")
|
NAME=$(lspci -s "${PCI}" | sed "s/\ .*://")
|
||||||
PORTNUM=$(ls -l /sys/class/mmc_host | grep "${PCI}" | wc -l)
|
PORTNUM=$(ls -l /sys/block/mmc* | grep "${PCI}" | wc -l)
|
||||||
[ ${PORTNUM} -eq 0 ] && continue
|
[ ${PORTNUM} -eq 0 ] && continue
|
||||||
MSG+="\Zb${NAME}\Zn\nNumber: ${PORTNUM}\n"
|
MSG+="\Zb${NAME}\Zn\nNumber: ${PORTNUM}\n"
|
||||||
NUMPORTS=$((${NUMPORTS} + ${PORTNUM}))
|
NUMPORTS=$((${NUMPORTS} + ${PORTNUM}))
|
||||||
@ -1354,6 +1354,11 @@ function advancedMenu() {
|
|||||||
echo "${POSITION}" | grep -q "${LOADER_DISK}" && continue
|
echo "${POSITION}" | grep -q "${LOADER_DISK}" && continue
|
||||||
echo "\"${POSITION}\" \"${NAME}\" \"off\"" >>"${TMP_PATH}/opts"
|
echo "\"${POSITION}\" \"${NAME}\" \"off\"" >>"${TMP_PATH}/opts"
|
||||||
done < <(ls -l /dev/disk/by-id/ | sed 's|../..|/dev|g' | grep -E "/dev/sd|/dev/mmc|/dev/nvme" | awk -F' ' '{print $NF" "$(NF-2)}' | sort -uk 1,1)
|
done < <(ls -l /dev/disk/by-id/ | sed 's|../..|/dev|g' | grep -E "/dev/sd|/dev/mmc|/dev/nvme" | awk -F' ' '{print $NF" "$(NF-2)}' | sort -uk 1,1)
|
||||||
|
if [ ! -f "${TMP_PATH}/opts" ]; then
|
||||||
|
DIALOG --title "$(TEXT "Advanced")" \
|
||||||
|
--msgbox "$(TEXT "No disk found!")" 0 0
|
||||||
|
return
|
||||||
|
fi
|
||||||
DIALOG --title "$(TEXT "Advanced")" \
|
DIALOG --title "$(TEXT "Advanced")" \
|
||||||
--checklist "$(TEXT "Advanced")" 0 0 0 --file "${TMP_PATH}/opts" \
|
--checklist "$(TEXT "Advanced")" 0 0 0 --file "${TMP_PATH}/opts" \
|
||||||
2>${TMP_PATH}/resp
|
2>${TMP_PATH}/resp
|
||||||
|
Loading…
x
Reference in New Issue
Block a user