diff --git a/files/initrd/opt/arc/arc.sh b/files/initrd/opt/arc/arc.sh index b733f096..c437284f 100755 --- a/files/initrd/opt/arc/arc.sh +++ b/files/initrd/opt/arc/arc.sh @@ -64,7 +64,6 @@ KERNELLOAD="$(readConfigKey "arc.kernelload" "${USER_CONFIG_FILE}")" KERNELPANIC="$(readConfigKey "arc.kernelpanic" "${USER_CONFIG_FILE}")" MACSYS="$(readConfigKey "arc.macsys" "${USER_CONFIG_FILE}")" ODP="$(readConfigKey "arc.odp" "${USER_CONFIG_FILE}")" -MODULESCOPY="$(readConfigKey "arc.modulescopy" "${USER_CONFIG_FILE}")" HDDSORT="$(readConfigKey "arc.hddsort" "${USER_CONFIG_FILE}")" KERNEL="$(readConfigKey "arc.kernel" "${USER_CONFIG_FILE}")" USBMOUNT="$(readConfigKey "arc.usbmount" "${USER_CONFIG_FILE}")" @@ -439,12 +438,6 @@ function premake() { deleteConfigKey "modules.mmc_block" "${USER_CONFIG_FILE}" deleteConfigKey "modules.mmc_core" "${USER_CONFIG_FILE}" fi - # Fixes for SA6400 - if [ "${PLATFORM}" = "epyc7002" ]; then - KVER="${PRODUCTVER}-${KVER}" - MODULESCOPY="false" - writeConfigKey "arc.modulescopy" "${MODULESCOPY}" "${USER_CONFIG_FILE}" - fi # Show Config Summary arcSummary } @@ -943,12 +936,6 @@ function autopremake() { deleteConfigKey "modules.mmc_block" "${USER_CONFIG_FILE}" deleteConfigKey "modules.mmc_core" "${USER_CONFIG_FILE}" fi - # Fixes for SA6400 - if [ "${PLATFORM}" = "epyc7002" ]; then - KVER="${PRODUCTVER}-${KVER}" - MODULESCOPY="false" - writeConfigKey "arc.modulescopy" "${MODULESCOPY}" "${USER_CONFIG_FILE}" - fi # Build Loader automake } @@ -1171,9 +1158,6 @@ else if [ "${MODEL}" = "SA6400" ]; then echo "K \"Kernel: \Z4${KERNEL}\Zn \" " >>"${TMP_PATH}/menu" fi - if [ ! "${MODEL}" = "SA6400" ]; then - echo "M \"Copy Modules to DSM: \Z4${MODULESCOPY}\Zn \" " >>"${TMP_PATH}/menu" - fi echo "O \"Official Driver Priority: \Z4${ODP}\Zn \" " >>"${TMP_PATH}/menu" echo "H \"Sort Drives: \Z4${HDDSORT}\Zn \" " >>"${TMP_PATH}/menu" echo "U \"USB Mount: \Z4${USBMOUNT}\Zn \" " >>"${TMP_PATH}/menu" @@ -1282,10 +1266,6 @@ else ODP="false" writeConfigKey "arc.odp" "${ODP}" "${USER_CONFIG_FILE}" fi - if [ "${MODULESCOPY}" = "true" ]; then - MODULESCOPY="false" - writeConfigKey "arc.modulescopy" "${MODULESCOPY}" "${USER_CONFIG_FILE}" - fi PLATFORM="$(readModelKey "${MODEL}" "platform")" PRODUCTVER="$(readConfigKey "productver" "${USER_CONFIG_FILE}")" KVER="$(readModelKey "${MODEL}" "productvers.[${PRODUCTVER}].kver")" @@ -1308,12 +1288,6 @@ else BUILDDONE="$(readConfigKey "arc.builddone" "${USER_CONFIG_FILE}")" NEXT="O" ;; - M) [ "${MODULESCOPY}" = "false" ] && MODULESCOPY='true' || MODULESCOPY='false' - writeConfigKey "arc.modulescopy" "${MODULESCOPY}" "${USER_CONFIG_FILE}" - writeConfigKey "arc.builddone" "false" "${USER_CONFIG_FILE}" - BUILDDONE="$(readConfigKey "arc.builddone" "${USER_CONFIG_FILE}")" - NEXT="M" - ;; H) [ "${HDDSORT}" = "true" ] && HDDSORT='false' || HDDSORT='true' writeConfigKey "arc.hddsort" "${HDDSORT}" "${USER_CONFIG_FILE}" writeConfigKey "arc.builddone" "false" "${USER_CONFIG_FILE}" diff --git a/files/initrd/opt/arc/ramdisk-patch.sh b/files/initrd/opt/arc/ramdisk-patch.sh index 6e96fd1c..15a7e2f8 100755 --- a/files/initrd/opt/arc/ramdisk-patch.sh +++ b/files/initrd/opt/arc/ramdisk-patch.sh @@ -36,7 +36,6 @@ KEYMAP="$(readConfigKey "keymap" "${USER_CONFIG_FILE}")" PLATFORM="$(readModelKey "${MODEL}" "platform")" HDDSORT="$(readConfigKey "arc.hddsort" "${USER_CONFIG_FILE}")" USBMOUNT="$(readConfigKey "arc.usbmount" "${USER_CONFIG_FILE}")" -MODULESCOPY="$(readConfigKey "arc.modulescopy" "${USER_CONFIG_FILE}")" KERNEL="$(readConfigKey "kernel" "${USER_CONFIG_FILE}")" # Check if DSM Version changed @@ -162,9 +161,6 @@ for ADDON in "revert" "misc" "eudev" "disks" "localrss" "notify" "updatenotify" if [ "${ADDON}" = "disks" ]; then PARAMS='${HDDSORT} ${USBMOUNT}' fi - if [ "${ADDON}" = "eudev" ]; then - PARAMS='${MODULESCOPY}' - fi installAddon "${ADDON}" "${PLATFORM}" "${KVER}" || exit 1 echo "/addons/${ADDON}.sh \${1} ${PARAMS}" >>"${RAMDISK_PATH}/addons/addons.sh" 2>>"${LOG_FILE}" || exit 1 done