diff --git a/files/board/arpl/overlayfs/opt/arpl/init.sh b/files/board/arpl/overlayfs/opt/arpl/init.sh index c330c9e1..4800f2e6 100755 --- a/files/board/arpl/overlayfs/opt/arpl/init.sh +++ b/files/board/arpl/overlayfs/opt/arpl/init.sh @@ -50,6 +50,7 @@ if [ ! -f "${USER_CONFIG_FILE}" ]; then writeConfigKey "model" "" "${USER_CONFIG_FILE}" writeConfigKey "build" "" "${USER_CONFIG_FILE}" writeConfigKey "sn" "" "${USER_CONFIG_FILE}" + writeConfigKey "maxdisks" "" "${USER_CONFIG_FILE}" writeConfigKey "keymap" "" "${USER_CONFIG_FILE}" writeConfigKey "zimage-hash" "" "${USER_CONFIG_FILE}" writeConfigKey "ramdisk-hash" "" "${USER_CONFIG_FILE}" diff --git a/files/board/arpl/overlayfs/opt/arpl/menu.sh b/files/board/arpl/overlayfs/opt/arpl/menu.sh index b3169ab4..f93df4a6 100755 --- a/files/board/arpl/overlayfs/opt/arpl/menu.sh +++ b/files/board/arpl/overlayfs/opt/arpl/menu.sh @@ -148,7 +148,7 @@ function serialMenu() { } ############################################################################### -# Manage addons/drivers +# Manage addons function addonMenu() { # Read 'platform' and kernel version to check if addon exists PLATFORM="`readModelKey "${MODEL}" "platform"`" @@ -347,6 +347,8 @@ function cmdlineMenu() { ############################################################################### function synoinfoMenu() { + # Get dt flag from model + DT="`readModelKey "${MODEL}" "dt"`" # Read synoinfo from user config unset SYNOINFO declare -A SYNOINFO @@ -356,6 +358,9 @@ function synoinfoMenu() { echo "a \"Add/edit an synoinfo item\"" > "${TMP_PATH}/menu" echo "d \"Delete synoinfo item(s)\"" >> "${TMP_PATH}/menu" + if [ "${DT}" != "true" ]; then + echo "x \"Set maxdisks manually\"" >> "${TMP_PATH}/menu" + fi echo "s \"Show user synoinfo\"" >> "${TMP_PATH}/menu" echo "m \"Show model/build synoinfo\"" >> "${TMP_PATH}/menu" echo "e \"Exit\"" >> "${TMP_PATH}/menu" @@ -402,6 +407,15 @@ function synoinfoMenu() { done DIRTY=1 ;; + x) + MAXDISKS=`readConfigKey "maxdisks" "${USER_CONFIG_FILE}"` + dialog --backtitle "`backtitle`" --title "Maxdisks" \ + --inputbox "Type a value for maxdisks" 0 0 "${MAXDISKS}" \ + 2>${TMP_PATH}/resp + [ $? -ne 0 ] && continue + VALUE="`<"${TMP_PATH}/resp"`" + [ "${VALUE}" != "${MAXDISKS}" ] && writeConfigKey "maxdisks" "${VALUE}" "${USER_CONFIG_FILE}" + ;; s) ITEMS="" for KEY in ${!SYNOINFO[@]}; do @@ -817,7 +831,7 @@ while true; do echo "n \"Choose a Build Number\"" >> "${TMP_PATH}/menu" echo "s \"Choose a serial number\"" >> "${TMP_PATH}/menu" if [ -n "${BUILD}" ]; then - echo "a \"Addons/drivers\"" >> "${TMP_PATH}/menu" + echo "a \"Addons\"" >> "${TMP_PATH}/menu" echo "x \"Cmdline menu\"" >> "${TMP_PATH}/menu" echo "i \"Synoinfo menu\"" >> "${TMP_PATH}/menu" echo "l \"Switch LKM version: \Z4${LKM}\Zn\"" >> "${TMP_PATH}/menu" diff --git a/files/board/arpl/overlayfs/opt/arpl/ramdisk-patch.sh b/files/board/arpl/overlayfs/opt/arpl/ramdisk-patch.sh index f7891fed..3c0585a1 100755 --- a/files/board/arpl/overlayfs/opt/arpl/ramdisk-patch.sh +++ b/files/board/arpl/overlayfs/opt/arpl/ramdisk-patch.sh @@ -104,10 +104,11 @@ cp "${PATCH_PATH}/iosched-trampoline.sh" "${RAMDISK_PATH}/usr/sbin/modprobe" cp "${LKM_PATH}/rp-${PLATFORM}-${KVER}-${LKM}.ko" "${RAMDISK_PATH}/usr/lib/modules/rp.ko" # Addons +MAXDISKS=`readConfigKey "maxdisks" "${USER_CONFIG_FILE}"` # Check if model needs Device-tree dynamic patch DT="`readModelKey "${MODEL}" "dt"`" # Add system addon "dtbpatch" or "maxdisks" -[ "${DT}" = "true" ] && ADDONS['dtbpatch']="" || ADDONS['maxdisks']="" +[ "${DT}" = "true" ] && ADDONS['dtbpatch']="" || ADDONS['maxdisks']="${MAXDISKS}" # Indispensable eudev system addon ADDONS['eudev']="" diff --git a/files/board/arpl/p3/addons/maxdisks/all.tgz b/files/board/arpl/p3/addons/maxdisks/all.tgz index b41cada2..082aeeb2 100644 Binary files a/files/board/arpl/p3/addons/maxdisks/all.tgz and b/files/board/arpl/p3/addons/maxdisks/all.tgz differ