From e62749022c65d3802de5c23607e3e81035dd2c9f Mon Sep 17 00:00:00 2001 From: Ing Date: Wed, 31 Jul 2024 15:40:12 +0800 Subject: [PATCH] fix something --- files/initrd/opt/rr/boot.sh | 11 ++++++----- files/initrd/opt/rr/menu.sh | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/files/initrd/opt/rr/boot.sh b/files/initrd/opt/rr/boot.sh index 811bd4f4..a8004331 100755 --- a/files/initrd/opt/rr/boot.sh +++ b/files/initrd/opt/rr/boot.sh @@ -315,6 +315,12 @@ else fi kexec ${KEXECARGS} -l "${MOD_ZIMAGE_FILE}" --initrd "${MOD_RDGZ_FILE}" --command-line="${CMDLINE_LINE}" >"${LOG_FILE}" 2>&1 || dieLog + echo -e "\033[1;37m$(TEXT "Booting ...")\033[0m" + # show warning message + for T in $(busybox w 2>/dev/null | grep -v 'TTY' | awk '{print $2}'); do + [ -w "/dev/${T}" ] && echo -e "\n\033[1;43m$(TEXT "[This interface will not be operational. Please wait a few minutes.\nFind DSM via http://find.synology.com/ or Synology Assistant and connect.]")\033[0m\n" >"/dev/${T}" 2>/dev/null || true + done + # Clear logs for dbgutils addons rm -rf "${PART1_PATH}/logs" >/dev/null 2>&1 || true @@ -328,11 +334,6 @@ else [ -e ${I}/reset ] && cat ${I}/vendor >/dev/null | grep -iq 0x10de && echo 1 >${I}/reset || true # Proc open nvidia driver when booting done - echo -e "\033[1;37m$(TEXT "Booting ...")\033[0m" - for T in $(busybox w 2>/dev/null | grep -v 'TTY' | awk '{print $2}'); do - [ -w "/dev/${T}" ] && echo -e "\n\033[1;43m$(TEXT "[This interface will not be operational. Please wait a few minutes.\nFind DSM via http://find.synology.com/ or Synology Assistant and connect.]")\033[0m\n" >"/dev/${T}" 2>/dev/null || true - done - # Reboot KERNELWAY="$(readConfigKey "kernelway" "${USER_CONFIG_FILE}")" [ "${KERNELWAY}" = "kexec" ] && kexec -a -e || poweroff diff --git a/files/initrd/opt/rr/menu.sh b/files/initrd/opt/rr/menu.sh index bc6281a1..7647ad0a 100755 --- a/files/initrd/opt/rr/menu.sh +++ b/files/initrd/opt/rr/menu.sh @@ -149,7 +149,7 @@ function modelMenu() { done <<<$(cat "${TMP_PATH}/modellist") [ ${FLGNEX} -eq 1 ] && echo "f \"\Z1$(TEXT "Disable flags restriction")\Zn\"" >>"${TMP_PATH}/menu" DIALOG --title "$(TEXT "Model")" \ - --menu "$(TEXT "Choose the model")" 0 0 0 --file "${TMP_PATH}/menu" \ + --menu "$(TEXT "Choose the model")" 0 0 20 --file "${TMP_PATH}/menu" \ 2>${TMP_PATH}/resp [ $? -ne 0 ] && return 0 resp=$(cat ${TMP_PATH}/resp)