添加 amd_iommu_intr 和 amd_pstate 参数, 修复 BOOTWAIT 循环逻辑

files/initrd/opt/rr/boot.sh

@@ -174,10 +174,12 @@ CMDLINE['loglevel']="15"
 CMDLINE['log_buf_len']="32M"
 CMDLINE['rootwait']=""
 CMDLINE['panic']="${KERNELPANIC:-0}"
-# CMDLINE['nointremap']="" # no need
+# CMDLINE['intremap']="off" # no need
+# CMDLINE['amd_iommu_intr']="legacy" # no need
 # CMDLINE['split_lock_detect']="off" # check KVER
 CMDLINE['pcie_aspm']="off"
 # CMDLINE['intel_pstate']="disable"
+# CMDLINE['amd_pstate']="disable"
 # CMDLINE['nox2apic']=""  # check platform
 # CMDLINE['nomodeset']=""
 CMDLINE['modprobe.blacklist']="${MODBLACKLIST}"
@@ -250,17 +252,24 @@ function _bootwait() {
   [ -z "${BOOTWAIT}" ] && BOOTWAIT=10
   busybox w 2>/dev/null | awk '{print $1" "$2" "$4" "$5" "$6}' >WB
   MSG=""
-  while [ ${BOOTWAIT} -ge 0 ]; do
+  while [ ${BOOTWAIT} -gt 0 ]; do
+    sleep 1
+    BOOTWAIT=$((BOOTWAIT - 1))
     MSG="$(printf "\033[1;33m$(TEXT "%2ds (Changing access(ssh/web) status will interrupt boot)")\033[0m" "${BOOTWAIT}")"
     printf "\r${MSG}"
     busybox w 2>/dev/null | awk '{print $1" "$2" "$4" "$5" "$6}' >WC
     if ! diff WB WC >/dev/null 2>&1; then
-      printf "\r\033[1;33m%s\033[0m\n" "$(TEXT "access(ssh/web) status has changed and booting is interrupted.")"
+      printf "\r%$((${#MSG} * 2))s\n" " "
+      printf "\r\033[1;33m%s\033[0m\n" "$(TEXT "Access(ssh/web) status has changed and booting is interrupted.")"
+      rm -f WB WC
+      return 1
+    fi
+    if false && [ -f "${WORK_PATH}/menu.lock" ]; then
+      printf "\r%$((${#MSG} * 2))s\n" " "
+      printf "\r\033[1;33m%s\033[0m\n" "$(TEXT "Menu opened and booting is interrupted.")"
       rm -f WB WC
       return 1
     fi
-    sleep 1
-    BOOTWAIT=$((BOOTWAIT - 1))
   done
   rm -f WB WC
   printf "\r%$((${#MSG} * 2))s\n" " "

files/initrd/opt/rr/lang/ar_SA/LC_MESSAGES/rr.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: RR\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-12-28 23:23+0800\n"
+"POT-Creation-Date: 2025-01-01 20:05+0800\n"
 "PO-Revision-Date: 2024-05-05 22:13+0800\n"
 "Last-Translator: Ing <AI>\n"
 "Language-Team: Arabic (Saudi Arabia) <i18n-zh@RROrg>\n"
@@ -93,75 +93,79 @@ msgstr "ملاحظة: يرجى إدخال قرص sata/scsi واحد على ال
 msgid "Notice: Please disable Intel(VT-d)/AMD(AMD-Vi) in BIOS/UEFI settings if you encounter a boot failure."
 msgstr "ملاحظة: يرجى تعطيل Intel(VT-d)/AMD(AMD-Vi) في إعدادات BIOS/UEFI إذا كنت تعتقد أن تواجه مشكلة في التشغيل."
 
-#: boot.sh:245 menu.sh:857 menu.sh:886 menu.sh:923 menu.sh:935 menu.sh:961 menu.sh:969 menu.sh:986 menu.sh:998
+#: boot.sh:247 menu.sh:857 menu.sh:886 menu.sh:923 menu.sh:935 menu.sh:961 menu.sh:969 menu.sh:986 menu.sh:998
 msgid "Cmdline"
 msgstr "سطر الأوامر"
 
-#: boot.sh:254
+#: boot.sh:258
 msgid "%2ds (Changing access(ssh/web) status will interrupt boot)"
 msgstr "%2ds (تغيير الوصول (ssh/web) سيؤدي إلى إيقاف تشغيل)"
 
-#: boot.sh:258
-msgid "access(ssh/web) status has changed and booting is interrupted."
+#: boot.sh:263
+msgid "Access(ssh/web) status has changed and booting is interrupted."
 msgstr "تم تغيير الوصول (ssh/web) وبالتالي تم إيقاف تشغيل."
 
-#: boot.sh:289
+#: boot.sh:269
+msgid "Menu opened and booting is interrupted."
+msgstr "تم فتح القائمة وتم إيقاف التشغيل."
+
+#: boot.sh:298
 msgid "Reboot to boot directly in DSM"
 msgstr "إعادة التشغيل للدخول مباشرة في DSM"
 
-#: boot.sh:306 init.sh:172
+#: boot.sh:315 init.sh:172
 msgid "Detected %s network cards.\\n"
 msgstr "تم اكتشاف %s بطاقات الشبكة.\\n"
 
-#: boot.sh:307 init.sh:173
+#: boot.sh:316 init.sh:173
 msgid "Checking Connect."
 msgstr "التحقق من الاتصال."
 
-#: boot.sh:319 init.sh:183
+#: boot.sh:328 init.sh:183
 msgid "connected."
 msgstr "متصل."
 
-#: boot.sh:329 init.sh:193
+#: boot.sh:338 init.sh:193
 msgid "Waiting IP.\\n"
 msgstr "انتظار عنوان IP.\\n"
 
-#: boot.sh:336
+#: boot.sh:345
 msgid "IGNORE (Does not support non-wired network card.)"
 msgstr "تجاهل (لا يدعم بطاقة الشبكة غير الموصى بها.)"
 
-#: boot.sh:340 init.sh:200
+#: boot.sh:349 init.sh:200
 msgid "DOWN"
 msgstr "مفلق"
 
-#: boot.sh:344 init.sh:204
+#: boot.sh:353 init.sh:204
 msgid "NOT CONNECTED"
 msgstr "غير متصل"
 
-#: boot.sh:348 init.sh:208
+#: boot.sh:357 init.sh:208
 msgid "TIMEOUT (Please check the IP on the router.)"
 msgstr "انتظار (يرجى التحقق من عنوان IP على الطرouter.)"
 
-#: boot.sh:355 init.sh:215
+#: boot.sh:364 init.sh:215
 msgid "LINK LOCAL (No DHCP server detected.)"
 msgstr "الارتباط المحلي (لم يتم اكتشاف خادم DHCP.)"
 
-#: boot.sh:357
+#: boot.sh:366
 msgid "Access \\033[1;34mhttp://%s:5000\\033[0m to connect the DSM via web."
 msgstr "\\033[1;34mhttp://%s:5000\\033[0m للوصول إلى DSM عبر الويب."
 
-#: boot.sh:368
+#: boot.sh:377
 msgid "Loading DSM kernel ..."
 msgstr "تحميل ядро DSM ..."
 
-#: boot.sh:385
+#: boot.sh:394
 msgid "Warning, running kexec with --noefi param, strange things will happen!!"
 msgstr "تحذير: يتم تشغيل kexec مع --noefi، سيحدث شيئا غريبا!!"
 
-#: boot.sh:390
+#: boot.sh:399
 msgid "Booting ..."
 msgstr "تشغيل ..."
 
-#: boot.sh:394
+#: boot.sh:403
 msgid "Interface not operational. Wait a few minutes.\\nFind DSM via http://find.synology.com/ or Synology Assistant."
 msgstr " التثبيت غير مفعل. انتظر دقائق.\\nابحث عن DSM من خلال http://find.synology.com/ أو Synology Assistant."
 

files/initrd/opt/rr/lang/de_DE/LC_MESSAGES/rr.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: RR\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-12-28 23:23+0800\n"
+"POT-Creation-Date: 2025-01-01 20:05+0800\n"
 "PO-Revision-Date: 2024-05-05 21:39+0800\n"
 "Last-Translator: Tim Krämer\n"
 "Language-Team: German <https://hosted.weblate.org/projects/rrorg/rr/de/>\n"
@@ -94,75 +94,79 @@ msgstr "Beachten: Bitte legen Sie mindestens eine SATA/SCSI-Disk für die System
 msgid "Notice: Please disable Intel(VT-d)/AMD(AMD-Vi) in BIOS/UEFI settings if you encounter a boot failure."
 msgstr "Beachten: Bitte deaktivieren Sie Intel(VT-d)/AMD(AMD-Vi) in den BIOS/UEFI-Einstellungen, falls Sie einen Boot-Fehler erhalten."
 
-#: boot.sh:245 menu.sh:857 menu.sh:886 menu.sh:923 menu.sh:935 menu.sh:961 menu.sh:969 menu.sh:986 menu.sh:998
+#: boot.sh:247 menu.sh:857 menu.sh:886 menu.sh:923 menu.sh:935 menu.sh:961 menu.sh:969 menu.sh:986 menu.sh:998
 msgid "Cmdline"
 msgstr "Cmdline"
 
-#: boot.sh:254
+#: boot.sh:258
 msgid "%2ds (Changing access(ssh/web) status will interrupt boot)"
 msgstr "%2ds (Änderung des Zugriffsstatus (ssh/web) unterbricht den Bootvorgang)"
 
-#: boot.sh:258
-msgid "access(ssh/web) status has changed and booting is interrupted."
+#: boot.sh:263
+msgid "Access(ssh/web) status has changed and booting is interrupted."
 msgstr "Der Zugriffsstatus (ssh/web) hat sich geändert und der Bootvorgang wird unterbrochen."
 
-#: boot.sh:289
+#: boot.sh:269
+msgid "Menu opened and booting is interrupted."
+msgstr "Menü geöffnet und Boot wird unterbrochen."
+
+#: boot.sh:298
 msgid "Reboot to boot directly in DSM"
 msgstr "Neustart, um direkt in DSM zu booten"
 
-#: boot.sh:306 init.sh:172
+#: boot.sh:315 init.sh:172
 msgid "Detected %s network cards.\\n"
 msgstr "Erkannte %s Netzwerkkarten.\\n"
 
-#: boot.sh:307 init.sh:173
+#: boot.sh:316 init.sh:173
 msgid "Checking Connect."
 msgstr "Überprüfe Verbindung."
 
-#: boot.sh:319 init.sh:183
+#: boot.sh:328 init.sh:183
 msgid "connected."
 msgstr "Verbunden."
 
-#: boot.sh:329 init.sh:193
+#: boot.sh:338 init.sh:193
 msgid "Waiting IP.\\n"
 msgstr "Warten auf IP.\\n"
 
-#: boot.sh:336
+#: boot.sh:345
 msgid "IGNORE (Does not support non-wired network card.)"
 msgstr "IGNORIEREN (Unterstützt keine Netzwerkkarten ohne Kabelverbindung.)"
 
-#: boot.sh:340 init.sh:200
+#: boot.sh:349 init.sh:200
 msgid "DOWN"
 msgstr "DOWN"
 
-#: boot.sh:344 init.sh:204
+#: boot.sh:353 init.sh:204
 msgid "NOT CONNECTED"
 msgstr "NICHT VERBUNDEN"
 
-#: boot.sh:348 init.sh:208
+#: boot.sh:357 init.sh:208
 msgid "TIMEOUT (Please check the IP on the router.)"
 msgstr "ZEITÜBERSCHREITUNG (Bitte überprüfen Sie die IP am Router.)"
 
-#: boot.sh:355 init.sh:215
+#: boot.sh:364 init.sh:215
 msgid "LINK LOCAL (No DHCP server detected.)"
 msgstr "LINK LOCAL (Kein DHCP-Server erkannt.)"
 
-#: boot.sh:357
+#: boot.sh:366
 msgid "Access \\033[1;34mhttp://%s:5000\\033[0m to connect the DSM via web."
 msgstr "Greifen Sie auf \\033[1;34mhttp://%s:5000\\033[0m zu, um das DSM als Website anzuzeigen."
 
-#: boot.sh:368
+#: boot.sh:377
 msgid "Loading DSM kernel ..."
 msgstr "DSM-Kernel wird geladen ..."
 
-#: boot.sh:385
+#: boot.sh:394
 msgid "Warning, running kexec with --noefi param, strange things will happen!!"
 msgstr "Warnung, Ausführung von kexec mit --noefi Parameter, führt zu seltsamen Artefakten!!"
 
-#: boot.sh:390
+#: boot.sh:399
 msgid "Booting ..."
 msgstr "Bootvorgang ..."
 
-#: boot.sh:394
+#: boot.sh:403
 msgid "Interface not operational. Wait a few minutes.\\nFind DSM via http://find.synology.com/ or Synology Assistant."
 msgstr "Schnittstelle nicht operativ. Bitte warte ein paar Minuten.\\nFinde DSM über http://find.synology.com/ oder Synology Assistant."
 

files/initrd/opt/rr/lang/en_US/LC_MESSAGES/rr.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: RR\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-12-28 23:23+0800\n"
+"POT-Creation-Date: 2025-01-01 20:05+0800\n"
 "PO-Revision-Date: 2024-01-19 14:25+0800\n"
 "Last-Translator: Ing <wjz304>\n"
 "Language-Team: English (United States) <i18n-zh@RROrg>\n"
@@ -93,75 +93,79 @@ msgstr ""
 msgid "Notice: Please disable Intel(VT-d)/AMD(AMD-Vi) in BIOS/UEFI settings if you encounter a boot failure."
 msgstr ""
 
-#: boot.sh:245 menu.sh:857 menu.sh:886 menu.sh:923 menu.sh:935 menu.sh:961 menu.sh:969 menu.sh:986 menu.sh:998
+#: boot.sh:247 menu.sh:857 menu.sh:886 menu.sh:923 menu.sh:935 menu.sh:961 menu.sh:969 menu.sh:986 menu.sh:998
 msgid "Cmdline"
 msgstr ""
 
-#: boot.sh:254
+#: boot.sh:258
 msgid "%2ds (Changing access(ssh/web) status will interrupt boot)"
 msgstr ""
 
-#: boot.sh:258
-msgid "access(ssh/web) status has changed and booting is interrupted."
+#: boot.sh:263
+msgid "Access(ssh/web) status has changed and booting is interrupted."
+msgstr ""
+
+#: boot.sh:269
+msgid "Menu opened and booting is interrupted."
 msgstr ""
 
-#: boot.sh:289
+#: boot.sh:298
 msgid "Reboot to boot directly in DSM"
 msgstr ""
 
-#: boot.sh:306 init.sh:172
+#: boot.sh:315 init.sh:172
 msgid "Detected %s network cards.\\n"
 msgstr ""
 
-#: boot.sh:307 init.sh:173
+#: boot.sh:316 init.sh:173
 msgid "Checking Connect."
 msgstr ""
 
-#: boot.sh:319 init.sh:183
+#: boot.sh:328 init.sh:183
 msgid "connected."
 msgstr ""
 
-#: boot.sh:329 init.sh:193
+#: boot.sh:338 init.sh:193
 msgid "Waiting IP.\\n"
 msgstr ""
 
-#: boot.sh:336
+#: boot.sh:345
 msgid "IGNORE (Does not support non-wired network card.)"
 msgstr ""
 
-#: boot.sh:340 init.sh:200
+#: boot.sh:349 init.sh:200
 msgid "DOWN"
 msgstr ""
 
-#: boot.sh:344 init.sh:204
+#: boot.sh:353 init.sh:204
 msgid "NOT CONNECTED"
 msgstr ""
 
-#: boot.sh:348 init.sh:208
+#: boot.sh:357 init.sh:208
 msgid "TIMEOUT (Please check the IP on the router.)"
 msgstr ""
 
-#: boot.sh:355 init.sh:215
+#: boot.sh:364 init.sh:215
 msgid "LINK LOCAL (No DHCP server detected.)"
 msgstr ""
 
-#: boot.sh:357
+#: boot.sh:366
 msgid "Access \\033[1;34mhttp://%s:5000\\033[0m to connect the DSM via web."
 msgstr ""
 
-#: boot.sh:368
+#: boot.sh:377
 msgid "Loading DSM kernel ..."
 msgstr ""
 
-#: boot.sh:385
+#: boot.sh:394
 msgid "Warning, running kexec with --noefi param, strange things will happen!!"
 msgstr ""
 
-#: boot.sh:390
+#: boot.sh:399
 msgid "Booting ..."
 msgstr ""
 
-#: boot.sh:394
+#: boot.sh:403
 msgid "Interface not operational. Wait a few minutes.\\nFind DSM via http://find.synology.com/ or Synology Assistant."
 msgstr ""