新增对 geminilakenk 和 r1000nk 平台的支持，更新相关条件和配置

files/initrd/opt/rr/boot.sh

@@ -246,12 +246,12 @@ if [ "${USBASINTERNAL}" = "true" ]; then
   CMDLINE['usbasinternal']=""
 fi
 
-if echo "apollolake geminilake purley" | grep -wq "${PLATFORM}"; then
+if echo "apollolake geminilake purley geminilakenk" | grep -wq "${PLATFORM}"; then
   CMDLINE["nox2apic"]=""
 fi
 
 # # Save command line to grubenv  RR_CMDLINE= ... nox2apic
-# if echo "apollolake geminilake purley" | grep -wq "${PLATFORM}"; then
+# if echo "apollolake geminilake purley geminilakenk" | grep -wq "${PLATFORM}"; then
 #   if grep -Eq "^flags.*x2apic.*" /proc/cpuinfo; then
 #     checkCmdline "rr_cmdline" "nox2apic" || addCmdline "rr_cmdline" "nox2apic"
 #   fi
@@ -265,7 +265,7 @@ fi
 #     CMDLINE['modprobe.blacklist']+="sdhci,sdhci_pci,sdhci_acpi"
 #   fi
 # fi
-if [ "${DT}" = "true" ] && ! echo "v1000nk epyc7002 purley broadwellnkv2" | grep -wq "${PLATFORM}"; then
+if [ "${DT}" = "true" ] && ! echo "purley broadwellnkv2 epyc7002 geminilakenk r1000nk v1000nk" | grep -wq "${PLATFORM}"; then
   if ! echo "${CMDLINE['modprobe.blacklist']}" | grep -q "mpt3sas"; then
     [ ! "${CMDLINE['modprobe.blacklist']}" = "" ] && CMDLINE['modprobe.blacklist']+=","
     CMDLINE['modprobe.blacklist']+="mpt3sas"
@@ -277,7 +277,7 @@ fi
 # CMDLINE['kvm.ignore_msrs']="1"
 # CMDLINE['kvm.report_ignored_msrs']="0"
 
-if echo "apollolake geminilake" | grep -wq "${PLATFORM}"; then
+if echo "apollolake geminilake geminilakenk" | grep -wq "${PLATFORM}"; then
   CMDLINE["intel_iommu"]="igfx_off"
 fi
 

files/initrd/opt/rr/menu.sh

@@ -150,9 +150,9 @@ function modelMenu() {
       while true; do
         rm -f "${TMP_PATH}/menu"
         FLGNEX=0
-        IGPU1L=(apollolake geminilake v1000nk epyc7002)
+        IGPU1L=(apollolake geminilake epyc7002 geminilakenk r1000nk v1000nk)
-        IGPU2L=(v1000nk epyc7002)
+        IGPU2L=(epyc7002 geminilakenk r1000nk v1000nk)
-        KVER5L=(v1000nk epyc7002)
+        KVER5L=(epyc7002 geminilakenk r1000nk v1000nk)
         IGPUID="$(lspci -nd ::300 2>/dev/null | grep "8086" | cut -d' ' -f3 | sed 's/://g')"
         NVMEMS=(DS918+ RS1619xs+ DS419+ DS1019+ DS719+ DS1621xs+)
         NVMEMD=$(find /sys/devices -type d -name nvme | awk -F'/' '{print NF}' | sort -n | tail -n1)
@@ -1795,7 +1795,8 @@ function downloadBackupFiles() {
     tar -czf "${TMP_PATH}/scbk.tar.gz" -C "${PART1_PATH}" scbk
     if [ -z "${SSH_TTY}" ]; then # web
       mv -f "${TMP_PATH}/scbk.tar.gz" "/var/www/data/scbk.tar.gz"
-      URL="http://$(getIP)/scbk.tar.gz"
+      HTTP=$(grep -i '^HTTP_PORT=' /etc/rrorg.conf 2>/dev/null | cut -d'=' -f2)
+      URL="http://$(getIP):${HTTP:-7080}/scbk.tar.gz"
       DIALOG --title "$(TEXT "Advanced")" \
         --msgbox "$(printf "$(TEXT "Please via %s to download the scbk,\nAnd unzip it and back it up in order by file name.")" "${URL}")" 0 0
     else
@@ -2474,7 +2475,8 @@ function systemReport() {
   inxi -c 0 -F >"${TMP_PATH}/system.txt" 2>/dev/null
   if [ -z "${SSH_TTY}" ]; then # web
     mv -f "${TMP_PATH}/system.txt" "/var/www/data/system.txt"
-    URL="http://$(getIP)/system.txt"
+    HTTP=$(grep -i '^HTTP_PORT=' /etc/rrorg.conf 2>/dev/null | cut -d'=' -f2)
+    URL="http://$(getIP):${HTTP:-7080}/system.txt"
     MSG="$(printf "$(TEXT "Please via %s to download the system.txt.")" "${URL}")"
     DIALOG --title "$(TEXT "Settings")" \
       --msgbox "${MSG}" 0 0
@@ -2542,7 +2544,8 @@ function reportBugs() {
     tar -czf "${TMP_PATH}/logs.tar.gz" -C "${TMP_PATH}" logs
     if [ -z "${SSH_TTY}" ]; then # web
       mv -f "${TMP_PATH}/logs.tar.gz" "/var/www/data/logs.tar.gz"
-      URL="http://$(getIP)/logs.tar.gz"
+      HTTP=$(grep -i '^HTTP_PORT=' /etc/rrorg.conf 2>/dev/null | cut -d'=' -f2)
+      URL="http://$(getIP):${HTTP:-7080}/logs.tar.gz"
       MSG+="$(printf "$(TEXT "Please via %s to download the logs,\nAnd go to github to create an issue and upload the logs.\n")" "${URL}")"
     else
       sz -be -B 536870912 "${TMP_PATH}/logs.tar.gz"

files/initrd/opt/rr/platforms.yml

@@ -119,6 +119,7 @@ platforms:
     productvers: *productvers5
   geminilakenk:
     dt: true
+    noflags: ["x2apic"]
     synoinfo:
       <<: *synoinfo
       netif_seq_by_dts: "no"