files/initrd/opt/rr/boot.sh

@@ -91,7 +91,6 @@ MAC1="$(readConfigKey "mac1" "${USER_CONFIG_FILE}")"
 MAC2="$(readConfigKey "mac2" "${USER_CONFIG_FILE}")"
 KERNELPANIC="$(readConfigKey "kernelpanic" "${USER_CONFIG_FILE}")"
 EMMCBOOT="$(readConfigKey "emmcboot" "${USER_CONFIG_FILE}")"
-MODBLACKLIST="$(readConfigKey "modblacklist" "${USER_CONFIG_FILE}")"
 
 declare -A CMDLINE
 
@@ -156,21 +155,19 @@ CMDLINE['rootwait']=""
 CMDLINE['loglevel']="15"
 CMDLINE['log_buf_len']="32M"
 CMDLINE['panic']="${KERNELPANIC:-0}"
-CMDLINE['modprobe.blacklist']="${MODBLACKLIST}"
 
 # if [ -n "$(ls /dev/mmcblk* 2>/dev/null)" ] && [ ! "${BUS}" = "mmc" ] && [ ! "${EMMCBOOT}" = "true" ]; then
-#   if ! echo "${CMDLINE['modprobe.blacklist']}" | grep -q "sdhci"; then
 #   [ ! "${CMDLINE['modprobe.blacklist']}" = "" ] && CMDLINE['modprobe.blacklist']+=","
 #   CMDLINE['modprobe.blacklist']+="sdhci,sdhci_pci,sdhci_acpi"
 # fi
-# fi
 if [ "${DT}" = "true" ] && ! echo "epyc7002 purley broadwellnkv2" | grep -wq "${PLATFORM}"; then
-  if ! echo "${CMDLINE['modprobe.blacklist']}" | grep -q "mpt3sas"; then
   [ ! "${CMDLINE['modprobe.blacklist']}" = "" ] && CMDLINE['modprobe.blacklist']+=","
   CMDLINE['modprobe.blacklist']+="mpt3sas"
 fi
+if true; then
+  [ ! "${CMDLINE['modprobe.blacklist']}" = "" ] && CMDLINE['modprobe.blacklist']+=","
+  CMDLINE['modprobe.blacklist']+="evbug"
 fi
-
 if echo "apollolake geminilake" | grep -wq "${PLATFORM}"; then
   CMDLINE["intel_iommu"]="igfx_off"
 fi

files/initrd/opt/rr/init.sh

@@ -63,7 +63,6 @@ initConfigKey "addons.acpid" "" "${USER_CONFIG_FILE}"
 initConfigKey "addons.mountloader" "" "${USER_CONFIG_FILE}"
 initConfigKey "addons.reboottoloader" "" "${USER_CONFIG_FILE}"
 initConfigKey "modules" "{}" "${USER_CONFIG_FILE}"
-initConfigKey "modblacklist" "evbug,cdc_ether" "${USER_CONFIG_FILE}"
 
 # for update
 if [ -f "${PART2_PATH}/GRUB_VER" ]; then

files/initrd/opt/rr/menu.sh

