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

Added a menu to try recovery info from installed DSM

Browse Source
This commit is contained in:
Fabio Belavenuto 2022-12-07 13:36:11 -03:00
parent 12876eb4a3
commit e3ad4ee347
5 changed files with 148 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
files/board/arpl/overlayfs/opt/arpl/include/functions.sh
View File

@ -147,6 +147,14 @@ function arrayExistItem() {
return ${EXISTS} return ${EXISTS}
} }
###############################################################################
# Get values in .conf K=V file
# 1 - key
# 2 - file
function _get_conf_kv() {
grep "${1}" "${2}" | sed "s|^${1}=\"\(.*\)\"$|\1|g"
}
############################################################################### ###############################################################################
# Replace/remove/add values in .conf K=V file # Replace/remove/add values in .conf K=V file
# 1 - name # 1 - name
@ -168,3 +176,18 @@ function _set_conf_kv() {
# Add if doesn't exist # Add if doesn't exist
echo "$1=\"$2\"" >> $3 echo "$1=\"$2\"" >> $3
} }
###############################################################################
# Find and mount the DSM root filesystem
# (based on pocopico's TCRP code)
function findAndMountDSMRoot() {
[ $(mount | grep -i "${DSMROOT_PATH}" | wc -l) -gt 0 ] && return 0
dsmrootdisk="$(blkid /dev/sd* | grep -i raid | awk '{print $1 " " $4}' | grep UUID | grep sd[a-z]1 | head -1 | awk -F ":" '{print $1}')"
[ -z "${dsmrootdisk}" ] && return -1
[ $(mount | grep -i "${DSMROOT_PATH}" | wc -l) -eq 0 ] && mount -t ext4 $dsmrootdisk "${DSMROOT_PATH}"
if [ $(mount | grep -i "${DSMROOT_PATH}" | wc -l) -eq 0 ]; then
echo "Failed to mount"
return -1
fi
return 0
}

1
files/board/arpl/overlayfs/opt/arpl/init.sh
View File

@ -37,6 +37,7 @@ fsck.ext2 -p ${LOADER_DISK}3 >/dev/null 2>&1 || true
mkdir -p ${BOOTLOADER_PATH} mkdir -p ${BOOTLOADER_PATH}
mkdir -p ${SLPART_PATH} mkdir -p ${SLPART_PATH}
mkdir -p ${CACHE_PATH} mkdir -p ${CACHE_PATH}
mkdir -p ${DSMROOT_PATH}
# Mount the partitions # Mount the partitions
mount ${LOADER_DISK}1 ${BOOTLOADER_PATH} || die "Can't mount ${BOOTLOADER_PATH}" mount ${LOADER_DISK}1 ${BOOTLOADER_PATH} || die "Can't mount ${BOOTLOADER_PATH}"
mount ${LOADER_DISK}2 ${SLPART_PATH} || die "Can't mount ${SLPART_PATH}" mount ${LOADER_DISK}2 ${SLPART_PATH} || die "Can't mount ${SLPART_PATH}"

180
files/board/arpl/overlayfs/opt/arpl/menu.sh
View File

