From 4168b71f42eadb71b35a01740a593811304480b0 Mon Sep 17 00:00:00 2001
From: Ing <wjz304@qq.com>
Date: Sun, 1 Dec 2024 21:45:56 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20boot.sh=20=E5=92=8C=20grub?=
 =?UTF-8?q?.cfg=EF=BC=8C=E4=BC=98=E5=8C=96=20MEV=20=E5=8F=98=E9=87=8F?=
 =?UTF-8?q?=E8=8E=B7=E5=8F=96=E9=80=BB=E8=BE=91=E5=92=8C=E8=BE=93=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 files/initrd/opt/rr/boot.sh     | 4 ++--
 files/mnt/p1/boot/grub/grub.cfg | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/files/initrd/opt/rr/boot.sh b/files/initrd/opt/rr/boot.sh
index f8d64a2e..43db6369 100755
--- a/files/initrd/opt/rr/boot.sh
+++ b/files/initrd/opt/rr/boot.sh
@@ -68,7 +68,7 @@ DT="$(readConfigKey "platforms.${PLATFORM}.dt" "${WORK_PATH}/platforms.yml")"
 KVER="$(readConfigKey "platforms.${PLATFORM}.productvers.\"${PRODUCTVER}\".kver" "${WORK_PATH}/platforms.yml")"
 KPRE="$(readConfigKey "platforms.${PLATFORM}.productvers.\"${PRODUCTVER}\".kpre" "${WORK_PATH}/platforms.yml")"
 
-MEV="$(virt-what 2>/dev/null)"
+MEV="$(virt-what 2>/dev/null | head -1)"
 DMI="$(dmesg 2>/dev/null | grep -i "DMI:" | head -1 | sed 's/\[.*\] DMI: //i')"
 CPU="$(awk -F': ' '/model name/ {print $2}' /proc/cpuinfo | uniq)"
 MEM="$(awk '/MemTotal:/ {printf "%.0f", $2 / 1024}' /proc/meminfo) MB"
@@ -237,7 +237,7 @@ for KEY in "${!CMDLINE[@]}"; do
   [ -n "${VALUE}" ] && CMDLINE_LINE+="=${VALUE}"
 done
 CMDLINE_LINE=$(echo "${CMDLINE_LINE}" | sed 's/^ //') # Remove leading space
-printf "%s:\n \033[1;36m%s\033[0m\n" "$(TEXT "Cmdline")" "${CMDLINE_LINE}"
+printf "%s:\n\033[1;36m%s\033[0m\n" "$(TEXT "Cmdline")" "${CMDLINE_LINE}"
 
 # Check if user wants to modify at this stage
 function _bootwait() {
diff --git a/files/mnt/p1/boot/grub/grub.cfg b/files/mnt/p1/boot/grub/grub.cfg
index 3d33287f..718ef236 100644
--- a/files/mnt/p1/boot/grub/grub.cfg
+++ b/files/mnt/p1/boot/grub/grub.cfg
@@ -90,6 +90,7 @@ if [ -s /zImage-dsm -a -s /initrd-dsm ]; then
       echo "version: ${dsm_version}"
       echo "kernel:  ${dsm_kernel}"
       echo "LKM:     ${dsm_lkm}"
+      echo "MEV:     ${sys_mev}"
       echo "DMI:     ${sys_dmi}"
       echo "CPU:     ${sys_cpu}"
       echo "MEM:     ${sys_mem}"