@@ -667,7 +667,6 @@ function moduleMenu() {
       i "$(TEXT "Deselect i915 with dependencies")" \
       p "$(TEXT "Priority use of official drivers:") \Z4${ODP}\Zn" \
       f "$(TEXT "Edit modules that need to be copied to DSM")" \
-      b "$(TEXT "modprobe blacklist")" \
       e "$(TEXT "Exit")" \
       2>${TMP_PATH}/resp
     [ $? -ne 0 ] && break
@@ -822,28 +821,6 @@ function moduleMenu() {
         break
       done
       ;;
-    b)
-      # modprobe.blacklist
-      MSG=""
-      MSG+="$(TEXT "The blacklist is used to prevent the kernel from loading specific modules.\n")"
-      MSG+="$(TEXT "The blacklist is a list of module names separated by ','.\n")"
-      MSG+="$(TEXT "For example: \Z4evbug,cdc_ether\Zn\n")"
-      while true; do
-        modblacklist="$(readConfigKey "modblacklist" "${USER_CONFIG_FILE}")"
-        DIALOG --title "$(TEXT "Modules")" \
-          --inputbox "${MSG}" 12 70 "${modblacklist}" \
-          2>${TMP_PATH}/resp
-        [ $? -ne 0 ] && break
-        VALUE="$(cat "${TMP_PATH}/resp")"
-        if [[ ${VALUE} = *" "* ]]; then
-          DIALOG --title "$(TEXT "Cmdline")" \
-            --yesno "$(TEXT "Invalid list, No spaces should appear, retry?")" 0 0
-          [ $? -eq 0 ] && continue || break
-        fi
-        writeConfigKey "modblacklist" "${VALUE}" "${USER_CONFIG_FILE}"
-        break
-      done
-      ;;
     e)
       break
       ;;

files/mnt/p1/boot/grub/grub.cfg

@@ -70,7 +70,7 @@ function set_gfxpayload {
   fi
 }
 
-set RR_CMDLINE="earlyprintk earlycon=ttyS0,115200 console=ttyS0,115200 root=/dev/ram rootwait pcie_aspm=off net.ifnames=0"
+set RR_CMDLINE="earlyprintk earlycon=ttyS0,115200 console=ttyS0,115200 root=/dev/ram rootwait pcie_aspm=off net.ifnames=0 mitigations=auto"
 
 search --set=root --label "RR3"
 if [ -s /zImage-dsm -a -s /initrd-dsm ]; then

guide.md

@@ -147,23 +147,12 @@
   lsmod                                            # 查看已加载驱动
   lsusb                                            # 查看 USB 设备
   lsblk                                            # 查看磁盘设备
-  lspci -Qnnk                                      # 查看 PCI 设备
+  lspci -Qnn                                       # 查看 PCI 设备
 
   # 驱动相关
   ls -ld /sys/class/net/*/device/driver            # 查看已加载网卡和对应驱动
   cat /sys/class/net/*/address                     # 查看已加载网卡的 MAC 地址
 
-  # 串口
-  cat /proc/tty/drivers                            # 查看串口属性
-  cat /proc/tty/driver/serial                      # 查看串口属性
-  stty -F /dev/ttyS0 -a                            # 查看串口参数
-  stty -F /dev/ttyS0 ispeed 115200 ospeed 115200 cs8 -parenb -cstopb -echo  # 设置串口参数
-  stty size                                        # 打印终端的行数和列数
-  echo helloworld >/dev/ttyS0                      # 向串口发送数据
-  cat /dev/ttyS0                                   # 读取串口数据
-  getty -L /dev/ttyS0 115200                       # 启动串口终端
-  agetty -L /dev/ttyS0 115200                      # 启动串口终端
-
   # 磁盘相关
   fdisk -l                                         # 查看硬盘信息
   lspci -d ::100                                   # 查看 SCSI 存储控制器 https://admin.pci-ids.ucw.cz/read/PD/
@@ -209,14 +198,6 @@
   mdadm --grow /dev/md0 --level=5                  # 将 Raid 0 设备的级别改变为 RAID 5
   mdadm --zero-superblock /dev/sda1                # 清除 sda1 磁盘分区的 RAID 超级块 (使这个磁盘分区不再被识别为 RAID 设备的一部分)
 
-  # eudev 
-  udevadm control --reload-rules                   # 重新加载 udev 规则
-  udevadm trigger                                  # 触发 udev 事件
-  udevadm info --query all --name /dev/sda1        # 查看 udev 属性
-  udevadm info --query all --path /sys/class/net/eth0          # 查看 udev 属性
-  udevadm monitor --property --udev                # 监控 udev 事件
-  udevadm test /dev/sda1                           # 测试 udev 规则
-
   # 服务相关
   journalctl -xe                                   # 查看服务日志
   systemctl                                        # 查看服务