Compare commits

..

No commits in common. "5e2cb9bb6fdc4c5580672e87eba06ef7c5cf1761" and "647b6024fd8efb7631232abced3bec4558593237" have entirely different histories.

2 changed files with 2 additions and 2 deletions

View File

@ -302,7 +302,7 @@ function _bootwait() {
rm -f WB WC rm -f WB WC
return 1 return 1
fi fi
if ! ps -p "${PPID}" -o cmd | grep -q "menu.sh" && [ -f "${TMP_PATH}/menu.lock" ]; then if false && [ -f "${TMP_PATH}/menu.lock" ]; then
printf "\r%$((${#MSG} * 2))s\n" " " printf "\r%$((${#MSG} * 2))s\n" " "
printf "\r\033[1;33m%s\033[0m\n" "$(TEXT "Menu opened and booting is interrupted.")" printf "\r\033[1;33m%s\033[0m\n" "$(TEXT "Menu opened and booting is interrupted.")"
rm -f WB WC rm -f WB WC

View File

@ -1550,7 +1550,7 @@ function customDTS() {
(cd "${TMP_UP_PATH}" && rz -be) || true (cd "${TMP_UP_PATH}" && rz -be) || true
USER_FILE="$(find "${TMP_UP_PATH}" -type f | head -1)" USER_FILE="$(find "${TMP_UP_PATH}" -type f | head -1)"
DTC_ERRLOG="/tmp/dtc.log" DTC_ERRLOG="/tmp/dtc.log"
[ -n "${USER_FILE}" ] && dtc -q -I dts -O dtb "${USER_FILE}" >"test.dtb" 2>"${DTC_ERRLOG}" [ -z "${USER_FILE}" ] && dtc -q -I dts -O dtb "${USER_FILE}" >"test.dtb" 2>"${DTC_ERRLOG}"
RET=$? RET=$?
if [ -z "${USER_FILE}" ] || [ ${RET} -ne 0 ]; then if [ -z "${USER_FILE}" ] || [ ${RET} -ne 0 ]; then
MSG="$(printf "%s\n%s:\n%s\n" "$(TEXT "Not a valid dts file, please try again!")" "$(TEXT "Error")" "$(cat "${DTC_ERRLOG}")")" MSG="$(printf "%s\n%s:\n%s\n" "$(TEXT "Not a valid dts file, please try again!")" "$(TEXT "Error")" "$(cat "${DTC_ERRLOG}")")"