From a6be08228b60953ade467894f4003eaa2a75d2fc Mon Sep 17 00:00:00 2001 From: AuxXxilium Date: Tue, 24 Dec 2024 02:49:17 +0100 Subject: [PATCH] tree: more optimization Signed-off-by: AuxXxilium --- files/initrd/opt/arc/arc-functions.sh | 12 ++++++++++-- files/initrd/opt/arc/arc.sh | 4 +++- files/initrd/opt/arc/boot.sh | 2 -- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/files/initrd/opt/arc/arc-functions.sh b/files/initrd/opt/arc/arc-functions.sh index 62fe16c8..405e3d18 100755 --- a/files/initrd/opt/arc/arc-functions.sh +++ b/files/initrd/opt/arc/arc-functions.sh @@ -996,6 +996,7 @@ function sysinfo() { ETHX=$(ls /sys/class/net/ 2>/dev/null | grep eth) || true ETHN=$(echo ${ETHX} | wc -w) ARC_BRANCH="$(readConfigKey "arc.branch" "${USER_CONFIG_FILE}")" + HWID="$(genHWID)" CONFDONE="$(readConfigKey "arc.confdone" "${USER_CONFIG_FILE}")" BUILDDONE="$(readConfigKey "arc.builddone" "${USER_CONFIG_FILE}")" if [ "${CONFDONE}" = "true" ]; then @@ -1090,6 +1091,8 @@ function sysinfo() { TEXT+="\n Subversion: \ZbAddons ${ADDONSVERSION} | Configs ${CONFIGSVERSION} | LKM ${LKMVERSION} | Modules ${MODULESVERSION} | Patches ${PATCHESVERSION}\Zn" TEXT+="\n Config | Build: \Zb${CONFDONE} | ${BUILDDONE}\Zn" TEXT+="\n Config Version: \Zb${CONFIGVER}\Zn" + TEXT+="\n HardwareID: \Zb${HWID}\Zn" + TEXT+="\n Offline Mode: \Zb${ARCOFFLINE}\Zn" [ "${ARCOFFLINE}" = "true" ] && TEXT+="\n Offline Mode: \Zb${ARCOFFLINE}\Zn" if [ "${CONFDONE}" = "true" ]; then TEXT+="\n\Z4> DSM ${PRODUCTVER} (${BUILDNUM}): ${MODELID:-${MODEL}}\Zn" @@ -2204,9 +2207,9 @@ function mountDSM() { umount "${I}" 2>/dev/null mount ${I} "/mnt/DSM/${NAME}" -o ro done - MSG="Storage pools are mounted under /mnt/DSM.\nPlease check them via ${IPCON}:7304.\nIf you proceed, DSM Pool will be unmounted!" + MSG="Storage pools are mounted at /mnt/DSM.\nPlease check them via ${IPCON}:7304." dialog --backtitle "$(backtitle)" --title "Mount DSM Pool" \ - --msgbox "${MSG}" 7 50 + --msgbox "${MSG}" 6 50 if [ -n "${VOLS}" ]; then dialog --backtitle "$(backtitle)" --title "Mount DSM Pool" \ --yesno "Unmount all storage pools?" 5 30 @@ -2410,6 +2413,7 @@ function genHardwareID() { --msgbox "HardwareID: ${HWID}\nYour HardwareID is registered to UserID: ${USERID}!" 6 70 writeConfigKey "arc.hardwareid" "${HWID}" "${USER_CONFIG_FILE}" writeConfigKey "arc.userid" "${USERID}" "${USER_CONFIG_FILE}" + writeConfigKey "bootscreen.hwidinfo" "true" "${USER_CONFIG_FILE}" break else dialog --backtitle "$(backtitle)" --title "HardwareID" \ @@ -2417,6 +2421,7 @@ function genHardwareID() { [ $? -ne 0 ] && break writeConfigKey "arc.hardwareid" "" "${USER_CONFIG_FILE}" writeConfigKey "arc.userid" "" "${USER_CONFIG_FILE}" + writeConfigKey "bootscreen.hwidinfo" "false" "${USER_CONFIG_FILE}" fi done return @@ -2432,15 +2437,18 @@ function checkHardwareID() { if curl -skL -m 10 "https://arc.auxxxilium.tech?hwid=${HWID}&userid=${USERID}" -o "${S_FILE}" 2>/dev/null; then writeConfigKey "arc.hardwareid" "${HWID}" "${USER_CONFIG_FILE}" writeConfigKey "arc.userid" "${USERID}" "${USER_CONFIG_FILE}" + writeConfigKey "bootscreen.hwidinfo" "true" "${USER_CONFIG_FILE}" else writeConfigKey "arc.hardwareid" "" "${USER_CONFIG_FILE}" writeConfigKey "arc.userid" "" "${USER_CONFIG_FILE}" + writeConfigKey "bootscreen.hwidinfo" "false" "${USER_CONFIG_FILE}" [ -f "${S_FILE}.bak" ] && mv -f "${S_FILE}.bak" "${S_FILE}" 2>/dev/null fi else USERID="" writeConfigKey "arc.hardwareid" "" "${USER_CONFIG_FILE}" writeConfigKey "arc.userid" "" "${USER_CONFIG_FILE}" + writeConfigKey "bootscreen.hwidinfo" "false" "${USER_CONFIG_FILE}" [ -f "${S_FILE}.bak" ] && mv -f "${S_FILE}.bak" "${S_FILE}" 2>/dev/null fi return 0 diff --git a/files/initrd/opt/arc/arc.sh b/files/initrd/opt/arc/arc.sh index 89ce7c54..c1f7bc5f 100755 --- a/files/initrd/opt/arc/arc.sh +++ b/files/initrd/opt/arc/arc.sh @@ -906,7 +906,9 @@ elif [ "${ARCMODE}" = "config" ]; then echo "t \"Change User Password \" " >>"${TMP_PATH}/menu" echo "J \"Reset Network Config \" " >>"${TMP_PATH}/menu" echo "T \"Disable all scheduled Tasks \" " >>"${TMP_PATH}/menu" - echo "M \"Mount DSM Storage Pool (not SHR) \" " >>"${TMP_PATH}/menu" + if [ "${PLATFORM}" = "epyc7002" ]; then + echo "M \"Mount DSM Storage Pool \" " >>"${TMP_PATH}/menu" + fi echo "l \"Edit User Config \" " >>"${TMP_PATH}/menu" echo "s \"Allow Downgrade Version \" " >>"${TMP_PATH}/menu" echo "O \"Official Driver Priority: \Z4${ODP}\Zn \" " >>"${TMP_PATH}/menu" diff --git a/files/initrd/opt/arc/boot.sh b/files/initrd/opt/arc/boot.sh index 7bdc63cf..05e4a347 100755 --- a/files/initrd/opt/arc/boot.sh +++ b/files/initrd/opt/arc/boot.sh @@ -331,7 +331,6 @@ elif [ "${DIRECTBOOT}" = "false" ]; then # done echo -e "\033[1;37mLoading DSM Kernel...\033[0m" - # Executes DSM kernel via KEXEC KEXECARGS="-a" if [ $(echo "${KVER:-4}" | cut -d'.' -f1) -lt 4 ] && [ ${EFI} -eq 1 ]; then echo -e "\033[1;33mWarning, running kexec with --noefi param, strange things will happen!!\033[0m" @@ -340,7 +339,6 @@ elif [ "${DIRECTBOOT}" = "false" ]; then kexec ${KEXECARGS} -l "${MOD_ZIMAGE_FILE}" --initrd "${MOD_RDGZ_FILE}" --command-line="${CMDLINE_LINE}" >"${LOG_FILE}" 2>&1 || dieLog echo -e "\033[1;37mBooting DSM...\033[0m" - # Boot to DSM [ "${KERNELLOAD}" = "kexec" ] && kexec -e || poweroff exit 0 fi \ No newline at end of file