@ -61,74 +61,83 @@ function backtitle() {
############################################################################### ###############################################################################
# Shows available models to user choose one # Shows available models to user choose one
function modelMenu() { function modelMenu() {
RESTRICT=1 if [ -z "${1}" ]; then
FLGBETA=0 RESTRICT=1
dialog --backtitle "`backtitle`" --title "Model" --aspect 18 \ FLGBETA=0
--infobox "Reading models" 0 0 dialog --backtitle "`backtitle`" --title "Model" --aspect 18 \
while true; do --infobox "Reading models" 0 0
echo "" > "${TMP_PATH}/menu" while true; do
FLGNEX=0 echo "" > "${TMP_PATH}/menu"
while read M; do FLGNEX=0
M="`basename ${M}`" while read M; do
M="${M::-4}" M="`basename ${M}`"
PLATFORM=`readModelKey "${M}" "platform"` M="${M::-4}"
DT="`readModelKey "${M}" "dt"`" PLATFORM=`readModelKey "${M}" "platform"`
BETA="`readModelKey "${M}" "beta"`" DT="`readModelKey "${M}" "dt"`"
[ "${BETA}" = "true" -a ${FLGBETA} -eq 0 ] && continue BETA="`readModelKey "${M}" "beta"`"
# Check id model is compatible with CPU [ "${BETA}" = "true" -a ${FLGBETA} -eq 0 ] && continue
COMPATIBLE=1 # Check id model is compatible with CPU
if [ ${RESTRICT} -eq 1 ]; then COMPATIBLE=1
for F in `readModelArray "${M}" "flags"`; do if [ ${RESTRICT} -eq 1 ]; then
if ! grep -q "^flags.*${F}.*" /proc/cpuinfo; then for F in `readModelArray "${M}" "flags"`; do
COMPATIBLE=0 if ! grep -q "^flags.*${F}.*" /proc/cpuinfo; then
FLGNEX=1 COMPATIBLE=0
break FLGNEX=1
fi break
done fi
done
fi
[ "${DT}" = "true" ] && DT="-DT" || DT=""
[ ${COMPATIBLE} -eq 1 ] && echo "${M} \"\Zb${PLATFORM}${DT}\Zn\" " >> "${TMP_PATH}/menu"
done < <(find "${MODEL_CONFIG_PATH}" -maxdepth 1 -name \*.yml | sort)
[ ${FLGNEX} -eq 1 ] && echo "f \"\Z1Disable flags restriction\Zn\"" >> "${TMP_PATH}/menu"
[ ${FLGBETA} -eq 0 ] && echo "b \"\Z1Show beta models\Zn\"" >> "${TMP_PATH}/menu"
dialog --backtitle "`backtitle`" --colors --menu "Choose the model" 0 0 0 \
--file "${TMP_PATH}/menu" 2>${TMP_PATH}/resp
[ $? -ne 0 ] && return
resp=$(<${TMP_PATH}/resp)
[ -z "${resp}" ] && return
if [ "${resp}" = "f" ]; then
RESTRICT=0
continue
fi fi
[ "${DT}" = "true" ] && DT="-DT" || DT="" if [ "${resp}" = "b" ]; then
[ ${COMPATIBLE} -eq 1 ] && echo "${M} \"\Zb${PLATFORM}${DT}\Zn\" " >> "${TMP_PATH}/menu" FLGBETA=1
done < <(find "${MODEL_CONFIG_PATH}" -maxdepth 1 -name \*.yml | sort) continue
[ ${FLGNEX} -eq 1 ] && echo "f \"\Z1Disable flags restriction\Zn\"" >> "${TMP_PATH}/menu" fi
[ ${FLGBETA} -eq 0 ] && echo "b \"\Z1Show beta models\Zn\"" >> "${TMP_PATH}/menu" break
dialog --backtitle "`backtitle`" --colors --menu "Choose the model" 0 0 0 \ done
--file "${TMP_PATH}/menu" 2>${TMP_PATH}/resp else
[ $? -ne 0 ] && return resp="${1}"
resp=$(<${TMP_PATH}/resp) fi
[ -z "${resp}" ] && return # If user change model, clean buildnumber and S/N
if [ "${resp}" = "f" ]; then if [ "${MODEL}" != "${resp}" ]; then
RESTRICT=0 MODEL=${resp}
continue writeConfigKey "model" "${MODEL}" "${USER_CONFIG_FILE}"
fi BUILD=""
if [ "${resp}" = "b" ]; then writeConfigKey "build" "${BUILD}" "${USER_CONFIG_FILE}"
FLGBETA=1 SN=""
continue writeConfigKey "sn" "${SN}" "${USER_CONFIG_FILE}"
fi # Delete old files
# If user change model, clean buildnumber and S/N rm -f "${ORI_ZIMAGE_FILE}" "${ORI_RDGZ_FILE}" "${MOD_ZIMAGE_FILE}" "${MOD_RDGZ_FILE}"
if [ "${MODEL}" != "${resp}" ]; then DIRTY=1
MODEL=${resp} fi
writeConfigKey "model" "${MODEL}" "${USER_CONFIG_FILE}"
BUILD=""
writeConfigKey "build" "${BUILD}" "${USER_CONFIG_FILE}"
SN=""
writeConfigKey "sn" "${SN}" "${USER_CONFIG_FILE}"
# Delete old files
rm -f "${ORI_ZIMAGE_FILE}" "${ORI_RDGZ_FILE}" "${MOD_ZIMAGE_FILE}" "${MOD_RDGZ_FILE}"
DIRTY=1
fi
break
done
} }
############################################################################### ###############################################################################
# Shows available buildnumbers from a model to user choose one # Shows available buildnumbers from a model to user choose one
function buildMenu() { function buildMenu() {
ITEMS="`readConfigEntriesArray "builds" "${MODEL_CONFIG_PATH}/${MODEL}.yml" | sort -r`" ITEMS="`readConfigEntriesArray "builds" "${MODEL_CONFIG_PATH}/${MODEL}.yml" | sort -r`"
dialog --clear --no-items --backtitle "`backtitle`" \ if [ -z "${1}" ]; then
--menu "Choose a build number" 0 0 0 ${ITEMS} 2>${TMP_PATH}/resp dialog --clear --no-items --backtitle "`backtitle`" \
[ $? -ne 0 ] && return --menu "Choose a build number" 0 0 0 ${ITEMS} 2>${TMP_PATH}/resp
resp=$(<${TMP_PATH}/resp) [ $? -ne 0 ] && return
[ -z "${resp}" ] && return resp=$(<${TMP_PATH}/resp)
[ -z "${resp}" ] && return
else
if ! arrayExistItem "${1}" ${ITEMS}; then return; fi
resp="${1}"
fi
if [ "${BUILD}" != "${resp}" ]; then if [ "${BUILD}" != "${resp}" ]; then
dialog --backtitle "`backtitle`" --title "Build Number" \ dialog --backtitle "`backtitle`" --title "Build Number" \
--infobox "Reconfiguring Synoinfo, Addons and Modules" 0 0 --infobox "Reconfiguring Synoinfo, Addons and Modules" 0 0
@ -753,6 +762,7 @@ function advancedMenu() {
echo "r \"Switch direct boot: \Z4${DIRECTBOOT}\Zn\"" >> "${TMP_PATH}/menu" echo "r \"Switch direct boot: \Z4${DIRECTBOOT}\Zn\"" >> "${TMP_PATH}/menu"
fi fi
echo "u \"Edit user config file manually\"" >> "${TMP_PATH}/menu" echo "u \"Edit user config file manually\"" >> "${TMP_PATH}/menu"
echo "t \"Try to recovery a DSM installed system\"" >> "${TMP_PATH}/menu"
echo "e \"Exit\"" >> "${TMP_PATH}/menu" echo "e \"Exit\"" >> "${TMP_PATH}/menu"
dialog --default-item ${NEXT} --backtitle "`backtitle`" --title "Advanced" \ dialog --default-item ${NEXT} --backtitle "`backtitle`" --title "Advanced" \
@ -771,11 +781,55 @@ function advancedMenu() {
NEXT="u" NEXT="u"
;; ;;
u) editUserConfig; NEXT="e" ;; u) editUserConfig; NEXT="e" ;;
t) tryRecoveryDSM ;;
e) break ;; e) break ;;
esac esac
done done
} }
###############################################################################
# Try to recovery a DSM already installed
function tryRecoveryDSM() {
dialog --backtitle "`backtitle`" --title "Try recovery DSM" --aspect 18 \
--infobox "Trying to recovery a DSM installed system" 0 0
if findAndMountDSMRoot; then
MODEL=""
BUILD=""
if [ -f "${DSMROOT_PATH}/.syno/patch/VERSION" ]; then
eval `cat ${DSMROOT_PATH}/.syno/patch/VERSION | grep unique`
eval `cat ${DSMROOT_PATH}/.syno/patch/VERSION | grep base`
if [ -n "${unique}" ] ; then
while read F; do
M="`basename ${F}`"
M="${M::-4}"
UNIQUE=`readModelKey "${M}" "unique"`
[ "${unique}" = "${UNIQUE}" ] || continue
# Found
modelMenu "${M}"
done < <(find "${MODEL_CONFIG_PATH}" -maxdepth 1 -name \*.yml | sort)
if [ -n "${MODEL}" ]; then
buildMenu ${base}
if [ -n "${BUILD}" ]; then
cp "${DSMROOT_PATH}/.syno/patch/zImage" "${SLPART_PATH}"
cp "${DSMROOT_PATH}/.syno/patch/rd.gz" "${SLPART_PATH}"
MSG="Found a installation:\nModel: ${MODEL}\nBuildnumber: ${BUILD}"
SN=`_get_conf_kv SN "${DSMROOT_PATH}/etc/synoinfo.conf"`
if [ -n "${SN}" ]; then
writeConfigKey "sn" "${SN}" "${USER_CONFIG_FILE}"
MSG+="\nSerial: ${SN}"
fi
dialog --backtitle "`backtitle`" --title "Try recovery DSM" \
--aspect 18 --msgbox "${MSG}" 0 0
fi
fi
fi
fi
else
dialog --backtitle "`backtitle`" --title "Try recovery DSM" --aspect 18 \
--msgbox "Unfortunately I couldn't mount the DSM partition!" 0 0
fi
}
############################################################################### ###############################################################################
# Permit user select the modules to include # Permit user select the modules to include
function selectModules() { function selectModules() {
@ -980,7 +1034,7 @@ function updateMenu() {
dialog --backtitle "`backtitle`" --title "Update arpl" --aspect 18 \ dialog --backtitle "`backtitle`" --title "Update arpl" --aspect 18 \
--yesno "Arpl updated with success to ${TAG}!\nReboot?" 0 0 --yesno "Arpl updated with success to ${TAG}!\nReboot?" 0 0
[ $? -ne 0 ] && continue [ $? -ne 0 ] && continue
reboot arpl-reboot.sh config
exit exit
;; ;;
@ -1121,7 +1175,7 @@ while true; do
echo "c \"Clean disk cache\"" >> "${TMP_PATH}/menu" echo "c \"Clean disk cache\"" >> "${TMP_PATH}/menu"
fi fi
echo "p \"Update menu\"" >> "${TMP_PATH}/menu" echo "p \"Update menu\"" >> "${TMP_PATH}/menu"
echo "e \"Exit\"" >> "${TMP_PATH}/menu" echo "e \"Exit\"" >> "${TMP_PATH}/menu"
dialog --default-item ${NEXT} --backtitle "`backtitle`" --colors \ dialog --default-item ${NEXT} --backtitle "`backtitle`" --colors \
--menu "Choose the option" 0 0 0 --file "${TMP_PATH}/menu" \ --menu "Choose the option" 0 0 0 --file "${TMP_PATH}/menu" \

7
files/board/arpl/overlayfs/opt/arpl/ramdisk-patch.sh
View File

@ -25,6 +25,7 @@ mkdir -p "${RAMDISK_PATH}"
MODEL="`readConfigKey "model" "${USER_CONFIG_FILE}"`" MODEL="`readConfigKey "model" "${USER_CONFIG_FILE}"`"
BUILD="`readConfigKey "build" "${USER_CONFIG_FILE}"`" BUILD="`readConfigKey "build" "${USER_CONFIG_FILE}"`"
LKM="`readConfigKey "lkm" "${USER_CONFIG_FILE}"`" LKM="`readConfigKey "lkm" "${USER_CONFIG_FILE}"`"
SN="`readConfigKey "sn" "${USER_CONFIG_FILE}"`"
if [ ${BUILD} -ne ${buildnumber} ]; then if [ ${BUILD} -ne ${buildnumber} ]; then
echo -e "\033[A\n\033[1;32mBuild number changed from \033[1;31m${BUILD}\033[1;32m to \033[1;31m${buildnumber}\033[0m" echo -e "\033[A\n\033[1;32mBuild number changed from \033[1;31m${BUILD}\033[1;32m to \033[1;31m${buildnumber}\033[0m"
@ -72,6 +73,8 @@ echo -n "."
for KEY in ${!SYNOINFO[@]}; do for KEY in ${!SYNOINFO[@]}; do
_set_conf_kv "${KEY}" "${SYNOINFO[${KEY}]}" "${RAMDISK_PATH}/etc/synoinfo.conf" >"${LOG_FILE}" 2>&1 || dieLog _set_conf_kv "${KEY}" "${SYNOINFO[${KEY}]}" "${RAMDISK_PATH}/etc/synoinfo.conf" >"${LOG_FILE}" 2>&1 || dieLog
done done
# Add serial number to synoinfo.conf, to help to recovery a installed DSM
_set_conf_kv "SN" "${SN}" "${RAMDISK_PATH}/etc/synoinfo.conf" >"${LOG_FILE}" 2>&1 || dieLog
# Patch /sbin/init.post # Patch /sbin/init.post
echo -n "." echo -n "."
@ -80,9 +83,11 @@ sed -e "/@@@CONFIG-MANIPULATORS-TOOLS@@@/ {" -e "r ${TMP_PATH}/rp.txt" -e 'd' -e
rm "${TMP_PATH}/rp.txt" rm "${TMP_PATH}/rp.txt"
touch "${TMP_PATH}/rp.txt" touch "${TMP_PATH}/rp.txt"
for KEY in ${!SYNOINFO[@]}; do for KEY in ${!SYNOINFO[@]}; do
echo "_set_conf_kv '${KEY}' '${SYNOINFO[${KEY}]}' '/tmpRoot/etc/synoinfo.conf'" >> "${TMP_PATH}/rp.txt" echo "_set_conf_kv '${KEY}' '${SYNOINFO[${KEY}]}' '/tmpRoot/etc/synoinfo.conf'" >> "${TMP_PATH}/rp.txt"
echo "_set_conf_kv '${KEY}' '${SYNOINFO[${KEY}]}' '/tmpRoot/etc.defaults/synoinfo.conf'" >> "${TMP_PATH}/rp.txt" echo "_set_conf_kv '${KEY}' '${SYNOINFO[${KEY}]}' '/tmpRoot/etc.defaults/synoinfo.conf'" >> "${TMP_PATH}/rp.txt"
done done
echo "_set_conf_kv 'SN' '${SN}' '/tmpRoot/etc/synoinfo.conf'" >> "${TMP_PATH}/rp.txt"
echo "_set_conf_kv 'SN' '${SN}' '/tmpRoot/etc.defaults/synoinfo.conf'" >> "${TMP_PATH}/rp.txt"
sed -e "/@@@CONFIG-GENERATED@@@/ {" -e "r ${TMP_PATH}/rp.txt" -e 'd' -e '}' -i "${RAMDISK_PATH}/sbin/init.post" sed -e "/@@@CONFIG-GENERATED@@@/ {" -e "r ${TMP_PATH}/rp.txt" -e 'd' -e '}' -i "${RAMDISK_PATH}/sbin/init.post"
rm "${TMP_PATH}/rp.txt" rm "${TMP_PATH}/rp.txt"

1
files/board/arpl/overlayfs/root/.bashrc
View File

@ -18,6 +18,7 @@ export EDITOR="/bin/nano"
export BOOTLOADER_PATH="/mnt/p1" export BOOTLOADER_PATH="/mnt/p1"
export SLPART_PATH="/mnt/p2" # Synologic partition export SLPART_PATH="/mnt/p2" # Synologic partition
export CACHE_PATH="/mnt/p3" export CACHE_PATH="/mnt/p3"
export DSMROOT_PATH="/mnt/dsmroot"
export PATH="${PATH}:/opt/arpl" export PATH="${PATH}:/opt/arpl"
if [ ! -f ${HOME}/.initialized ]; then if [ ! -f ${HOME}/.initialized ]; then