mirror of
https://github.com/RROrg/rr.git
synced 2025-08-23 21:17:14 +08:00
Compare commits
2 Commits
99de5d84b2
...
74e0af058e
Author | SHA1 | Date | |
---|---|---|---|
|
74e0af058e | ||
|
f2e334b682 |
@ -250,6 +250,7 @@ if [ "${DIRECT}" = "true" ]; then
|
|||||||
grub-editenv ${USER_GRUBENVFILE} set next_entry="direct"
|
grub-editenv ${USER_GRUBENVFILE} set next_entry="direct"
|
||||||
|
|
||||||
_bootwait || exit 0
|
_bootwait || exit 0
|
||||||
|
|
||||||
echo -e "\033[1;33m$(TEXT "Reboot to boot directly in DSM")\033[0m"
|
echo -e "\033[1;33m$(TEXT "Reboot to boot directly in DSM")\033[0m"
|
||||||
reboot
|
reboot
|
||||||
exit 0
|
exit 0
|
||||||
@ -343,7 +344,7 @@ else
|
|||||||
echo -e "\033[1;33m$(TEXT "Warning, running kexec with --noefi param, strange things will happen!!")\033[0m"
|
echo -e "\033[1;33m$(TEXT "Warning, running kexec with --noefi param, strange things will happen!!")\033[0m"
|
||||||
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} kexecboot" >"${LOG_FILE}" 2>&1 || dieLog
|
||||||
|
|
||||||
echo -e "\033[1;37m$(TEXT "Booting ...")\033[0m"
|
echo -e "\033[1;37m$(TEXT "Booting ...")\033[0m"
|
||||||
# show warning message
|
# show warning message
|
||||||
|
@ -2128,9 +2128,9 @@ function tryRecoveryDSM() {
|
|||||||
if [ -n "${R_PLATFORM}" ] && arrayExistItem "${R_PLATFORM}" ${PS} &&
|
if [ -n "${R_PLATFORM}" ] && arrayExistItem "${R_PLATFORM}" ${PS} &&
|
||||||
[ -n "${R_PRODUCTVER}" ] && arrayExistItem "${R_PRODUCTVER}" ${VS} &&
|
[ -n "${R_PRODUCTVER}" ] && arrayExistItem "${R_PRODUCTVER}" ${VS} &&
|
||||||
[ -n "${R_BUILDNUM}" ] && [ -n "${R_SMALLNUM}" ]; then
|
[ -n "${R_BUILDNUM}" ] && [ -n "${R_SMALLNUM}" ]; then
|
||||||
cp -Rf "${TMP_PATH}/mdX/usr/rr/backup/p1/"* "${PART1_PATH}"
|
cp -rf "${TMP_PATH}/mdX/usr/rr/backup/p1/"* "${PART1_PATH}"
|
||||||
if [ -d "${TMP_PATH}/mdX/usr/rr/backup/p3" ]; then
|
if [ -d "${TMP_PATH}/mdX/usr/rr/backup/p3" ]; then
|
||||||
cp -Rf "${TMP_PATH}/mdX/usr/rr/backup/p3/"* "${PART3_PATH}"
|
cp -rf "${TMP_PATH}/mdX/usr/rr/backup/p3/"* "${PART3_PATH}"
|
||||||
fi
|
fi
|
||||||
copyDSMFiles "${TMP_PATH}/mdX/.syno/patch"
|
copyDSMFiles "${TMP_PATH}/mdX/.syno/patch"
|
||||||
__umountDSMRootDisk
|
__umountDSMRootDisk
|
||||||
@ -2439,7 +2439,7 @@ function savemodrr() {
|
|||||||
xz -dc <"${RR_RAMDISK_FILE}" | cpio -idm
|
xz -dc <"${RR_RAMDISK_FILE}" | cpio -idm
|
||||||
) >/dev/null 2>&1 || true
|
) >/dev/null 2>&1 || true
|
||||||
rm -rf "${RDXZ_PATH}/opt/rr"
|
rm -rf "${RDXZ_PATH}/opt/rr"
|
||||||
cp -Rf "$(dirname ${WORK_PATH})" "${RDXZ_PATH}/"
|
cp -rf "$(dirname ${WORK_PATH})" "${RDXZ_PATH}/"
|
||||||
(
|
(
|
||||||
cd "${RDXZ_PATH}"
|
cd "${RDXZ_PATH}"
|
||||||
RDSIZE=$(du -sb ${RDXZ_PATH} 2>/dev/null | awk '{print $1}')
|
RDSIZE=$(du -sb ${RDXZ_PATH} 2>/dev/null | awk '{print $1}')
|
||||||
@ -3297,7 +3297,7 @@ function updateRR() {
|
|||||||
if [ "${KEY: -1}" = "/" ]; then
|
if [ "${KEY: -1}" = "/" ]; then
|
||||||
rm -Rf "${VALUE}"/*
|
rm -Rf "${VALUE}"/*
|
||||||
mkdir -p "${VALUE}"
|
mkdir -p "${VALUE}"
|
||||||
cp -Rf "${TMP_PATH}/update/${VALUE}"/* "${VALUE}"
|
cp -rf "${TMP_PATH}/update/${VALUE}"/* "${VALUE}"
|
||||||
if [ "$(realpath "${VALUE}")" = "$(realpath "${MODULES_PATH}")" ]; then
|
if [ "$(realpath "${VALUE}")" = "$(realpath "${MODULES_PATH}")" ]; then
|
||||||
if [ -n "${MODEL}" -a -n "${PRODUCTVER}" ]; then
|
if [ -n "${MODEL}" -a -n "${PRODUCTVER}" ]; then
|
||||||
KVER="$(readConfigKey "platforms.${PLATFORM}.productvers.\"${PRODUCTVER}\".kver" "${WORK_PATH}/platforms.yml")"
|
KVER="$(readConfigKey "platforms.${PLATFORM}.productvers.\"${PRODUCTVER}\".kver" "${WORK_PATH}/platforms.yml")"
|
||||||
@ -3379,7 +3379,7 @@ function updateAddons() {
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
rm -Rf "${ADDONS_PATH}/"*
|
rm -Rf "${ADDONS_PATH}/"*
|
||||||
cp -Rf "${TMP_PATH}/update/"* "${ADDONS_PATH}/"
|
cp -rf "${TMP_PATH}/update/"* "${ADDONS_PATH}/"
|
||||||
rm -rf "${TMP_PATH}/update"
|
rm -rf "${TMP_PATH}/update"
|
||||||
touch ${PART1_PATH}/.build
|
touch ${PART1_PATH}/.build
|
||||||
sync
|
sync
|
||||||
|
@ -248,7 +248,7 @@ function repackInitrd() {
|
|||||||
cd "${RDXZ_PATH}"
|
cd "${RDXZ_PATH}"
|
||||||
sudo xz -dc <"${INITRD_FILE}" | sudo cpio -idm
|
sudo xz -dc <"${INITRD_FILE}" | sudo cpio -idm
|
||||||
) || true
|
) || true
|
||||||
sudo cp -Rf "${PLUGIN_PATH}/"* "${RDXZ_PATH}/"
|
sudo cp -rf "${PLUGIN_PATH}/"* "${RDXZ_PATH}/"
|
||||||
[ -f "${OUTPUT_PATH}" ] && rm -rf "${OUTPUT_PATH}"
|
[ -f "${OUTPUT_PATH}" ] && rm -rf "${OUTPUT_PATH}"
|
||||||
(
|
(
|
||||||
cd "${RDXZ_PATH}"
|
cd "${RDXZ_PATH}"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user