add kernelpanic

files/board/arpl/overlayfs/opt/arpl/boot.sh

@@ -39,7 +39,7 @@ if [ "$(sha256sum "${ORI_ZIMAGE_FILE}" | awk '{print$1}')" != "${ZIMAGE_HASH}" ]
   /opt/arpl/zimage-patch.sh
   if [ $? -ne 0 ]; then
     dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Error")" \
-      --msgbox "$(TEXT "zImage not patched:\n")$(<"${LOG_FILE}")" 12 70
+      --msgbox "$(TEXT "zImage not patched,\nPlease upgrade the bootloader version and try again.\nPatch error:\n")$(<"${LOG_FILE}")" 12 70
     exit 1
   fi
 fi
@@ -52,7 +52,7 @@ if [ "${RAMDISK_HASH_CUR}" != "${RAMDISK_HASH}" ]; then
   /opt/arpl/ramdisk-patch.sh
   if [ $? -ne 0 ]; then
     dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Error")" \
-      --msgbox "$(TEXT "Ramdisk not patched:\n")$(<"${LOG_FILE}")" 12 70
+      --msgbox "$(TEXT "Ramdisk not patched,\nPlease upgrade the bootloader version and try again.\nPatch error:\n")$(<"${LOG_FILE}")" 12 70
     exit 1
   fi
   # Update SHA256 hash
@@ -78,7 +78,7 @@ echo -e "$(TEXT "CPU:  ") \033[1;36m${CPU}\033[0m"
 echo -e "$(TEXT "MEM:  ") \033[1;36m${MEM}\033[0m"
 
 if [ ! -f "${MODEL_CONFIG_PATH}/${MODEL}.yml" ] || [ -z "$(readConfigKey "productvers.[${PRODUCTVER}]" "${MODEL_CONFIG_PATH}/${MODEL}.yml")" ]; then
-  echo -e "\033[1;33m*** $(printf "$(TEXT "The current version of arpl does not support booting %s-%s, please rebuild.")" "${MODEL}" "${PRODUCTVER}") ***\033[0m"
+  echo -e "\033[1;33m*** $(printf "$(TEXT "The current version of bootloader does not support booting %s-%s, please upgrade and rebuild.")" "${MODEL}" "${PRODUCTVER}") ***\033[0m"
   exit 1
 fi
 
@@ -109,6 +109,7 @@ done < <(readConfigMap "cmdline" "${USER_CONFIG_FILE}")
 
 #
 KVER=$(readModelKey "${MODEL}" "productvers.[${PRODUCTVER}].kver")
+KERNELPANIC="$(readConfigKey "kernelpanic" "${USER_CONFIG_FILE}")"
 
 if [ ! "${BUS}" = "usb" ]; then
   LOADER_DEVICE_NAME=$(echo ${LOADER_DISK} | sed 's|/dev/||')
@@ -122,7 +123,7 @@ CMDLINE_LINE=""
 grep -q "force_junior" /proc/cmdline && CMDLINE_LINE+="force_junior "
 [ ${EFI} -eq 1 ] && CMDLINE_LINE+="withefi " || CMDLINE_LINE+="noefi "
 [ ! "${BUS}" = "usb" ] && CMDLINE_LINE+="synoboot_satadom=${DOM} dom_szmax=${SIZE} "
-CMDLINE_LINE+="console=ttyS0,115200n8 earlyprintk earlycon=uart8250,io,0x3f8,115200n8 root=/dev/md0 skip_vender_mac_interfaces=0,1,2,3,4,5,6,7 loglevel=15 log_buf_len=32M"
+CMDLINE_LINE+="panic=${KERNELPANIC:-0} console=ttyS0,115200n8 earlyprintk earlycon=uart8250,io,0x3f8,115200n8 root=/dev/md0 skip_vender_mac_interfaces=0,1,2,3,4,5,6,7 loglevel=15 log_buf_len=32M"
 for KEY in ${!CMDLINE[@]}; do
   VALUE="${CMDLINE[${KEY}]}"
   CMDLINE_LINE+=" ${KEY}"
@@ -194,11 +195,11 @@ else
   w | awk '{print $1" "$2" "$4" "$5" "$6}' >WB
   MSG=""
   while test ${BOOTWAIT} -ge 0; do
