From f330d62bd3910f909ccfc1d1963af2b94368793b Mon Sep 17 00:00:00 2001
From: Ing <wjz304@qq.com>
Date: Tue, 6 Aug 2024 09:27:29 +0800
Subject: [PATCH] sync cmdline

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

diff --git a/files/initrd/opt/rr/boot.sh b/files/initrd/opt/rr/boot.sh
index a8004331..15c9b826 100755
--- a/files/initrd/opt/rr/boot.sh
+++ b/files/initrd/opt/rr/boot.sh
@@ -156,6 +156,9 @@ CMDLINE['rootwait']=""
 CMDLINE['loglevel']="15"
 CMDLINE['log_buf_len']="32M"
 CMDLINE['panic']="${KERNELPANIC:-0}"
+CMDLINE['pcie_aspm']="off"
+CMDLINE['nox2apic']=""
+CMDLINE['nomodeset']=""
 CMDLINE['modprobe.blacklist']="${MODBLACKLIST}"
 
 # if [ -n "$(ls /dev/mmcblk* 2>/dev/null)" ] && [ ! "${BUS}" = "mmc" ] && [ ! "${EMMCBOOT}" = "true" ]; then
diff --git a/files/mnt/p1/boot/grub/grub.cfg b/files/mnt/p1/boot/grub/grub.cfg
index 2a5bf8d2..0123896f 100644
--- a/files/mnt/p1/boot/grub/grub.cfg
+++ b/files/mnt/p1/boot/grub/grub.cfg
@@ -70,7 +70,7 @@ function set_gfxpayload {
   fi
 }
 
-set RR_CMDLINE="earlyprintk earlycon=uart8250,io,0x3f8,115200n8 console=ttyS0,115200n8 root=/dev/ram rootwait pcie_aspm=off net.ifnames=0 nox2apic nomodeset intremap=off"
+set RR_CMDLINE="earlyprintk earlycon=uart8250,io,0x3f8,115200n8 console=ttyS0,115200n8 root=/dev/ram rootwait net.ifnames=0 panic=5 pcie_aspm=off nox2apic nomodeset"
 
 search --set=root --label "RR3"
 if [ -s /zImage-dsm -a -s /initrd-dsm ]; then