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

修复 checkCPU_VT_d 和 checkBIOS_VT_d 函数中的错误输出重定向

Browse Source
This commit is contained in:
Ing 2025-01-01 17:12:54 +08:00
parent c3ef9bdb0e
commit bf44b402f8
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/include/functions.sh
View File

@ -369,10 +369,10 @@ function delCmdline() {
# check CPU Intel(VT-d)/AMD(AMD-Vi) # check CPU Intel(VT-d)/AMD(AMD-Vi)
function checkCPU_VT_d() { function checkCPU_VT_d() {
lsmod | grep -q msr || modprobe msr 2>/dev/null lsmod | grep -q msr || modprobe msr 2>/dev/null
if grep -q "GenuineIntel" /proc/cpuinfo; then if grep -q "GenuineIntel" /proc/cpuinfo 2>/dev/null; then
local VT_D_ENABLED=$(rdmsr 0x3a 2>/dev/null) local VT_D_ENABLED=$(rdmsr 0x3a 2>/dev/null)
[ "$((${VT_D_ENABLED:-0x0} & 0x5))" -eq $((0x5)) ] && return 0 [ "$((${VT_D_ENABLED:-0x0} & 0x5))" -eq $((0x5)) ] && return 0
elif grep -q "AuthenticAMD" /proc/cpuinfo; then elif grep -q "AuthenticAMD" /proc/cpuinfo 2>/dev/null; then
local IOMMU_ENABLED=$(rdmsr 0xC0010114 2>/dev/null) local IOMMU_ENABLED=$(rdmsr 0xC0010114 2>/dev/null)
[ "$((${IOMMU_ENABLED:-0x0} & 0x1))" -eq $((0x1)) ] && return 0 [ "$((${IOMMU_ENABLED:-0x0} & 0x1))" -eq $((0x1)) ] && return 0
else else
@ -383,11 +383,11 @@ function checkCPU_VT_d() {
############################################################################### ###############################################################################
# check BIOS Intel(VT-d)/AMD(AMD-Vi) # check BIOS Intel(VT-d)/AMD(AMD-Vi)
function checkBIOS_VT_d() { function checkBIOS_VT_d() {
if grep -q "GenuineIntel" /proc/cpuinfo; then if grep -q "GenuineIntel" /proc/cpuinfo 2>/dev/null; then
dmesg | grep -iq "DMAR-IR.*DRHD base" && return 0 dmesg 2>/dev/null | grep -iq "DMAR-IR.*DRHD base" && return 0
elif grep -q "AuthenticAMD" /proc/cpuinfo; then elif grep -q "AuthenticAMD" /proc/cpuinfo 2>/dev/null; then
# TODO: need check # TODO: need check
dmesg | grep -iq "AMD-Vi.*enabled" && return 0 dmesg 2>/dev/null | grep -iq "AMD-Vi.*enabled" && return 0
else else
return 1 return 1
fi fi