-    MSG="$(printf "\033[1;33m$(TEXT "%2ds (accessing arpl will interrupt boot)")\033[0m" "${BOOTWAIT}")"
+    MSG="$(printf "\033[1;33m$(TEXT "%2ds (Changing access(ssh/web) status will interrupt boot)")\033[0m" "${BOOTWAIT}")"
     echo -en "\r${MSG}"
     w | awk '{print $1" "$2" "$4" "$5" "$6}' >WC
     if ! diff WB WC >/dev/null 2>&1; then
-      echo -en "\r\033[1;33m$(TEXT "A new access is connected, the boot process is interrupted.")\033[0m\n"
+      echo -en "\r\033[1;33m$(TEXT "access(ssh/web) status has changed and booting is interrupted.")\033[0m\n"
       rm -f WB WC
       exit 0
     fi

files/board/arpl/overlayfs/opt/arpl/init.sh

@@ -81,6 +81,7 @@ if [ ! -f "${USER_CONFIG_FILE}" ]; then
   writeConfigKey "bootwait" "10" "${USER_CONFIG_FILE}"
   writeConfigKey "bootipwait" "10" "${USER_CONFIG_FILE}"
   writeConfigKey "kernelway" "power" "${USER_CONFIG_FILE}"
+  writeConfigKey "kernelpanic" "5" "${USER_CONFIG_FILE}"
   writeConfigKey "odp" "false" "${USER_CONFIG_FILE}"
   writeConfigKey "model" "" "${USER_CONFIG_FILE}"
   writeConfigKey "productver" "" "${USER_CONFIG_FILE}"

files/board/arpl/overlayfs/opt/arpl/lang/zh_TW.po

@@ -17,8 +17,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 3.3.2\n"
 
-msgid "%2ds (accessing arpl will interrupt boot)"
+msgid "%2ds (Changing access(ssh/web) status will interrupt boot)"
-msgstr "%2ds (存取 arpl 將中斷開機)"
+msgstr "%2ds ((ssh/web)链接状态改變將中斷啟動)"
 
 msgid "%s cached."
 msgstr "%s 已快取。"
@@ -29,8 +29,8 @@ msgstr "%s 更新成功！"
 msgid "'Not set MACs' is enabled."
 msgstr "'不設定 MACs' 已啟用。"
 
-msgid "A new access is connected, the boot process is interrupted."
+msgid "access(ssh/web) status has changed and booting is interrupted."
-msgstr "新的存取已連接，開機過程已中斷。"
+msgstr "(ssh/web)链接狀態已改變，開機過程已中斷。"
 
 msgid "A valid dts file, Automatically import at compile time."
 msgstr "dts 檔案有效，將在編譯時自動匯入。"
@@ -116,8 +116,8 @@ msgstr "掛載 %s 失敗"
 msgid "Changing MAC"
 msgstr "修改 MAC"
 
-msgid "Check internet or cache disk space"
+msgid "Check internet or cache disk space.\\nError: %d"
-msgstr "請檢查網際網路或磁碟空間"
+msgstr "請檢查網際網路或磁碟空間.\\nError: %d"
 
 msgid "Checking Connect."
 msgstr "檢查連線。"
@@ -161,8 +161,8 @@ msgstr "選擇使用者"
 msgid "Choose a version"
 msgstr "選擇版本"
 
-msgid "Choose a waiting time(seconds)"
+msgid "Choose a time(seconds)"
-msgstr "選擇一個等待時間(秒)"
+msgstr "選擇一個時間(秒)"
 
 msgid "Choose modules to include"
 msgstr "選擇要載入的模組"
@@ -485,8 +485,8 @@ msgstr "優先使用官方驅動程式:"
 msgid "Product Version"
 msgstr "產品版本"
 
-msgid "Ramdisk not patched:\\n"
+msgid "Ramdisk not patched,\\nPlease upgrade the bootloader version and try again.\\nPatch error:\\n"
-msgstr "Ramdisk 修補失敗:\\n"
+msgstr "Ramdisk 修補失敗,\\n請升級引導版本並重試.\\n修補錯誤:\\n"
 
 msgid "Reading models"
 msgstr "讀取型號"
@@ -500,6 +500,9 @@ msgstr "已就绪!"
 msgid "Reboot"
 msgstr "重新開機"
 
+msgid "Reboot on kernel panic:"
+msgstr "內核恐慌時重新開機:"
+
 msgid "Reboot to arpl"
 msgstr "重開機到 ARPL"
 
@@ -632,8 +635,8 @@ msgstr "該增益集已存在，是否覆寫？"
 msgid "The current version does not support upgrading to the latest update.zip. Please remake the bootloader disk!"
 msgstr "目前版本不支援最新的 update.zip 升級，請重新製作開機碟！"
 
-msgid "The current version of arpl does not support booting %s-%s, please rebuild."
+msgid "The current version of bootloader does not support booting %s-%s, please upgrade and rebuild."
-msgstr "目前版本的 arpl 不支援開機 %s-%s，請重新編譯。"
+msgstr "當前版本的開機磁碟不支持開機 %s-%s, 請升級並重新編譯."
 
 msgid "The imported .ko of this function will be implanted into the corresponding arch's modules package, which will affect all models of the arch.\\n"
 msgstr "該功能匯入 .ko 將植入相對架構的模組套件。這將影響該架構的所有型號。\\n"
@@ -833,6 +836,6 @@ msgstr "pat: (可編輯)"
 msgid "show/modify the current pat data"
 msgstr "顯示/修改目前 pat 下載連結"
 
-msgid "zImage not patched:\\n"
+msgid "zImage not patched,\\nPlease upgrade the bootloader version and try again.\\nPatch error:\\n"
-msgstr "zImage 修補失敗:\\n"
+msgstr "zImage 修補失敗,\\n請升級引導版本並重試.\\n修補錯誤:\\n"
 

files/board/arpl/overlayfs/opt/arpl/menu.sh

@@ -33,6 +33,7 @@ PRERELEASE="$(readConfigKey "prerelease" "${USER_CONFIG_FILE}")"
 BOOTWAIT="$(readConfigKey "bootwait" "${USER_CONFIG_FILE}")"
 BOOTIPWAIT="$(readConfigKey "bootipwait" "${USER_CONFIG_FILE}")"
 KERNELWAY="$(readConfigKey "kernelway" "${USER_CONFIG_FILE}")"
+KERNELPANIC="$(readConfigKey "kernelpanic" "${USER_CONFIG_FILE}")"
 ODP="$(readConfigKey "odp" "${USER_CONFIG_FILE}")" # official drivers priorities
 SN="$(readConfigKey "sn" "${USER_CONFIG_FILE}")"
 MAC1="$(readConfigKey "mac1" "${USER_CONFIG_FILE}")"
@@ -770,8 +771,9 @@ function extractDsmFiles() {
     STATUS=$(curl -k -w "%{http_code}" -L "${PATURL}" -o "${PAT_PATH}" --progress-bar)
     if [ $? -ne 0 -o ${STATUS} -ne 200 ]; then
       rm -f "${PAT_PATH}"
+      MSG="$(printf "$(TEXT "Check internet or cache disk space.\nError: %d")" "${STATUS}")"
       dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Error")" \
-        --msgbox "$(TEXT "Check internet or cache disk space")" 0 0
+        --msgbox "${MSG}" 0 0
       return 1
     fi
   fi
@@ -832,8 +834,9 @@ function extractDsmFiles() {
         STATUS=$(curl -k -w "%{http_code}" -L "${OLDPATURL}" -o "${OLDPAT_PATH}" --progress-bar)
         if [ $? -ne 0 -o ${STATUS} -ne 200 ]; then
           rm -f "${OLDPAT_PATH}"
+          MSG="$(printf "$(TEXT "Check internet or cache disk space.\nError: %d")" "${STATUS}")"
           dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Error")" \
-            --msgbox "$(TEXT "Check internet or cache disk space")" 0 0
+            --msgbox "${MSG}" 0 0
           return 1
         fi
       fi
@@ -941,14 +944,14 @@ function make() {
   /opt/arpl/zimage-patch.sh
   if [ $? -ne 0 ]; then
     dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Error")" \
-      --msgbox "$(TEXT "zImage not patched:\n")$(<"${LOG_FILE}")" 0 0
+      --msgbox "$(TEXT "zImage not patched,\nPlease upgrade the bootloader version and try again.\nPatch error:\n")$(<"${LOG_FILE}")" 0 0
     return 1
   fi
 
   /opt/arpl/ramdisk-patch.sh
   if [ $? -ne 0 ]; then
     dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Error")" \
-      --msgbox "$(TEXT "Ramdisk not patched:\n")$(<"${LOG_FILE}")" 0 0
+      --msgbox "$(TEXT "Ramdisk not patched,\nPlease upgrade the bootloader version and try again.\nPatch error:\n")$(<"${LOG_FILE}")" 0 0
     return 1
   fi
   PRODUCTVER="$(readConfigKey "productver" "${USER_CONFIG_FILE}")"
@@ -977,6 +980,7 @@ function advancedMenu() {
         echo "i \"$(TEXT "Timeout of get ip in boot:") \Z4${BOOTIPWAIT}\Zn\"" >>"${TMP_PATH}/menu"
         echo "w \"$(TEXT "Timeout of boot wait:") \Z4${BOOTWAIT}\Zn\"" >>"${TMP_PATH}/menu"
         echo "k \"$(TEXT "kernel switching method:") \Z4${KERNELWAY}\Zn\"" >>"${TMP_PATH}/menu"
+        echo "n \"$(TEXT "Reboot on kernel panic:") \Z4${KERNELPANIC}\Zn\"" >>"${TMP_PATH}/menu"
       fi
     fi
     echo "m \"$(TEXT "Set static IP")\"" >>"${TMP_PATH}/menu"
@@ -1021,7 +1025,7 @@ function advancedMenu() {
     i)
       ITEMS="$(echo -e "1 \n5 \n10 \n30 \n60 \n")"
       dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Advanced")" \
-        --default-item "${BOOTIPWAIT}" --no-items --menu "$(TEXT "Choose a waiting time(seconds)")" 0 0 0 ${ITEMS} \
+        --default-item "${BOOTIPWAIT}" --no-items --menu "$(TEXT "Choose a time(seconds)")" 0 0 0 ${ITEMS} \
         2>${TMP_PATH}/resp
       [ $? -ne 0 ] && return
       resp=$(cat ${TMP_PATH}/resp 2>/dev/null)
@@ -1033,7 +1037,7 @@ function advancedMenu() {
     w)
       ITEMS="$(echo -e "1 \n5 \n10 \n30 \n60 \n")"
       dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Advanced")" \
-        --default-item "${BOOTWAIT}" --no-items --menu "$(TEXT "Choose a waiting time(seconds)")" 0 0 0 ${ITEMS} \
+        --default-item "${BOOTWAIT}" --no-items --menu "$(TEXT "Choose a time(seconds)")" 0 0 0 ${ITEMS} \
         2>${TMP_PATH}/resp
       [ $? -ne 0 ] && return
       resp=$(cat ${TMP_PATH}/resp 2>/dev/null)
@@ -1047,6 +1051,21 @@ function advancedMenu() {
       writeConfigKey "kernelway" "${KERNELWAY}" "${USER_CONFIG_FILE}"
       NEXT="e"
       ;;
+    n)
+      rm -f "${TMP_PATH}/opts"
+      echo "5 \"Reboot after 5 seconds\"" >>"${TMP_PATH}/opts"
+      echo "0 \"No reboot\"" >>"${TMP_PATH}/opts"
+      echo "-1 \"Restart immediately\"" >>"${TMP_PATH}/opts"
+      dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Advanced")" \
+        --default-item "${KERNELPANIC}" --menu "$(TEXT "Choose a time(seconds)")" 0 0 0 --file "${TMP_PATH}/opts" \
+        2>${TMP_PATH}/resp
+      [ $? -ne 0 ] && return
+      resp=$(cat ${TMP_PATH}/resp 2>/dev/null)
+      [ -z "${resp}" ] && return
+      KERNELPANIC=${resp}
+      writeConfigKey "kernelpanic" "${KERNELPANIC}" "${USER_CONFIG_FILE}"
+      NEXT="e"
+      ;;
     m)
       MSG="$(TEXT "Temporary IP: (UI will not refresh)")"
       ITEMS=""