yuan/RROrg-rr
1
0
Fork 0
mirror of https://github.com/RROrg/rr.git synced 2025-06-21 05:51:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix something

Browse Source
This commit is contained in:
Ing 2024-07-30 21:30:05 +08:00
parent 2d1f973c12
commit f6e239ee8e
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
files/initrd/opt/rr/boot.sh
View File

@ -314,10 +314,6 @@ else
KEXECARGS="--noefi" KEXECARGS="--noefi"
fi fi
kexec ${KEXECARGS} -l "${MOD_ZIMAGE_FILE}" --initrd "${MOD_RDGZ_FILE}" --command-line="${CMDLINE_LINE}" >"${LOG_FILE}" 2>&1 || dieLog 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"
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 # Clear logs for dbgutils addons
rm -rf "${PART1_PATH}/logs" >/dev/null 2>&1 || true rm -rf "${PART1_PATH}/logs" >/dev/null 2>&1 || true
@ -332,6 +328,11 @@ else
[ -e ${I}/reset ] && cat ${I}/vendor >/dev/null | grep -iq 0x10de && echo 1 >${I}/reset || true # Proc open nvidia driver when booting [ -e ${I}/reset ] && cat ${I}/vendor >/dev/null | grep -iq 0x10de && echo 1 >${I}/reset || true # Proc open nvidia driver when booting
done 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 # Reboot
KERNELWAY="$(readConfigKey "kernelway" "${USER_CONFIG_FILE}")" KERNELWAY="$(readConfigKey "kernelway" "${USER_CONFIG_FILE}")"
[ "${KERNELWAY}" = "kexec" ] && kexec -a -e || poweroff [ "${KERNELWAY}" = "kexec" ] && kexec -a -e || poweroff

8
files/initrd/opt/rr/menu.sh
View File

@ -451,13 +451,13 @@ function ParsePat() {
--msgbox "${MSG}" 0 0 --msgbox "${MSG}" 0 0
return return
fi fi
DIALOG --title "$(TEXT "Product Version")" \ DIALOG --title "$(TEXT "Parse Pat")" \
--no-items --menu "$(TEXT "Choose a pat file")" 0 0 0 ${ITEMS} \ --no-items --menu "$(TEXT "Choose a pat file")" 0 0 0 ${ITEMS} \
2>${TMP_PATH}/resp 2>${TMP_PATH}/resp
[ $? -ne 0 ] && return [ $? -ne 0 ] && return
PAT_PATH=$(cat ${TMP_PATH}/resp) PAT_PATH=$(cat ${TMP_PATH}/resp)
if [ ! -f "${PAT_PATH}" ]; then if [ ! -f "${PAT_PATH}" ]; then
DIALOG --title "$(TEXT "Update")" \ DIALOG --title "$(TEXT "Parse Pat")" \
--msgbox "$(TEXT "pat Invalid, try again!")" 0 0 --msgbox "$(TEXT "pat Invalid, try again!")" 0 0
return return
fi fi
@ -498,10 +498,10 @@ function ParsePat() {
echo "$(TEXT "Ready!")" echo "$(TEXT "Ready!")"
sleep 3 sleep 3
break break
done 2>&1 | DIALOG --title "$(TEXT "Main menu")" \ done 2>&1 | DIALOG --title "$(TEXT "Parse Pat")" \
--progressbox "$(TEXT "Making ...")" 20 100 --progressbox "$(TEXT "Making ...")" 20 100
if [ -f "${LOG_FILE}" ]; then if [ -f "${LOG_FILE}" ]; then
DIALOG --title "$(TEXT "Error")" \ DIALOG --title "$(TEXT "Parse Pat")" \
--msgbox "$(cat ${LOG_FILE})" 0 0 --msgbox "$(cat ${LOG_FILE})" 0 0
rm -f "${LOG_FILE}" rm -f "${LOG_FILE}"
return 1 return 1