diff --git a/files/initrd/opt/arc/arc.sh b/files/initrd/opt/arc/arc.sh index cd5cdce2..9f421ddd 100755 --- a/files/initrd/opt/arc/arc.sh +++ b/files/initrd/opt/arc/arc.sh @@ -57,6 +57,7 @@ LKM="$(readConfigKey "lkm" "${USER_CONFIG_FILE}")" if [ -n "${MODEL}" ]; then DT="$(readConfigKey "platforms.${PLATFORM}.dt" "${P_FILE}")" PRODUCTVER="$(readConfigKey "productver" "${USER_CONFIG_FILE}")" + ARCCONF="$(readConfigKey "${MODEL}.serial" "${S_FILE}" 2>/dev/null)" fi # Get Arc Data from Config @@ -901,8 +902,11 @@ else echo "e \"DSM Version \" " >>"${TMP_PATH}/menu" echo "S \"DSM Storage Map \" " >>"${TMP_PATH}/menu" echo "P \"DSM StoragePanel \" " >>"${TMP_PATH}/menu" - echo "p \"Arc Patch Settings \" " >>"${TMP_PATH}/menu" + if [ -n "${ARCCONF}" ]; then + echo "p \"Arc Patch Settings \" " >>"${TMP_PATH}/menu" + fi echo "D \"Loader DHCP/StaticIP \" " >>"${TMP_PATH}/menu" + echo "u \"Switch LKM version: \Z4${LKM}\Zn \" " >>"${TMP_PATH}/menu" echo "R \"Automated Mode: \Z4${CUSTOM}\Zn \" " >>"${TMP_PATH}/menu" fi if [ "${ADVOPTS}" = "true" ]; then @@ -943,18 +947,17 @@ else echo "t \"Change DSM Password \" " >>"${TMP_PATH}/menu" echo "N \"Add DSM User \" " >>"${TMP_PATH}/menu" if [ "${PLATFORM}" = "epyc7002" ]; then - echo "K \"Kernel: \Z4${KERNEL}\Zn \" " >>"${TMP_PATH}/menu" + echo "K \"DSM Kernel: \Z4${KERNEL}\Zn \" " >>"${TMP_PATH}/menu" fi if [ "${DT}" = "true" ]; then echo "H \"Hotplug/SortDrives: \Z4${HDDSORT}\Zn \" " >>"${TMP_PATH}/menu" fi - echo "c \"IPv6 Support: \Z4${ARCIPV6}\Zn \" " >>"${TMP_PATH}/menu" + echo "c \"DSM IPv6 Support: \Z4${ARCIPV6}\Zn \" " >>"${TMP_PATH}/menu" echo "O \"Official Driver Priority: \Z4${ODP}\Zn \" " >>"${TMP_PATH}/menu" echo "E \"eMMC Boot Support: \Z4${EMMCBOOT}\Zn \" " >>"${TMP_PATH}/menu" - echo "o \"Switch MacSys: \Z4${MACSYS}\Zn \" " >>"${TMP_PATH}/menu" + echo "o \"DSM Switch MacSys: \Z4${MACSYS}\Zn \" " >>"${TMP_PATH}/menu" echo "W \"DSM RD Compression: \Z4${RD_COMPRESSED}\Zn \" " >>"${TMP_PATH}/menu" echo "X \"DSM Sata DOM: \Z4${SATADOM}\Zn \" " >>"${TMP_PATH}/menu" - echo "u \"Switch LKM version: \Z4${LKM}\Zn \" " >>"${TMP_PATH}/menu" fi fi if [ "${DEVOPTS}" = "true" ]; then diff --git a/files/initrd/opt/arc/init.sh b/files/initrd/opt/arc/init.sh index d2788dd9..aa8bca14 100755 --- a/files/initrd/opt/arc/init.sh +++ b/files/initrd/opt/arc/init.sh @@ -220,11 +220,7 @@ echo -e "User config is on \033[1;34m${USER_CONFIG_FILE}\033[0m" echo -e "Default SSH Root password is \033[1;34marc\033[0m" echo -mkdir -p "${ADDONS_PATH}" -mkdir -p "${LKM_PATH}" -mkdir -p "${MODULES_PATH}" -mkdir -p "${MODEL_CONFIG_PATH}" -mkdir -p "${PATCH_PATH}" +mkdir -p "${USER_UP_PATH}" # Load Arc Overlay echo -e "\033[1;34mLoading Arc Overlay...\033[0m" diff --git a/files/initrd/opt/arc/ramdisk-patch.sh b/files/initrd/opt/arc/ramdisk-patch.sh index b124266d..58f1f8b2 100755 --- a/files/initrd/opt/arc/ramdisk-patch.sh +++ b/files/initrd/opt/arc/ramdisk-patch.sh @@ -221,7 +221,7 @@ fi # backup current loader configs BACKUP_PATH="${RAMDISK_PATH}/usr/arc/backup" rm -rf "${BACKUP_PATH}" -for F in "${USER_GRUB_CONFIG}" "${USER_CONFIG_FILE}" "${USER_UP_PATH}" "${SCRIPTS_PATH}"; do +for F in "${USER_GRUB_CONFIG}" "${USER_CONFIG_FILE}" "${USER_UP_PATH}"; do if [ -f "${F}" ]; then FD="$(dirname "${F}")" mkdir -p "${FD/\/mnt/${BACKUP_PATH}}" @@ -262,12 +262,6 @@ if [ "${PLATFORM}" = "broadwellntbap" ]; then sed -i 's/IsUCOrXA="yes"/XIsUCOrXA="yes"/g; s/IsUCOrXA=yes/XIsUCOrXA=yes/g' ${RAMDISK_PATH}/usr/syno/share/environments.sh fi -# Call user patch scripts -for F in $(ls -1 ${SCRIPTS_PATH}/*.sh 2>/dev/null); do - echo "Calling ${F}" >"${LOG_FILE}" - . "${F}" >>"${LOG_FILE}" 2>&1 || exit 1 -done - # Reassembly ramdisk if [ "${RD_COMPRESSED}" == "true" ]; then (cd "${RAMDISK_PATH}" && find . 2>/dev/null | cpio -o -H newc -R root:root | xz -9 --format=lzma >"${MOD_RDGZ_FILE}") >"${LOG_FILE}" 2>&1 || exit 1 @@ -275,7 +269,4 @@ else (cd "${RAMDISK_PATH}" && find . 2>/dev/null | cpio -o -H newc -R root:root >"${MOD_RDGZ_FILE}") >"${LOG_FILE}" 2>&1 || exit 1 fi -sync - -# Clean -rm -rf "${RAMDISK_PATH}" \ No newline at end of file +sync \ No newline at end of file