diff --git a/.github/workflows/grub.yml b/.github/workflows/grub.yml index 7c1827c4..d39524bc 100644 --- a/.github/workflows/grub.yml +++ b/.github/workflows/grub.yml @@ -1,6 +1,6 @@ # # Copyright (C) 2022 Ing -# +# # This is free software, licensed under the MIT License. # See /LICENSE for more information. # @@ -10,8 +10,8 @@ name: Grub on: workflow_dispatch: inputs: - push: - description: 'push' + push: + description: "push" default: false type: boolean jobs: @@ -22,11 +22,11 @@ jobs: uses: actions/checkout@main - name: Initialization environment - run : | + run: | git config --global user.email "github-actions[bot]@users.noreply.github.com" git config --global user.name "github-actions[bot]" sudo timedatectl set-timezone "Asia/Shanghai" - + sudo apt update sudo apt install -y build-essential bison flex dosfstools @@ -47,7 +47,7 @@ jobs: if [ -f "grub.img.gz" ]; then echo "Copy img ..." mv -f grub.img.gz files/board/arpl/grub.img.gz - + echo "Git push ..." git pull status=$(git status -s | grep -E 'grub.img.gz' | awk '{printf " %s", $2}') @@ -59,4 +59,3 @@ jobs: else echo "No change ..." fi - diff --git a/.github/workflows/issues.yml b/.github/workflows/issues.yml index 6cc4652e..2dd2977e 100644 --- a/.github/workflows/issues.yml +++ b/.github/workflows/issues.yml @@ -1,11 +1,10 @@ # # Copyright (C) 2022 Ing -# +# # This is free software, licensed under the MIT License. # See /LICENSE for more information. # - name: Auto Comment on: issues: @@ -16,12 +15,11 @@ jobs: runs-on: ubuntu-latest steps: - name: Init Env - run : | + run: | git config --global user.email "github-actions[bot]@users.noreply.github.com" git config --global user.name "github-actions[bot]" sudo timedatectl set-timezone "Asia/Shanghai" - - name: Check Issues run: | if echo "${{ github.event.issue.body }}" | grep -q "DS"; then @@ -34,9 +32,9 @@ jobs: if: env.FALG == 'false' uses: actions-cool/issues-helper@v3 with: - actions: 'create-comment' + actions: "create-comment" token: ${{ secrets.GITHUB_TOKEN }} issue-number: ${{ github.event.issue.number }} - body: | + body: | emoji: heart diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 17f3bf99..20fd0a8c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -1,6 +1,6 @@ # # Copyright (C) 2022 Ing -# +# # This is free software, licensed under the MIT License. # See /LICENSE for more information. # @@ -20,11 +20,11 @@ on: workflow_dispatch: inputs: version: - description: 'format %y.%-m.$i or auto' + description: "format %y.%-m.$i or auto" required: false type: string prerelease: - description: 'pre release' + description: "pre release" default: false type: boolean @@ -47,7 +47,7 @@ jobs: sudo apt update sudo apt install -y jq gawk gettext libelf-dev qemu-utils sudo snap install yq - + # Check dl cache - name: Cache downloads id: dl-cache @@ -191,7 +191,7 @@ jobs: zip -9j update.zip "${F}" fi done < <(yq '.replace | explode(.) | to_entries | map([.key])[] | .[]' update-list.yml) - zip -9j update.zip sha256sum + zip -9j update.zip sha256sum # Upload artifact - name: Upload diff --git a/Taskfile.yaml b/Taskfile.yaml index b6bd153c..cbc7e15a 100644 --- a/Taskfile.yaml +++ b/Taskfile.yaml @@ -1,6 +1,6 @@ # https://taskfile.dev -version: '3' +version: "3" tasks: build-img: diff --git a/files/board/arpl/make-img.sh b/files/board/arpl/make-img.sh index 2a922967..9869a918 100755 --- a/files/board/arpl/make-img.sh +++ b/files/board/arpl/make-img.sh @@ -30,10 +30,10 @@ sudo mount ${LOOPX}p1 "${BINARIES_DIR}/p1" sudo mount ${LOOPX}p3 "${BINARIES_DIR}/p3" echo "Copying files" -sudo cp "${BINARIES_DIR}/bzImage" "${BINARIES_DIR}/p3/bzImage-arpl" -sudo cp "${BINARIES_DIR}/rootfs.cpio.xz" "${BINARIES_DIR}/p3/initrd-arpl" -sudo cp -R "${BOARD_PATH}/p1/"* "${BINARIES_DIR}/p1" -sudo cp -R "${BOARD_PATH}/p3/"* "${BINARIES_DIR}/p3" +sudo cp "${BINARIES_DIR}/bzImage" "${BINARIES_DIR}/p3/bzImage-arpl" +sudo cp "${BINARIES_DIR}/rootfs.cpio.xz" "${BINARIES_DIR}/p3/initrd-arpl" +sudo cp -R "${BOARD_PATH}/p1/"* "${BINARIES_DIR}/p1" +sudo cp -R "${BOARD_PATH}/p3/"* "${BINARIES_DIR}/p3" sync echo "Unmount image file" diff --git a/files/board/arpl/overlayfs/etc/udev/rules.d/50-usb-realtek-net.rules b/files/board/arpl/overlayfs/etc/udev/rules.d/99-usb-realtek-net.rules similarity index 100% rename from files/board/arpl/overlayfs/etc/udev/rules.d/50-usb-realtek-net.rules rename to files/board/arpl/overlayfs/etc/udev/rules.d/99-usb-realtek-net.rules diff --git a/files/board/arpl/overlayfs/opt/arpl/menu.sh b/files/board/arpl/overlayfs/opt/arpl/menu.sh index 81f90ea1..7091cb5c 100755 --- a/files/board/arpl/overlayfs/opt/arpl/menu.sh +++ b/files/board/arpl/overlayfs/opt/arpl/menu.sh @@ -82,7 +82,7 @@ function modelMenu() { if [ -z "${1}" ]; then RESTRICT=1 FLGBETA=0 - dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Model")" \ + dialog --backtitle "$(backtitle)" --title "$(TEXT "Model")" \ --infobox "$(TEXT "Reading models")" 0 0 echo -n "" >"${TMP_PATH}/modellist" while read M; do @@ -115,7 +115,7 @@ function modelMenu() { done < <(cat "${TMP_PATH}/modellist" | sort -r -n -k 2) [ ${FLGNEX} -eq 1 ] && echo "f \"\Z1$(TEXT "Disable flags restriction")\Zn\"" >>"${TMP_PATH}/menu" [ ${FLGBETA} -eq 0 ] && echo "b \"\Z1$(TEXT "Show beta models")\Zn\"" >>"${TMP_PATH}/menu" - dialog --backtitle "$(backtitle)" --colors \ + dialog --backtitle "$(backtitle)" \ --menu "$(TEXT "Choose the model")" 0 0 0 --file "${TMP_PATH}/menu" \ 2>${TMP_PATH}/resp [ $? -ne 0 ] && return @@ -157,7 +157,7 @@ function modelMenu() { function productversMenu() { ITEMS="$(readConfigEntriesArray "productvers" "${MODEL_CONFIG_PATH}/${MODEL}.yml" | sort -r)" if [ -z "${1}" ]; then - dialog --backtitle "$(backtitle)" --colors \ + dialog --backtitle "$(backtitle)" \ --no-items --menu "$(TEXT "Choose a product version")" 0 0 0 ${ITEMS} \ 2>${TMP_PATH}/resp [ $? -ne 0 ] && return @@ -170,17 +170,17 @@ function productversMenu() { if [ "${PRODUCTVER}" != "${resp}" ]; then local KVER=$(readModelKey "${MODEL}" "productvers.[${resp}].kver") if [ -d "/sys/firmware/efi" -a "${KVER:0:1}" = "3" ]; then - dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Product Version")" \ + dialog --backtitle "$(backtitle)" --title "$(TEXT "Product Version")" \ --msgbox "$(TEXT "This version does not support UEFI startup, Please select another version or switch the startup mode.")" 0 0 return fi if [ ! "usb" = "$(udevadm info --query property --name ${LOADER_DISK} | grep ID_BUS | cut -d= -f2)" -a "${KVER:0:1}" = "5" ]; then - dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Product Version")" \ + dialog --backtitle "$(backtitle)" --title "$(TEXT "Product Version")" \ --msgbox "$(TEXT "This version only support usb startup, Please select another version or switch the startup mode.")" 0 0 # return fi # get online pat data - dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Product Version")" \ + dialog --backtitle "$(backtitle)" --title "$(TEXT "Product Version")" \ --infobox "$(TEXT "Get pat data ..")" 0 0 idx=0 while [ ${idx} -le 3 ]; do # Loop 3 times, if successful, break @@ -205,7 +205,7 @@ function productversMenu() { else MSG="$(TEXT "Successfully to get pat data,\nPlease confirm or modify as needed.")" fi - dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Product Version")" \ + dialog --backtitle "$(backtitle)" --title "$(TEXT "Product Version")" \ --form "${MSG}" 10 110 2 "URL" 1 1 "${paturl}" 1 5 100 0 "MD5" 2 1 "${patsum}" 2 5 100 0 \ 2>"${TMP_PATH}/resp" [ $? -ne 0 ] && return @@ -220,7 +220,7 @@ function productversMenu() { SMALLNUM="" writeConfigKey "buildnum" "${BUILDNUM}" "${USER_CONFIG_FILE}" writeConfigKey "smallnum" "${SMALLNUM}" "${USER_CONFIG_FILE}" - dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Product Version")" \ + dialog --backtitle "$(backtitle)" --title "$(TEXT "Product Version")" \ --infobox "$(TEXT "Reconfiguring Synoinfo, Addons and Modules")" 0 0 # Delete synoinfo and reload model/build synoinfo writeConfigKey "synoinfo" "{}" "${USER_CONFIG_FILE}" @@ -264,7 +264,7 @@ function addonMenu() { NEXT="a" # Loop menu while true; do - dialog --backtitle "$(backtitle)" --colors \ + dialog --backtitle "$(backtitle)" \ --default-item ${NEXT} --menu "$(TEXT "Choose a option")" 0 0 0 \ a "$(TEXT "Add an addon")" \ d "$(TEXT "Delete addon(s)")" \ @@ -283,18 +283,18 @@ function addonMenu() { echo "${ADDON} \"${DESC}\"" >>"${TMP_PATH}/menu" done < <(availableAddons "${PLATFORM}" "$([ -n "${KPRE}" ] && echo "${KPRE}-")${KVER}") if [ ! -f "${TMP_PATH}/menu" ]; then - dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Addons")" \ + dialog --backtitle "$(backtitle)" --title "$(TEXT "Addons")" \ --msgbox "$(TEXT "No available addons to add")" 0 0 NEXT="e" continue fi - dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Addons")" \ + dialog --backtitle "$(backtitle)" --title "$(TEXT "Addons")" \ --menu "$(TEXT "Select an addon")" 0 0 0 --file "${TMP_PATH}/menu" \ 2>"${TMP_PATH}/resp" [ $? -ne 0 ] && continue ADDON="$(<"${TMP_PATH}/resp")" [ -z "${ADDON}" ] && continue - dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Addons")" \ + dialog --backtitle "$(backtitle)" --title "$(TEXT "Addons")" \ --inputbox "$(TEXT "Type a optional params to addon")" 0 0 \ 2>${TMP_PATH}/resp [ $? -ne 0 ] && continue @@ -306,7 +306,7 @@ function addonMenu() { d) NEXT='d' if [ ${#ADDONS[@]} -eq 0 ]; then - dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Addons")" \ + dialog --backtitle "$(backtitle)" --title "$(TEXT "Addons")" \ --msgbox "$(TEXT "No user addons to remove")" 0 0 continue fi @@ -314,7 +314,7 @@ function addonMenu() { for I in "${!ADDONS[@]}"; do echo "\"${I}\" \"${I}\" \"off\"" >>"${TMP_PATH}/opts" done - dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Addons")" \ + dialog --backtitle "$(backtitle)" --title "$(TEXT "Addons")" \ --no-tags --checklist "$(TEXT "Select addon to remove")" 0 0 0 --file "${TMP_PATH}/opts" \ 2>"${TMP_PATH}/resp" [ $? -ne 0 ] && continue @@ -332,7 +332,7 @@ function addonMenu() { for KEY in ${!ADDONS[@]}; do ITEMS+="${KEY}: ${ADDONS[$KEY]}\n" done - dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Addons")" \ + dialog --backtitle "$(backtitle)" --title "$(TEXT "Addons")" \ --msgbox "${ITEMS}" 0 0 ;; m) @@ -346,16 +346,16 @@ function addonMenu() { fi MSG+=": \Z5${DESC}\Zn\n" done < <(availableAddons "${PLATFORM}" "$([ -n "${KPRE}" ] && echo "${KPRE}-")${KVER}") - dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Addons")" \ + dialog --backtitle "$(backtitle)" --title "$(TEXT "Addons")" \ --msgbox "${MSG}" 0 0 ;; o) if ! tty | grep -q "/dev/pts"; then - dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Addons")" \ + dialog --backtitle "$(backtitle)" --title "$(TEXT "Addons")" \ --msgbox "$(TEXT "This feature is only available when accessed via web/ssh.")" 0 0 return fi - dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Addons")" \ + dialog --backtitle "$(backtitle)" --title "$(TEXT "Addons")" \ --msgbox "$(TEXT "Please upload the *.addons file.")" 0 0 TMP_UP_PATH=${TMP_PATH}/users USER_FILE="" @@ -369,21 +369,21 @@ function addonMenu() { done popd if [ -z "${USER_FILE}" ]; then - dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Addons")" \ + dialog --backtitle "$(backtitle)" --title "$(TEXT "Addons")" \ --msgbox "$(TEXT "Not a valid file, please try again!")" 0 0 else if [ -d "${ADDONS_PATH}/$(basename ${USER_FILE} .addons)" ]; then - dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Addons")" \ + dialog --backtitle "$(backtitle)" --title "$(TEXT "Addons")" \ --yesno "$(TEXT "The addon already exists. Do you want to overwrite it?")" 0 0 RET=$? [ ${RET} -eq 0 ] && return fi ADDON="$(untarAddon "${TMP_UP_PATH}/${USER_FILE}")" if [ -n "${ADDON}" ]; then - dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Addons")" \ + dialog --backtitle "$(backtitle)" --title "$(TEXT "Addons")" \ --msgbox "$(printf "$(TEXT "Addon '%s' added to loader, Please enable it in 'Add an addon' menu.")" "${ADDON}")" 0 0 else - dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Addons")" \ + dialog --backtitle "$(backtitle)" --title "$(TEXT "Addons")" \ --msgbox "$(TEXT "File format not recognized!")" 0 0 fi fi @@ -399,7 +399,7 @@ function moduleMenu() { KVER="$(readModelKey "${MODEL}" "productvers.[${PRODUCTVER}].kver")" KPRE="$(readModelKey "${MODEL}" "productvers.[${PRODUCTVER}].kpre")" - dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Modules")" \ + dialog --backtitle "$(backtitle)" --title "$(TEXT "Modules")" \ --infobox "$(TEXT "Reading modules")" 0 0 ALLMODULES=$(getAllModules "${PLATFORM}" "$([ -n "${KPRE}" ] && echo "${KPRE}-")${KVER}") unset USERMODULES @@ -410,7 +410,7 @@ function moduleMenu() { NEXT="s" # loop menu while true; do - dialog --backtitle "$(backtitle)" --colors \ + dialog --backtitle "$(backtitle)" \ --default-item ${NEXT} --menu "$(TEXT "Choose a option")" 0 0 0 \ s "$(TEXT "Show selected modules")" \ l "$(TEXT "Select loaded modules")" \ @@ -427,11 +427,11 @@ function moduleMenu() { for KEY in ${!USERMODULES[@]}; do ITEMS+="${KEY}: ${USERMODULES[$KEY]}\n" done - dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Modules")" \ + dialog --backtitle "$(backtitle)" --title "$(TEXT "Modules")" \ --msgbox "${ITEMS}" 0 0 ;; l) - dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Modules")" \ + dialog --backtitle "$(backtitle)" --title "$(TEXT "Modules")" \ --infobox "$(TEXT "Selecting loaded modules")" 0 0 KOLIST="" for I in $(lsmod | awk -F' ' '{print $1}' | grep -v 'Module'); do @@ -448,7 +448,7 @@ function moduleMenu() { DIRTY=1 ;; a) - dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Modules")" \ + dialog --backtitle "$(backtitle)" --title "$(TEXT "Modules")" \ --infobox "$(TEXT "Selecting all modules")" 0 0 unset USERMODULES declare -A USERMODULES @@ -461,7 +461,7 @@ function moduleMenu() { ;; d) - dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Modules")" \ + dialog --backtitle "$(backtitle)" --title "$(TEXT "Modules")" \ --infobox "$(TEXT "Deselecting all modules")" 0 0 writeConfigKey "modules" "{}" "${USER_CONFIG_FILE}" unset USERMODULES @@ -475,13 +475,13 @@ function moduleMenu() { arrayExistItem "${ID}" "${!USERMODULES[@]}" && ACT="on" || ACT="off" echo "${ID} ${DESC} ${ACT}" >>"${TMP_PATH}/opts" done <<<${ALLMODULES} - dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Modules")" \ + dialog --backtitle "$(backtitle)" --title "$(TEXT "Modules")" \ --checklist "$(TEXT "Select modules to include")" 0 0 0 --file "${TMP_PATH}/opts" \ 2>${TMP_PATH}/resp [ $? -ne 0 ] && continue resp=$(<${TMP_PATH}/resp) [ -z "${resp}" ] && continue - dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Modules")" \ + dialog --backtitle "$(backtitle)" --title "$(TEXT "Modules")" \ --infobox "$(TEXT "Writing to user config")" 0 0 unset USERMODULES declare -A USERMODULES @@ -500,10 +500,10 @@ function moduleMenu() { MSG+="$(TEXT "This program will not determine the availability of imported modules or even make type judgments, as please double check if it is correct.\n")" MSG+="$(TEXT "If you want to remove it, please go to the \"Update Menu\" -> \"Update modules\" to forcibly update the modules. All imports will be reset.\n")" MSG+="$(TEXT "Do you want to continue?")" - dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Modules")" \ + dialog --backtitle "$(backtitle)" --title "$(TEXT "Modules")" \ --yesno "${MSG}" 0 0 [ $? -ne 0 ] && return - dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Modules")" \ + dialog --backtitle "$(backtitle)" --title "$(TEXT "Modules")" \ --msgbox "$(TEXT "Please upload the *.ko file.")" 0 0 TMP_UP_PATH=${TMP_PATH}/users USER_FILE="" @@ -518,11 +518,11 @@ function moduleMenu() { popd if [ -n "${USER_FILE}" -a "${USER_FILE##*.}" = "ko" ]; then addToModules ${PLATFORM} "$([ -n "${KPRE}" ] && echo "${KPRE}-")${KVER}" "${TMP_UP_PATH}/${USER_FILE}" - dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Modules")" \ + dialog --backtitle "$(backtitle)" --title "$(TEXT "Modules")" \ --msgbox "$(printf "$(TEXT "Module '%s' added to %s-%s")" "${USER_FILE}" "${PLATFORM}" "$([ -n "${KPRE}" ] && echo "${KPRE}-")${KVER}")" 0 0 rm -f "${TMP_UP_PATH}/${USER_FILE}" else - dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Modules")" \ + dialog --backtitle "$(backtitle)" --title "$(TEXT "Modules")" \ --msgbox "$(TEXT "Not a valid file, please try again!")" 0 0 fi ;; @@ -551,19 +551,19 @@ function cmdlineMenu() { echo "e \"$(TEXT "Exit")\"" >>"${TMP_PATH}/menu" # Loop menu while true; do - dialog --backtitle "$(backtitle)" --colors \ + dialog --backtitle "$(backtitle)" \ --menu "$(TEXT "Choose a option")" 0 0 0 --file "${TMP_PATH}/menu" \ 2>${TMP_PATH}/resp [ $? -ne 0 ] && return case "$(<${TMP_PATH}/resp)" in a) - dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Cmdline")" \ + dialog --backtitle "$(backtitle)" --title "$(TEXT "Cmdline")" \ --inputbox "$(TEXT "Type a name of cmdline")" 0 0 \ 2>${TMP_PATH}/resp [ $? -ne 0 ] && continue NAME="$(sed 's/://g' <"${TMP_PATH}/resp")" [ -z "${NAME}" ] && continue - dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Cmdline")" \ + dialog --backtitle "$(backtitle)" --title "$(TEXT "Cmdline")" \ --inputbox "$(printf "$(TEXT "Type a value of '%s' cmdline")" "${NAME}")" 0 0 "${CMDLINE[${NAME}]}" \ 2>${TMP_PATH}/resp [ $? -ne 0 ] && continue @@ -573,7 +573,7 @@ function cmdlineMenu() { ;; d) if [ ${#CMDLINE[@]} -eq 0 ]; then - dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Cmdline")" \ + dialog --backtitle "$(backtitle)" --title "$(TEXT "Cmdline")" \ --msgbox "$(TEXT "No user cmdline to remove")" 0 0 continue fi @@ -581,7 +581,7 @@ function cmdlineMenu() { for I in "${!CMDLINE[@]}"; do echo "\"${I}\" \"${CMDLINE[${I}]}\" \"off\"" >>"${TMP_PATH}/opts" done - dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Cmdline")" \ + dialog --backtitle "$(backtitle)" --title "$(TEXT "Cmdline")" \ --checklist "$(TEXT "Select cmdline to remove")" 0 0 0 --file "${TMP_PATH}/opts" \ 2>"${TMP_PATH}/resp" [ $? -ne 0 ] && continue @@ -594,7 +594,7 @@ function cmdlineMenu() { ;; s) while true; do - dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Cmdline")" \ + dialog --backtitle "$(backtitle)" --title "$(TEXT "Cmdline")" \ --inputbox "$(TEXT "Please enter a serial number ")" 0 0 "" \ 2>${TMP_PATH}/resp [ $? -ne 0 ] && break 2 @@ -606,7 +606,7 @@ function cmdlineMenu() { fi # At present, the SN rules are not complete, and many SNs are not truly invalid, so not provide tips now. break - dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Cmdline")" \ + dialog --backtitle "$(backtitle)" --title "$(TEXT "Cmdline")" \ --yesno "$(TEXT "Invalid serial, continue?")" 0 0 [ $? -eq 0 ] && break done @@ -623,7 +623,7 @@ function cmdlineMenu() { [ -n "${MACF}" ] && MAC=${MACF} || MAC=${MACR} RET=1 while true; do - dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Cmdline")" \ + dialog --backtitle "$(backtitle)" --title "$(TEXT "Cmdline")" \ --inputbox "$(printf "$(TEXT "Type a custom MAC address of %s")" "mac${N}")" 0 0 "${MAC}" \ 2>${TMP_PATH}/resp RET=$? @@ -633,7 +633,7 @@ function cmdlineMenu() { [ -z "${MAC}" ] && MAC="${MACFS[$(expr ${i} - 1)]}" MACF="$(echo "${MAC}" | sed "s/:\|-\| //g")" [ ${#MACF} -eq 12 ] && break - dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Cmdline")" \ + dialog --backtitle "$(backtitle)" --title "$(TEXT "Cmdline")" \ --msgbox "$(TEXT "Invalid MAC")" 0 0 done if [ ${RET} -eq 0 ]; then @@ -643,13 +643,13 @@ function cmdlineMenu() { writeConfigKey "cmdline.netif_num" "${N}" "${USER_CONFIG_FILE}" MAC="${MACF:0:2}:${MACF:2:2}:${MACF:4:2}:${MACF:6:2}:${MACF:8:2}:${MACF:10:2}" ip link set dev ${ETHX[$(expr ${N} - 1)]} address "${MAC}" 2>&1 | - dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Cmdline")" \ + dialog --backtitle "$(backtitle)" --title "$(TEXT "Cmdline")" \ --progressbox "$(TEXT "Changing MAC")" 20 70 /etc/init.d/S41dhcpcd restart 2>&1 | - dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Cmdline")" \ + dialog --backtitle "$(backtitle)" --title "$(TEXT "Cmdline")" \ --progressbox "$(TEXT "Renewing IP")" 20 70 # IP=`ip route 2>/dev/null | sed -n 's/.* via .* dev \(.*\) src \(.*\) metric .*/\1: \2 /p' | head -1` - dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Cmdline")" \ + dialog --backtitle "$(backtitle)" --title "$(TEXT "Cmdline")" \ --yesno "$(TEXT "Continue to custom MAC?")" 0 0 [ $? -ne 0 ] && break fi @@ -660,7 +660,7 @@ function cmdlineMenu() { for KEY in ${!CMDLINE[@]}; do ITEMS+="${KEY}: ${CMDLINE[$KEY]}\n" done - dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Cmdline")" \ + dialog --backtitle "$(backtitle)" --title "$(TEXT "Cmdline")" \ --msgbox "${ITEMS}" 0 0 ;; m) @@ -668,7 +668,7 @@ function cmdlineMenu() { while IFS=': ' read KEY VALUE; do ITEMS+="${KEY}: ${VALUE}\n" done < <(readModelMap "${MODEL}" "productvers.[${PRODUCTVER}].cmdline") - dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Cmdline")" \ + dialog --backtitle "$(backtitle)" --title "$(TEXT "Cmdline")" \ --msgbox "${ITEMS}" 0 0 ;; e) return ;; @@ -692,19 +692,19 @@ function synoinfoMenu() { # menu loop while true; do - dialog --backtitle "$(backtitle)" --colors \ + dialog --backtitle "$(backtitle)" \ --menu "$(TEXT "Choose a option")" 0 0 0 --file "${TMP_PATH}/menu" \ 2>${TMP_PATH}/resp [ $? -ne 0 ] && return case "$(<${TMP_PATH}/resp)" in a) - dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Synoinfo")" \ + dialog --backtitle "$(backtitle)" --title "$(TEXT "Synoinfo")" \ --inputbox "$(TEXT "Type a name of synoinfo entry")" 0 0 \ 2>${TMP_PATH}/resp [ $? -ne 0 ] && continue NAME="$(<"${TMP_PATH}/resp")" [ -z "${NAME}" ] && continue - dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Synoinfo")" \ + dialog --backtitle "$(backtitle)" --title "$(TEXT "Synoinfo")" \ --inputbox "$(printf "$(TEXT "Type a value of '%s' synoinfo entry")" "${NAME}")" 0 0 "${SYNOINFO[${NAME}]}" \ 2>${TMP_PATH}/resp [ $? -ne 0 ] && continue @@ -715,7 +715,7 @@ function synoinfoMenu() { ;; d) if [ ${#SYNOINFO[@]} -eq 0 ]; then - dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Synoinfo")" \ + dialog --backtitle "$(backtitle)" --title "$(TEXT "Synoinfo")" \ --msgbox "$(TEXT "No synoinfo entries to remove")" 0 0 continue fi @@ -723,7 +723,7 @@ function synoinfoMenu() { for I in ${!SYNOINFO[@]}; do echo "\"${I}\" \"${SYNOINFO[${I}]}\" \"off\"" >>"${TMP_PATH}/opts" done - dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Synoinfo")" \ + dialog --backtitle "$(backtitle)" --title "$(TEXT "Synoinfo")" \ --checklist "$(TEXT "Select synoinfo entry to remove")" 0 0 0 --file "${TMP_PATH}/opts" \ 2>"${TMP_PATH}/resp" [ $? -ne 0 ] && continue @@ -740,7 +740,7 @@ function synoinfoMenu() { for KEY in ${!SYNOINFO[@]}; do ITEMS+="${KEY}: ${SYNOINFO[$KEY]}\n" done - dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Synoinfo")" \ + dialog --backtitle "$(backtitle)" --title "$(TEXT "Synoinfo")" \ --msgbox "${ITEMS}" 0 0 ;; e) return ;; @@ -795,7 +795,7 @@ function extractDsmFiles() { STATUS=$(curl -k -w "%{http_code}" -L "${PATURL}" -o "${PAT_PATH}" --progress-bar) if [ $? -ne 0 -o ${STATUS} -ne 200 ]; then rm "${PAT_PATH}" - dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Error")" \ + dialog --backtitle "$(backtitle)" --title "$(TEXT "Error")" \ --msgbox "$(TEXT "Check internet or cache disk space")" 0 0 return 1 fi @@ -803,7 +803,7 @@ function extractDsmFiles() { echo -n "$(printf "$(TEXT "Checking hash of %s: ")" "${PAT_FILE}")" if [ "$(md5sum ${PAT_PATH} | awk '{print $1}')" != "${PATSUM}" ]; then - dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Error")" \ + dialog --backtitle "$(backtitle)" --title "$(TEXT "Error")" \ --msgbox "$(TEXT "md5 Hash of pat not match, try again!")" 0 0 rm -f ${PAT_PATH} return 1 @@ -829,7 +829,7 @@ function extractDsmFiles() { isencrypted="yes" ;; *) - dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Error")" \ + dialog --backtitle "$(backtitle)" --title "$(TEXT "Error")" \ --msgbox "$(TEXT "Could not determine if pat file is encrypted or not, maybe corrupted, try again!")" 0 0 return 1 ;; @@ -857,7 +857,7 @@ function extractDsmFiles() { STATUS=$(curl -k -w "%{http_code}" -L "${OLDPATURL}" -o "${OLDPAT_PATH}" --progress-bar) if [ $? -ne 0 -o ${STATUS} -ne 200 ]; then rm "${OLDPAT_PATH}" - dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Error")" \ + dialog --backtitle "$(backtitle)" --title "$(TEXT "Error")" \ --msgbox "$(TEXT "Check internet or cache disk space")" 0 0 return 1 fi @@ -869,7 +869,7 @@ function extractDsmFiles() { if [ $? -ne 0 ]; then rm -f "${OLDPAT_PATH}" rm -rf "${RAMDISK_PATH}" - dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Error")" \ + dialog --backtitle "$(backtitle)" --title "$(TEXT "Error")" \ --textbox "${LOG_FILE}" 0 0 return 1 fi @@ -893,7 +893,7 @@ function extractDsmFiles() { echo "$(TEXT "Extracting...")" tar -xf "${PAT_PATH}" -C "${UNTAR_PAT_PATH}" >"${LOG_FILE}" 2>&1 if [ $? -ne 0 ]; then - dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Error")" \ + dialog --backtitle "$(backtitle)" --title "$(TEXT "Error")" \ --textbox "${LOG_FILE}" 0 0 fi fi @@ -901,7 +901,7 @@ function extractDsmFiles() { [ ! -f ${UNTAR_PAT_PATH}/GRUB_VER ] || [ ! -f ${UNTAR_PAT_PATH}/zImage ] || [ ! -f ${UNTAR_PAT_PATH}/rd.gz ]; then - dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Error")" \ + dialog --backtitle "$(backtitle)" --title "$(TEXT "Error")" \ --msgbox "$(TEXT "pat Invalid, try again!")" 0 0 return 1 fi @@ -949,7 +949,7 @@ function make() { while IFS=': ' read ADDON PARAM; do [ -z "${ADDON}" ] && continue if ! checkAddonExist "${ADDON}" "${PLATFORM}" "$([ -n "${KPRE}" ] && echo "${KPRE}-")${KVER}"; then - dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Error")" \ + dialog --backtitle "$(backtitle)" --title "$(TEXT "Error")" \ --msgbox "$(printf "$(TEXT "Addon %s not found!")" "${ADDON}")" 0 0 return 1 fi @@ -962,14 +962,14 @@ function make() { /opt/arpl/zimage-patch.sh if [ $? -ne 0 ]; then - dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Error")" \ + dialog --backtitle "$(backtitle)" --title "$(TEXT "Error")" \ --msgbox "$(TEXT "zImage not patched:\n")$(<"${LOG_FILE}")" 0 0 return 1 fi /opt/arpl/ramdisk-patch.sh if [ $? -ne 0 ]; then - dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Error")" \ + dialog --backtitle "$(backtitle)" --title "$(TEXT "Error")" \ --msgbox "$(TEXT "Ramdisk not patched:\n")$(<"${LOG_FILE}")" 0 0 return 1 fi @@ -1022,7 +1022,7 @@ function advancedMenu() { echo "g \"$(TEXT "Show dsm logo:") \Z4${DSMLOGO}\Zn\"" >>"${TMP_PATH}/menu" echo "e \"$(TEXT "Exit")\"" >>"${TMP_PATH}/menu" - dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Advanced")" \ + dialog --backtitle "$(backtitle)" --title "$(TEXT "Advanced")" \ --default-item "${NEXT}" --menu "$(TEXT "Choose the option")" 0 0 0 --file "${TMP_PATH}/menu" \ 2>${TMP_PATH}/resp [ $? -ne 0 ] && break @@ -1040,7 +1040,7 @@ function advancedMenu() { ;; w) ITEMS="$(echo -e "1 \n5 \n10 \n30 \n60 \n")" - dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Advanced")" \ + dialog --backtitle "$(backtitle)" --title "$(TEXT "Advanced")" \ --default-item "${BOOTIPWAIT}" --no-items --menu "$(TEXT "Choose a waiting time(seconds)")" 0 0 0 ${ITEMS} \ 2>${TMP_PATH}/resp [ $? -ne 0 ] && return @@ -1116,14 +1116,14 @@ function advancedMenu() { MSG+="\n" MSG+="$(printf "$(TEXT "\nTotal of ports: %s\n")" "${NUMPORTS}")" MSG+="$(TEXT "\nPorts with color \Z1red\Zn as DUMMY, color \Z2\Zbgreen\Zn has drive connected.")" - dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Advanced")" \ + dialog --backtitle "$(backtitle)" --title "$(TEXT "Advanced")" \ --msgbox "${MSG}" 0 0 ;; c) PATURL="$(readConfigKey "paturl" "${USER_CONFIG_FILE}")" PATSUM="$(readConfigKey "patsum" "${USER_CONFIG_FILE}")" MSG="$(TEXT "pat: (editable)")" - dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Advanced")" \ + dialog --backtitle "$(backtitle)" --title "$(TEXT "Advanced")" \ --form "${MSG}" 10 110 2 "URL" 1 1 "${PATURL}" 1 5 100 0 "MD5" 2 1 "${PATSUM}" 2 5 100 0 \ 2>"${TMP_PATH}/resp" [ $? -ne 0 ] && return @@ -1141,7 +1141,7 @@ function advancedMenu() { MSG+="$(TEXT "This feature will allow you to downgrade the installation by removing the VERSION file from the first partition of all disks.\n")" MSG+="$(TEXT "Therefore, please insert all disks before continuing.\n")" MSG+="$(TEXT "Warning:\nThis operation is irreversible. Please backup important data. Do you want to continue?")" - dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Advanced")" \ + dialog --backtitle "$(backtitle)" --title "$(TEXT "Advanced")" \ --yesno "${MSG}" 0 0 [ $? -ne 0 ] && return ( @@ -1154,10 +1154,10 @@ function advancedMenu() { umount "${I}" done rm -rf "${TMP_PATH}/sdX1" - ) | dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Advanced")" \ + ) | dialog --backtitle "$(backtitle)" --title "$(TEXT "Advanced")" \ --progressbox "$(TEXT "Removing ...")" 20 70 MSG="$(TEXT "Remove VERSION file for all disks completed.")" - dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Advanced")" \ + dialog --backtitle "$(backtitle)" --title "$(TEXT "Advanced")" \ --msgbox "${MSG}" 0 0 ;; f) @@ -1167,17 +1167,17 @@ function advancedMenu() { echo "${POSITION}" | grep -q "${LOADER_DEVICE_NAME}" && continue echo "\"${POSITION}\" \"${NAME}\" \"off\"" >>"${TMP_PATH}/opts" done < <(ls -l /dev/disk/by-id/ | sed 's|../..|/dev|g' | grep -E "/dev/sd|/dev/nvme" | awk -F' ' '{print $NF" "$(NF-2)}' | sort -uk 1,1) - dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Advanced")" \ + dialog --backtitle "$(backtitle)" --title "$(TEXT "Advanced")" \ --checklist "$(TEXT "Advanced")" 0 0 0 --file "${TMP_PATH}/opts" \ 2>${TMP_PATH}/resp [ $? -ne 0 ] && return RESP=$(<"${TMP_PATH}/resp") [ -z "${RESP}" ] && return - dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Advanced")" \ + dialog --backtitle "$(backtitle)" --title "$(TEXT "Advanced")" \ --yesno "$(TEXT "Warning:\nThis operation is irreversible. Please backup important data. Do you want to continue?")" 0 0 [ $? -ne 0 ] && return if [ $(ls /dev/md* | wc -l) -gt 0 ]; then - dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Advanced")" \ + dialog --backtitle "$(backtitle)" --title "$(TEXT "Advanced")" \ --yesno "$(TEXT "Warning:\nThe current hds is in raid, do you still want to format them?")" 0 0 [ $? -ne 0 ] && return for I in $(ls /dev/md*); do @@ -1188,9 +1188,9 @@ function advancedMenu() { for I in ${RESP}; do mkfs.ext4 -T largefile4 "${I}" done - ) | dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Advanced")" \ + ) | dialog --backtitle "$(backtitle)" --title "$(TEXT "Advanced")" \ --progressbox "$(TEXT "Formatting ...")" 20 70 - dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Advanced")" \ + dialog --backtitle "$(backtitle)" --title "$(TEXT "Advanced")" \ --msgbox "$(TEXT "Formatting is complete.")" 0 0 ;; x) @@ -1207,12 +1207,12 @@ function advancedMenu() { done rm -rf "${TMP_PATH}/sdX1" if [ -z "${SHADOW_FILE}" ]; then - dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Advanced")" \ + dialog --backtitle "$(backtitle)" --title "$(TEXT "Advanced")" \ --msgbox "$(TEXT "The installed Syno system not found in the currently inserted disks!")" 0 0 return fi ITEMS="$(cat "${SHADOW_FILE}" | awk -F ':' '{if ($2 != "*" && $2 != "!!") {print $1;}}')" - dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Advanced")" \ + dialog --backtitle "$(backtitle)" --title "$(TEXT "Advanced")" \ --no-items --menu "$(TEXT "Choose a user name")" 0 0 0 ${ITEMS} \ 2>${TMP_PATH}/resp [ $? -ne 0 ] && return @@ -1220,13 +1220,13 @@ function advancedMenu() { [ -z "${USER}" ] && return OLDPASSWD="$(cat "${SHADOW_FILE}" | grep "^${USER}:" | awk -F ':' '{print $2}')" while true; do - dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Advanced")" \ + dialog --backtitle "$(backtitle)" --title "$(TEXT "Advanced")" \ --inputbox "$(printf "$(TEXT "Type a new password for user '%s'")" "${USER}")" 0 0 "${CMDLINE[${NAME}]}" \ 2>${TMP_PATH}/resp [ $? -ne 0 ] && break 2 VALUE="$(<"${TMP_PATH}/resp")" [ -n "${VALUE}" ] && break - dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Advanced")" \ + dialog --backtitle "$(backtitle)" --title "$(TEXT "Advanced")" \ --msgbox "$(TEXT "Invalid password")" 0 0 done NEWPASSWD="$(python -c "import crypt,getpass;pw=\"${VALUE}\";print(crypt.crypt(pw))")" @@ -1239,19 +1239,19 @@ function advancedMenu() { umount "${I}" done rm -rf "${TMP_PATH}/sdX1" - ) | dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Advanced")" \ + ) | dialog --backtitle "$(backtitle)" --title "$(TEXT "Advanced")" \ --progressbox "$(TEXT "Resetting ...")" 20 70 [ -f "${SHADOW_FILE}" ] && rm -rf "${SHADOW_FILE}" - dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Advanced")" \ + dialog --backtitle "$(backtitle)" --title "$(TEXT "Advanced")" \ --msgbox "$(TEXT "Password reset completed.")" 0 0 - # dialog --backtitle "`backtitle`" --colors --title "$(TEXT "Advanced")" \ + # dialog --backtitle "`backtitle`" --title "$(TEXT "Advanced")" \ # --msgbox "$(TEXT "You came early, this function has not been implemented yet, hahaha!")" 0 0 ;; p) - dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Advanced")" \ + dialog --backtitle "$(backtitle)" --title "$(TEXT "Advanced")" \ --yesno "$(TEXT "Warning:\nDo not terminate midway, otherwise it may cause damage to the arpl. Do you want to continue?")" 0 0 [ $? -ne 0 ] && return - dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Advanced")" \ + dialog --backtitle "$(backtitle)" --title "$(TEXT "Advanced")" \ --infobox "$(TEXT "Saving ...")" 0 0 RDXZ_PATH="${TMP_PATH}/rdxz_tmp" mkdir -p "${RDXZ_PATH}" @@ -1266,16 +1266,16 @@ function advancedMenu() { find . 2>/dev/null | cpio -o -H newc -R root:root | xz --check=crc32 >"${ARPL_RAMDISK_FILE}" ) || true rm -rf "${RDXZ_PATH}" - dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Advanced")" \ + dialog --backtitle "$(backtitle)" --title "$(TEXT "Advanced")" \ --msgbox ""$(TEXT "Save is complete.")"" 0 0 ;; d) if ! tty | grep -q "/dev/pts"; then - dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Advanced")" \ + dialog --backtitle "$(backtitle)" --title "$(TEXT "Advanced")" \ --msgbox "$(TEXT "This feature is only available when accessed via web/ssh.")" 0 0 return fi - dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Advanced")" \ + dialog --backtitle "$(backtitle)" --title "$(TEXT "Advanced")" \ --msgbox "$(TEXT "Currently, only dts format files are supported. Please prepare and click to confirm uploading.\n(saved in /mnt/p3/users/)")" 0 0 TMP_UP_PATH="${TMP_PATH}/users" rm -rf "${TMP_UP_PATH}" @@ -1290,31 +1290,31 @@ function advancedMenu() { done popd if [ ${RET} -ne 0 -o -z "${USER_FILE}" ]; then - dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Advanced")" \ + dialog --backtitle "$(backtitle)" --title "$(TEXT "Advanced")" \ --msgbox "$(TEXT "Not a valid dts file, please try again!")" 0 0 else mkdir -p "${USER_UP_PATH}" cp -f "${USER_FILE}" "${USER_UP_PATH}/${MODEL}.dts" - dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Advanced")" \ + dialog --backtitle "$(backtitle)" --title "$(TEXT "Advanced")" \ --msgbox "$(TEXT "A valid dts file, Automatically import at compile time.")" 0 0 fi DIRTY=1 ;; b) if ! tty | grep -q "/dev/pts"; then - dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Advanced")" \ + dialog --backtitle "$(backtitle)" --title "$(TEXT "Advanced")" \ --msgbox "$(TEXT "This feature is only available when accessed via web/ssh.")" 0 0 return fi - dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Advanced")" \ + dialog --backtitle "$(backtitle)" --title "$(TEXT "Advanced")" \ --yesno "$(TEXT "Warning:\nDo not terminate midway, otherwise it may cause damage to the arpl. Do you want to continue?")" 0 0 [ $? -ne 0 ] && return - dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Advanced")" \ + dialog --backtitle "$(backtitle)" --title "$(TEXT "Advanced")" \ --infobox "$(TEXT "Backuping...")" 0 0 rm -f /var/www/data/backup.img.gz # thttpd root path dd if="${LOADER_DISK}" bs=1M conv=fsync | gzip >/var/www/data/backup.img.gz if [ $? -ne 0]; then - dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Advanced")" \ + dialog --backtitle "$(backtitle)" --title "$(TEXT "Advanced")" \ --msgbox "$(TEXT "Failed to generate backup. There may be insufficient memory. Please clear the cache and try again!")" 0 0 return fi @@ -1324,22 +1324,22 @@ function advancedMenu() { echo " ↑ " >>${TMP_PATH}/resp echo "$(TEXT "Click on the address above to download.")" >>${TMP_PATH}/resp echo "$(TEXT "Please confirm the completion of the download before closing this window.")" >>${TMP_PATH}/resp - dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Advanced")" \ + dialog --backtitle "$(backtitle)" --title "$(TEXT "Advanced")" \ --editbox "${TMP_PATH}/resp" 10 100 else # ssh sz -be /var/www/data/backup.img.gz fi - dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Advanced")" \ + dialog --backtitle "$(backtitle)" --title "$(TEXT "Advanced")" \ --msgbox "$(TEXT "backup is complete.")" 0 0 rm -f /var/www/data/backup.img.gz ;; r) if ! tty | grep -q "/dev/pts"; then - dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Advanced")" \ + dialog --backtitle "$(backtitle)" --title "$(TEXT "Advanced")" \ --msgbox "$(TEXT "This feature is only available when accessed via web/ssh.")" 0 0 return fi - dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Advanced")" \ + dialog --backtitle "$(backtitle)" --title "$(TEXT "Advanced")" \ --yesno "$(TEXT "Please upload the backup file.\nCurrently, zip(github) and img.gz(backup) compressed file formats are supported.")" 0 0 [ $? -ne 0 ] && return IFTOOL="" @@ -1356,16 +1356,16 @@ function advancedMenu() { done popd if [ -z "${IFTOOL}" -o -z "${TMP_UP_PATH}/${USER_FILE}" ]; then - dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Advanced")" \ + dialog --backtitle "$(backtitle)" --title "$(TEXT "Advanced")" \ --msgbox "$(printf "$(TEXT "Not a valid .zip/.img.gz file, please try again!")" "${USER_FILE}")" 0 0 else - dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Advanced")" \ + dialog --backtitle "$(backtitle)" --title "$(TEXT "Advanced")" \ --yesno "$(TEXT "Warning:\nDo not terminate midway, otherwise it may cause damage to the arpl. Do you want to continue?")" 0 0 [ $? -ne 0 ] && ( rm -f "${LOADER_DISK}" return ) - dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Advanced")" \ + dialog --backtitle "$(backtitle)" --title "$(TEXT "Advanced")" \ --infobox "$(TEXT "Writing...")" 0 0 umount "${BOOTLOADER_PATH}" "${SLPART_PATH}" "${CACHE_PATH}" if [ "${IFTOOL}" = "zip" ]; then @@ -1373,7 +1373,7 @@ function advancedMenu() { elif [ "${IFTOOL}" = "gzip" ]; then gzip -dc "${TMP_UP_PATH}/${USER_FILE}" | dd of="${LOADER_DISK}" bs=1M conv=fsync fi - dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Advanced")" \ + dialog --backtitle "$(backtitle)" --title "$(TEXT "Advanced")" \ --yesno "$(printf "$(TEXT "Restore bootloader disk with success to %s!\nReboot?")" "${USER_FILE}")" 0 0 [ $? -ne 0 ] && continue reboot @@ -1381,7 +1381,7 @@ function advancedMenu() { fi ;; o) - dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Advanced")" \ + dialog --backtitle "$(backtitle)" --title "$(TEXT "Advanced")" \ --yesno "$(TEXT "This option only installs opkg package management, allowing you to install more tools for use and debugging. Do you want to continue?")" 0 0 [ $? -ne 0 ] && return ( @@ -1390,9 +1390,9 @@ function advancedMenu() { source ~/.bashrc opkg update #opkg install python3 python3-pip - ) | dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Advanced")" \ + ) | dialog --backtitle "$(backtitle)" --title "$(TEXT "Advanced")" \ --progressbox "$(TEXT "opkg installing ...")" 20 70 - dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Advanced")" \ + dialog --backtitle "$(backtitle)" --title "$(TEXT "Advanced")" \ --msgbox "$(TEXT "opkg install is complete. Please reconnect to SSH/web, or execute 'source ~/.bashrc'")" 0 0 ;; g) @@ -1408,7 +1408,7 @@ function advancedMenu() { ############################################################################### # Try to recovery a DSM already installed function tryRecoveryDSM() { - dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Try recovery DSM")" \ + dialog --backtitle "$(backtitle)" --title "$(TEXT "Try recovery DSM")" \ --infobox "$(TEXT "Trying to recovery a DSM installed system")" 0 0 if findAndMountDSMRoot; then MODEL="" @@ -1445,14 +1445,14 @@ function tryRecoveryDSM() { SMALLNUM=${smallfixnumber} writeConfigKey "buildnum" "${BUILDNUM}" "${USER_CONFIG_FILE}" writeConfigKey "smallnum" "${SMALLNUM}" "${USER_CONFIG_FILE}" - dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Try recovery DSM")" \ + dialog --backtitle "$(backtitle)" --title "$(TEXT "Try recovery DSM")" \ --msgbox "${MSG}" 0 0 fi fi fi fi else - dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Try recovery DSM")" \ + dialog --backtitle "$(backtitle)" --title "$(TEXT "Try recovery DSM")" \ --msgbox "$(TEXT "Unfortunately I couldn't mount the DSM partition!")" 0 0 fi } @@ -1461,13 +1461,13 @@ function tryRecoveryDSM() { # Permits user edit the user config function editUserConfig() { while true; do - dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Edit with caution")" \ + dialog --backtitle "$(backtitle)" --title "$(TEXT "Edit with caution")" \ --editbox "${USER_CONFIG_FILE}" 0 0 2>"${TMP_PATH}/userconfig" [ $? -ne 0 ] && return mv "${TMP_PATH}/userconfig" "${USER_CONFIG_FILE}" ERRORS=$(yq eval "${USER_CONFIG_FILE}" 2>&1) [ $? -eq 0 ] && break - dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Edit with caution")" \ + dialog --backtitle "$(backtitle)" --title "$(TEXT "Edit with caution")" \ --msgbox "${ERRORS}" 0 0 done OLDMODEL=${MODEL} @@ -1489,7 +1489,7 @@ function editUserConfig() { ############################################################################### # Calls boot.sh to boot into DSM kernel/ramdisk function boot() { - [ ${DIRTY} -eq 1 ] && dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Alert")" \ + [ ${DIRTY} -eq 1 ] && dialog --backtitle "$(backtitle)" --title "$(TEXT "Alert")" \ --yesno "$(TEXT "Config changed, would you like to rebuild the loader?")" 0 0 if [ $? -eq 0 ]; then make || return @@ -1501,7 +1501,7 @@ function boot() { # Shows language to user choose one function languageMenu() { ITEMS="$(ls /usr/share/locale)" - dialog --backtitle "$(backtitle)" --colors \ + dialog --backtitle "$(backtitle)" \ --default-item "${LAYOUT}" --no-items --menu "$(TEXT "Choose a language")" 0 0 0 ${ITEMS} 2>${TMP_PATH}/resp [ $? -ne 0 ] && return resp=$(cat ${TMP_PATH}/resp 2>/dev/null) @@ -1515,7 +1515,7 @@ function languageMenu() { # Shows available keymaps to user choose one function keymapMenu() { OPTIONS="azerty bepo carpalx colemak dvorak fgGIod neo olpc qwerty qwertz" - dialog --backtitle "$(backtitle)" --colors \ + dialog --backtitle "$(backtitle)" \ --default-item "${LAYOUT}" --no-items --menu "$(TEXT "Choose a layout")" 0 0 0 ${OPTIONS} \ 2>${TMP_PATH}/resp [ $? -ne 0 ] && return @@ -1527,7 +1527,7 @@ function keymapMenu() { cd /usr/share/keymaps/i386/${LAYOUT} ls *.map.gz ) - dialog --backtitle "$(backtitle)" --colors \ + dialog --backtitle "$(backtitle)" \ --default-item "${KEYMAP}" --no-items --menu "$(TEXT "Choice a keymap")" 0 0 0 ${OPTIONS} \ 2>${TMP_PATH}/resp [ $? -ne 0 ] && return @@ -1549,7 +1549,7 @@ function downloadExts() { [ -n "${PROXY}" ] && [[ "${PROXY: -1}" != "/" ]] && PROXY="${PROXY}/" T="$(printf "$(TEXT "Update %s")" "${1}")" - dialog --backtitle "$(backtitle)" --colors --title "${T}" \ + dialog --backtitle "$(backtitle)" --title "${T}" \ --infobox "$(TEXT "Checking last version")" 0 0 # TAG=`curl -skL "${PROXY}https://api.github.com/repos/wjz304/arpl-addons/releases/latest" | grep "tag_name" | awk '{print substr($2, 2, length($2)-3)}'` # In the absence of authentication, the default API access count for GitHub is 60 per hour, so removing the use of api.github.com @@ -1558,35 +1558,35 @@ function downloadExts() { [ "${TAG:0:1}" = "v" ] && TAG="${TAG:1}" if [ -z "${TAG}" ]; then if [ ! "${5}" = "0" ]; then - dialog --backtitle "$(backtitle)" --colors --title "${T}" \ + dialog --backtitle "$(backtitle)" --title "${T}" \ --infobox "$(TEXT "Error checking new version")" 0 0 else - dialog --backtitle "$(backtitle)" --colors --title "${T}" \ + dialog --backtitle "$(backtitle)" --title "${T}" \ --msgbox "$(TEXT "Error checking new version")" 0 0 fi return 1 fi if [ "${2}" = "${TAG}" ]; then if [ ! "${5}" = "0" ]; then - dialog --backtitle "$(backtitle)" --colors --title "${T}" \ + dialog --backtitle "$(backtitle)" --title "${T}" \ --infobox "$(TEXT "No new version.")" 0 0 return 1 else - dialog --backtitle "$(backtitle)" --colors --title "${T}" \ + dialog --backtitle "$(backtitle)" --title "${T}" \ --yesno "$(printf "$(TEXT "No new version. Actual version is %s\nForce update?")" "${2}")" 0 0 [ $? -ne 0 ] && return 1 fi fi - dialog --backtitle "$(backtitle)" --colors --title "${T}" \ + dialog --backtitle "$(backtitle)" --title "${T}" \ --infobox "$(TEXT "Downloading last version")" 0 0 rm -f "${TMP_PATH}/${4}.zip" STATUS=$(curl -kL -w "%{http_code}" "${PROXY}${3}/releases/download/${TAG}/${4}.zip" -o "${TMP_PATH}/${4}.zip") if [ $? -ne 0 -o ${STATUS} -ne 200 ]; then if [ ! "${5}" = "0" ]; then - dialog --backtitle "$(backtitle)" --colors --title "${T}" \ + dialog --backtitle "$(backtitle)" --title "${T}" \ --infobox "$(TEXT "Error downloading new version")" 0 0 else - dialog --backtitle "$(backtitle)" --colors --title "${T}" \ + dialog --backtitle "$(backtitle)" --title "${T}" \ --msgbox "$(TEXT "Error downloading new version")" 0 0 fi return 1 @@ -1597,18 +1597,18 @@ function downloadExts() { # 1 - ext name function updateArpl() { T="$(printf "$(TEXT "Update %s")" "${1}")" - dialog --backtitle "$(backtitle)" --colors --title "${T}" \ + dialog --backtitle "$(backtitle)" --title "${T}" \ --infobox "$(TEXT "Extracting last version")" 0 0 unzip -oq "${TMP_PATH}/update.zip" -d "${TMP_PATH}/" if [ $? -ne 0 ]; then - dialog --backtitle "$(backtitle)" --colors --title "${T}" \ + dialog --backtitle "$(backtitle)" --title "${T}" \ --msgbox "$(TEXT "Error extracting update file")" 0 0 return 1 fi # Check checksums (cd /tmp && sha256sum --status -c sha256sum) if [ $? -ne 0 ]; then - dialog --backtitle "$(backtitle)" --colors --title "${T}" \ + dialog --backtitle "$(backtitle)" --title "${T}" \ --msgbox "$(TEXT "Checksum do not match!")" 0 0 return 1 fi @@ -1617,12 +1617,12 @@ function updateArpl() { chmod +x "${TMP_PATH}/update-check.sh" ${TMP_PATH}/update-check.sh if [ $? -ne 0 ]; then - dialog --backtitle "$(backtitle)" --colors --title "${T}" \ + dialog --backtitle "$(backtitle)" --title "${T}" \ --msgbox "$(TEXT "The current version does not support upgrading to the latest update.zip. Please remake the bootloader disk!")" 0 0 return 1 fi fi - dialog --backtitle "$(backtitle)" --colors --title "${T}" \ + dialog --backtitle "$(backtitle)" --title "${T}" \ --infobox "$(TEXT "Installing new files")" 0 0 # Process update-list.yml while read F; do @@ -1639,7 +1639,7 @@ function updateArpl() { mv "${TMP_PATH}/$(basename "${KEY}")" "${VALUE}" fi done < <(readConfigMap "replace" "${TMP_PATH}/update-list.yml") - dialog --backtitle "$(backtitle)" --colors --title "${T}" \ + dialog --backtitle "$(backtitle)" --title "${T}" \ --msgbox "$(printf "$(TEXT "Arpl updated with success to %s!\nReboot?")" "${TAG}")" 0 0 arpl-reboot.sh config } @@ -1648,13 +1648,13 @@ function updateArpl() { # 2 - silent function updateExts() { T="$(printf "$(TEXT "Update %s")" "${1}")" - dialog --backtitle "$(backtitle)" --colors --title "${T}" \ + dialog --backtitle "$(backtitle)" --title "${T}" \ --infobox "$(TEXT "Extracting last version")" 0 0 if [ "${1}" = "addons" ]; then rm -rf "${TMP_PATH}/addons" mkdir -p "${TMP_PATH}/addons" unzip "${TMP_PATH}/addons.zip" -d "${TMP_PATH}/addons" >/dev/null 2>&1 - dialog --backtitle "$(backtitle)" --colors --title "${T}" \ + dialog --backtitle "$(backtitle)" --title "${T}" \ --infobox "$(printf "$(TEXT "Installing new %s")" "${1}")" 0 0 rm -Rf "${ADDONS_PATH}/"* [ -f "${TMP_PATH}/addons/VERSION" ] && cp -f "${TMP_PATH}/addons/VERSION" "${ADDONS_PATH}/" @@ -1683,10 +1683,10 @@ function updateExts() { fi DIRTY=1 if [ ! "${2}" = "0" ]; then - dialog --backtitle "$(backtitle)" --colors --title "${T}" \ + dialog --backtitle "$(backtitle)" --title "${T}" \ --infobox "$(printf "$(TEXT "%s updated with success!")" "${1}")" 0 0 else - dialog --backtitle "$(backtitle)" --colors --title "${T}" \ + dialog --backtitle "$(backtitle)" --title "${T}" \ --msgbox "$(printf "$(TEXT "%s updated with success!")" "${1}")" 0 0 fi } @@ -1708,7 +1708,7 @@ function updateMenu() { echo "u \"$(TEXT "Local upload")\"" >>"${TMP_PATH}/menu" echo "e \"$(TEXT "Exit")\"" >>"${TMP_PATH}/menu" - dialog --backtitle "$(backtitle)" --colors \ + dialog --backtitle "$(backtitle)" \ --menu "$(TEXT "Choose a option")" 0 0 0 --file "${TMP_PATH}/menu" \ 2>${TMP_PATH}/resp [ $? -ne 0 ] && return @@ -1768,7 +1768,7 @@ function updateMenu() { p) RET=1 while true; do - dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Update")" \ + dialog --backtitle "$(backtitle)" --title "$(TEXT "Update")" \ --inputbox "$(TEXT "Please enter a proxy server url")" 0 0 "${PROXY}" \ 2>${TMP_PATH}/resp RET=$? @@ -1779,7 +1779,7 @@ function updateMenu() { elif [[ "${PROXYSERVER}" =~ "^(https?|ftp)://[^\s/$.?#].[^\s]*$" ]]; then break else - dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Update")" \ + dialog --backtitle "$(backtitle)" --title "$(TEXT "Update")" \ --yesno "$(TEXT "Invalid proxy server url, continue?")" 0 0 RET=$? [ ${RET} -eq 0 ] && break @@ -1790,7 +1790,7 @@ function updateMenu() { u) if ! tty | grep -q "/dev/pts"; then - dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Update")" \ + dialog --backtitle "$(backtitle)" --title "$(TEXT "Update")" \ --msgbox "$(TEXT "This feature is only available when accessed via web/ssh.")" 0 0 return fi @@ -1800,7 +1800,7 @@ function updateMenu() { MSG+="$(TEXT "Upload addons.zip will update Addons.\n")" MSG+="$(TEXT "Upload modules.zip will update Modules.\n")" MSG+="$(TEXT "Upload rp-lkms.zip will update LKMs.\n")" - dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Update")" \ + dialog --backtitle "$(backtitle)" --title "$(TEXT "Update")" \ --msgbox "${MSG}" 0 0 EXTS=("update.zip" "addons.zip" "modules.zip" "rp-lkms.zip") TMP_UP_PATH="${TMP_PATH}/users" @@ -1817,7 +1817,7 @@ function updateMenu() { done popd if [ -z "${USER_FILE}" ]; then - dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Update")" \ + dialog --backtitle "$(backtitle)" --title "$(TEXT "Update")" \ --msgbox "$(TEXT "Not a valid file, please try again!")" 0 0 else rm "${TMP_PATH}/${USER_FILE}" @@ -1831,7 +1831,7 @@ function updateMenu() { elif [ "${USER_FILE}" = "rp-lkms.zip" ]; then updateExts "LKMs" "0" else - dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Update")" \ + dialog --backtitle "$(backtitle)" --title "$(TEXT "Update")" \ --msgbox "$(TEXT "Not a valid file, please try again!")" 0 0 fi fi @@ -1879,7 +1879,7 @@ while true; do echo "p \"$(TEXT "Update menu")\"" >>"${TMP_PATH}/menu" echo "e \"$(TEXT "Exit")\"" >>"${TMP_PATH}/menu" - dialog --backtitle "$(backtitle)" --colors \ + dialog --backtitle "$(backtitle)" \ --default-item ${NEXT} --menu "$(TEXT "Choose the option")" 0 0 0 --file "${TMP_PATH}/menu" \ 2>${TMP_PATH}/resp [ $? -ne 0 ] && break @@ -1928,7 +1928,7 @@ while true; do NEXT="m" ;; c) - dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Cleaning")" \ + dialog --backtitle "$(backtitle)" --title "$(TEXT "Cleaning")" \ --prgbox "rm -rfv \"${CACHE_PATH}/dl\"" 0 0 NEXT="d" ;; @@ -1939,7 +1939,7 @@ while true; do e) NEXT="e" while true; do - dialog --backtitle "$(backtitle)" --colors \ + dialog --backtitle "$(backtitle)" \ --default-item ${NEXT} --menu "$(TEXT "Choose a action")" 0 0 0 \ p "$(TEXT "Poweroff")" \ r "$(TEXT "Reboot")" \ diff --git a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS1019+.yml b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS1019+.yml index d13303c9..bb231d70 100644 --- a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS1019+.yml +++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS1019+.yml @@ -20,12 +20,12 @@ platform: "apollolake" unique: "synology_apollolake_1019+" serial: prefix: - - "1850" - - "1880" + - "1850" + - "1880" middle: "QXR" suffix: "numeric" flags: -- "movbe" + - "movbe" dom: 2 dt: false disks: 4 @@ -39,11 +39,11 @@ productvers: synoinfo: <<: *synoinfo patch: - - "ramdisk-common-disable-root-pwd.patch" - - "ramdisk-25556-init-script.patch" - - "ramdisk-common-etc-rc.patch" - - "ramdisk-25556-post-init-script.patch" - - "ramdisk-common-disable-disabled-ports.patch" + - "ramdisk-common-disable-root-pwd.patch" + - "ramdisk-25556-init-script.patch" + - "ramdisk-common-etc-rc.patch" + - "ramdisk-25556-post-init-script.patch" + - "ramdisk-common-disable-disabled-ports.patch" "7.0": kver: "4.4.180" @@ -53,11 +53,11 @@ productvers: synoinfo: <<: *synoinfo patch: - - "ramdisk-common-disable-root-pwd.patch" - - "ramdisk-common-init-script.patch" - - "ramdisk-common-etc-rc.patch" - - "ramdisk-common-post-init-script.patch" - - "ramdisk-common-disable-disabled-ports.patch" + - "ramdisk-common-disable-root-pwd.patch" + - "ramdisk-common-init-script.patch" + - "ramdisk-common-etc-rc.patch" + - "ramdisk-common-post-init-script.patch" + - "ramdisk-common-disable-disabled-ports.patch" "7.1": kver: "4.4.180" @@ -67,11 +67,11 @@ productvers: synoinfo: <<: *synoinfo patch: - - "ramdisk-common-disable-root-pwd.patch" - - "ramdisk-common-init-script.patch" - - "ramdisk-common-etc-rc.patch" - - "ramdisk-42951-post-init-script.patch" - - "ramdisk-42661-disable-disabled-ports.patch" + - "ramdisk-common-disable-root-pwd.patch" + - "ramdisk-common-init-script.patch" + - "ramdisk-common-etc-rc.patch" + - "ramdisk-42951-post-init-script.patch" + - "ramdisk-42661-disable-disabled-ports.patch" "7.2": kver: "4.4.302" @@ -81,8 +81,8 @@ productvers: synoinfo: <<: *synoinfo patch: - - "ramdisk-64216-disable-root-pwd.patch" - - "ramdisk-64216-init-script.patch" - - "ramdisk-common-etc-rc.patch" - - "ramdisk-42951-post-init-script.patch" - - "ramdisk-42661-disable-disabled-ports.patch" + - "ramdisk-64216-disable-root-pwd.patch" + - "ramdisk-64216-init-script.patch" + - "ramdisk-common-etc-rc.patch" + - "ramdisk-42951-post-init-script.patch" + - "ramdisk-42661-disable-disabled-ports.patch" diff --git a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS1520+.yml b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS1520+.yml index a556ecd1..0730d611 100644 --- a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS1520+.yml +++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS1520+.yml @@ -20,7 +20,7 @@ platform: "geminilake" unique: "synology_geminilake_1520+" serial: prefix: - - "2060" + - "2060" middle: "RYR" suffix: "alpha" dom: 2 @@ -36,10 +36,10 @@ productvers: synoinfo: <<: *synoinfo patch: - - "ramdisk-common-disable-root-pwd.patch" - - "ramdisk-25556-init-script.patch" - - "ramdisk-common-etc-rc.patch" - - "ramdisk-25556-post-init-script.patch" + - "ramdisk-common-disable-root-pwd.patch" + - "ramdisk-25556-init-script.patch" + - "ramdisk-common-etc-rc.patch" + - "ramdisk-25556-post-init-script.patch" "7.0": kver: "4.4.180" @@ -49,10 +49,10 @@ productvers: synoinfo: <<: *synoinfo patch: - - "ramdisk-common-disable-root-pwd.patch" - - "ramdisk-common-init-script.patch" - - "ramdisk-common-etc-rc.patch" - - "ramdisk-common-post-init-script.patch" + - "ramdisk-common-disable-root-pwd.patch" + - "ramdisk-common-init-script.patch" + - "ramdisk-common-etc-rc.patch" + - "ramdisk-common-post-init-script.patch" "7.1": kver: "4.4.180" @@ -62,10 +62,10 @@ productvers: synoinfo: <<: *synoinfo patch: - - "ramdisk-common-disable-root-pwd.patch" - - "ramdisk-common-init-script.patch" - - "ramdisk-common-etc-rc.patch" - - "ramdisk-42951-post-init-script.patch" + - "ramdisk-common-disable-root-pwd.patch" + - "ramdisk-common-init-script.patch" + - "ramdisk-common-etc-rc.patch" + - "ramdisk-42951-post-init-script.patch" "7.2": kver: "4.4.302" @@ -75,7 +75,7 @@ productvers: synoinfo: <<: *synoinfo patch: - - "ramdisk-64216-disable-root-pwd.patch" - - "ramdisk-64216-init-script.patch" - - "ramdisk-common-etc-rc.patch" - - "ramdisk-42951-post-init-script.patch" + - "ramdisk-64216-disable-root-pwd.patch" + - "ramdisk-64216-init-script.patch" + - "ramdisk-common-etc-rc.patch" + - "ramdisk-42951-post-init-script.patch" diff --git a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS1621+.yml b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS1621+.yml index d6a4ae90..de6a4cd1 100644 --- a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS1621+.yml +++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS1621+.yml @@ -21,7 +21,7 @@ platform: "v1000" unique: "synology_v1000_1621+" serial: prefix: - - "2080" + - "2080" middle: "S7R" suffix: "alpha" dom: 2 @@ -37,10 +37,10 @@ productvers: synoinfo: <<: *synoinfo patch: - - "ramdisk-common-disable-root-pwd.patch" - - "ramdisk-25556-init-script.patch" - - "ramdisk-common-etc-rc.patch" - - "ramdisk-25556-post-init-script.patch" + - "ramdisk-common-disable-root-pwd.patch" + - "ramdisk-25556-init-script.patch" + - "ramdisk-common-etc-rc.patch" + - "ramdisk-25556-post-init-script.patch" "7.0": kver: "4.4.180" @@ -50,10 +50,10 @@ productvers: synoinfo: <<: *synoinfo patch: - - "ramdisk-common-disable-root-pwd.patch" - - "ramdisk-common-init-script.patch" - - "ramdisk-common-etc-rc.patch" - - "ramdisk-common-post-init-script.patch" + - "ramdisk-common-disable-root-pwd.patch" + - "ramdisk-common-init-script.patch" + - "ramdisk-common-etc-rc.patch" + - "ramdisk-common-post-init-script.patch" "7.1": kver: "4.4.180" @@ -63,10 +63,10 @@ productvers: synoinfo: <<: *synoinfo patch: - - "ramdisk-common-disable-root-pwd.patch" - - "ramdisk-common-init-script.patch" - - "ramdisk-common-etc-rc.patch" - - "ramdisk-42951-post-init-script.patch" + - "ramdisk-common-disable-root-pwd.patch" + - "ramdisk-common-init-script.patch" + - "ramdisk-common-etc-rc.patch" + - "ramdisk-42951-post-init-script.patch" "7.2": kver: "4.4.302" @@ -76,7 +76,7 @@ productvers: synoinfo: <<: *synoinfo patch: - - "ramdisk-64216-disable-root-pwd.patch" - - "ramdisk-64216-init-script.patch" - - "ramdisk-common-etc-rc.patch" - - "ramdisk-42951-post-init-script.patch" + - "ramdisk-64216-disable-root-pwd.patch" + - "ramdisk-64216-init-script.patch" + - "ramdisk-common-etc-rc.patch" + - "ramdisk-42951-post-init-script.patch" diff --git a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS1621xs+.yml b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS1621xs+.yml index 0a12a8e4..697e5096 100644 --- a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS1621xs+.yml +++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS1621xs+.yml @@ -20,7 +20,7 @@ platform: "broadwellnk" unique: "synology_broadwellnk_1621xs+" serial: prefix: - - "2070" + - "2070" middle: "RVR" suffix: "alpha" dom: 1 @@ -36,11 +36,11 @@ productvers: synoinfo: <<: *synoinfo patch: - - "ramdisk-common-disable-root-pwd.patch" - - "ramdisk-25556-init-script.patch" - - "ramdisk-common-etc-rc.patch" - - "ramdisk-25556-post-init-script.patch" - - "ramdisk-common-disable-disabled-ports.patch" + - "ramdisk-common-disable-root-pwd.patch" + - "ramdisk-25556-init-script.patch" + - "ramdisk-common-etc-rc.patch" + - "ramdisk-25556-post-init-script.patch" + - "ramdisk-common-disable-disabled-ports.patch" "7.0": kver: "4.4.180" @@ -50,11 +50,11 @@ productvers: synoinfo: <<: *synoinfo patch: - - "ramdisk-common-disable-root-pwd.patch" - - "ramdisk-common-init-script.patch" - - "ramdisk-common-etc-rc.patch" - - "ramdisk-common-post-init-script.patch" - - "ramdisk-common-disable-disabled-ports.patch" + - "ramdisk-common-disable-root-pwd.patch" + - "ramdisk-common-init-script.patch" + - "ramdisk-common-etc-rc.patch" + - "ramdisk-common-post-init-script.patch" + - "ramdisk-common-disable-disabled-ports.patch" "7.1": kver: "4.4.180" @@ -64,11 +64,11 @@ productvers: synoinfo: <<: *synoinfo patch: - - "ramdisk-common-disable-root-pwd.patch" - - "ramdisk-common-init-script.patch" - - "ramdisk-common-etc-rc.patch" - - "ramdisk-42951-post-init-script.patch" - - "ramdisk-42661-disable-disabled-ports.patch" + - "ramdisk-common-disable-root-pwd.patch" + - "ramdisk-common-init-script.patch" + - "ramdisk-common-etc-rc.patch" + - "ramdisk-42951-post-init-script.patch" + - "ramdisk-42661-disable-disabled-ports.patch" "7.2": kver: "4.4.302" @@ -78,8 +78,8 @@ productvers: synoinfo: <<: *synoinfo patch: - - "ramdisk-64216-disable-root-pwd.patch" - - "ramdisk-64216-init-script.patch" - - "ramdisk-common-etc-rc.patch" - - "ramdisk-42951-post-init-script.patch" - - "ramdisk-42661-disable-disabled-ports.patch" + - "ramdisk-64216-disable-root-pwd.patch" + - "ramdisk-64216-init-script.patch" + - "ramdisk-common-etc-rc.patch" + - "ramdisk-42951-post-init-script.patch" + - "ramdisk-42661-disable-disabled-ports.patch" diff --git a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS1819+.yml b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS1819+.yml index c63af52a..7f8b4942 100644 --- a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS1819+.yml +++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS1819+.yml @@ -19,7 +19,7 @@ platform: "denverton" unique: "synology_denverton_1819+" serial: prefix: - - "1890" + - "1890" middle: "R5R" suffix: "alpha" dom: 2 @@ -35,11 +35,11 @@ productvers: synoinfo: <<: *synoinfo patch: - - "ramdisk-common-disable-root-pwd.patch" - - "ramdisk-25556-init-script.patch" - - "ramdisk-common-etc-rc.patch" - - "ramdisk-25556-post-init-script.patch" - - "ramdisk-common-disable-disabled-ports.patch" + - "ramdisk-common-disable-root-pwd.patch" + - "ramdisk-25556-init-script.patch" + - "ramdisk-common-etc-rc.patch" + - "ramdisk-25556-post-init-script.patch" + - "ramdisk-common-disable-disabled-ports.patch" "7.0": kver: "4.4.180" @@ -49,11 +49,11 @@ productvers: synoinfo: <<: *synoinfo patch: - - "ramdisk-common-disable-root-pwd.patch" - - "ramdisk-common-init-script.patch" - - "ramdisk-common-etc-rc.patch" - - "ramdisk-common-post-init-script.patch" - - "ramdisk-common-disable-disabled-ports.patch" + - "ramdisk-common-disable-root-pwd.patch" + - "ramdisk-common-init-script.patch" + - "ramdisk-common-etc-rc.patch" + - "ramdisk-common-post-init-script.patch" + - "ramdisk-common-disable-disabled-ports.patch" "7.1": kver: "4.4.180" @@ -63,11 +63,11 @@ productvers: synoinfo: <<: *synoinfo patch: - - "ramdisk-common-disable-root-pwd.patch" - - "ramdisk-common-init-script.patch" - - "ramdisk-common-etc-rc.patch" - - "ramdisk-42951-post-init-script.patch" - - "ramdisk-42661-disable-disabled-ports.patch" + - "ramdisk-common-disable-root-pwd.patch" + - "ramdisk-common-init-script.patch" + - "ramdisk-common-etc-rc.patch" + - "ramdisk-42951-post-init-script.patch" + - "ramdisk-42661-disable-disabled-ports.patch" "7.2": kver: "4.4.302" @@ -77,8 +77,8 @@ productvers: synoinfo: <<: *synoinfo patch: - - "ramdisk-64216-disable-root-pwd.patch" - - "ramdisk-64216-init-script.patch" - - "ramdisk-common-etc-rc.patch" - - "ramdisk-42951-post-init-script.patch" - - "ramdisk-42661-disable-disabled-ports.patch" + - "ramdisk-64216-disable-root-pwd.patch" + - "ramdisk-64216-init-script.patch" + - "ramdisk-common-etc-rc.patch" + - "ramdisk-42951-post-init-script.patch" + - "ramdisk-42661-disable-disabled-ports.patch" diff --git a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS1821+.yml b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS1821+.yml index 3faca4c3..17d604ee 100644 --- a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS1821+.yml +++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS1821+.yml @@ -21,7 +21,7 @@ platform: "v1000" unique: "synology_v1000_1821+" serial: prefix: - - "2110" + - "2110" middle: "SKR" suffix: "alpha" dom: 2 @@ -37,10 +37,10 @@ productvers: synoinfo: <<: *synoinfo patch: - - "ramdisk-common-disable-root-pwd.patch" - - "ramdisk-25556-init-script.patch" - - "ramdisk-common-etc-rc.patch" - - "ramdisk-25556-post-init-script.patch" + - "ramdisk-common-disable-root-pwd.patch" + - "ramdisk-25556-init-script.patch" + - "ramdisk-common-etc-rc.patch" + - "ramdisk-25556-post-init-script.patch" "7.0": kver: "4.4.180" @@ -50,10 +50,10 @@ productvers: synoinfo: <<: *synoinfo patch: - - "ramdisk-common-disable-root-pwd.patch" - - "ramdisk-common-init-script.patch" - - "ramdisk-common-etc-rc.patch" - - "ramdisk-common-post-init-script.patch" + - "ramdisk-common-disable-root-pwd.patch" + - "ramdisk-common-init-script.patch" + - "ramdisk-common-etc-rc.patch" + - "ramdisk-common-post-init-script.patch" "7.1": kver: "4.4.180" @@ -63,10 +63,10 @@ productvers: synoinfo: <<: *synoinfo patch: - - "ramdisk-common-disable-root-pwd.patch" - - "ramdisk-common-init-script.patch" - - "ramdisk-common-etc-rc.patch" - - "ramdisk-42951-post-init-script.patch" + - "ramdisk-common-disable-root-pwd.patch" + - "ramdisk-common-init-script.patch" + - "ramdisk-common-etc-rc.patch" + - "ramdisk-42951-post-init-script.patch" "7.2": kver: "4.4.302" @@ -76,7 +76,7 @@ productvers: synoinfo: <<: *synoinfo patch: - - "ramdisk-64216-disable-root-pwd.patch" - - "ramdisk-64216-init-script.patch" - - "ramdisk-common-etc-rc.patch" - - "ramdisk-42951-post-init-script.patch" + - "ramdisk-64216-disable-root-pwd.patch" + - "ramdisk-64216-init-script.patch" + - "ramdisk-common-etc-rc.patch" + - "ramdisk-42951-post-init-script.patch" diff --git a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS1823xs+.yml b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS1823xs+.yml index 3a56d94e..4731245f 100644 --- a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS1823xs+.yml +++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS1823xs+.yml @@ -19,7 +19,7 @@ platform: "v1000" unique: "synology_v1000_1823xs+" serial: prefix: - - "2280" + - "2280" middle: "V5R" suffix: "alpha" dom: 2 @@ -35,10 +35,10 @@ productvers: synoinfo: <<: *synoinfo patch: - - "ramdisk-common-disable-root-pwd.patch" - - "ramdisk-common-init-script.patch" - - "ramdisk-common-etc-rc.patch" - - "ramdisk-42951-post-init-script.patch" + - "ramdisk-common-disable-root-pwd.patch" + - "ramdisk-common-init-script.patch" + - "ramdisk-common-etc-rc.patch" + - "ramdisk-42951-post-init-script.patch" "7.2": kver: "4.4.302" @@ -48,7 +48,7 @@ productvers: synoinfo: <<: *synoinfo patch: - - "ramdisk-64216-disable-root-pwd.patch" - - "ramdisk-64216-init-script.patch" - - "ramdisk-common-etc-rc.patch" - - "ramdisk-42951-post-init-script.patch" + - "ramdisk-64216-disable-root-pwd.patch" + - "ramdisk-64216-init-script.patch" + - "ramdisk-common-etc-rc.patch" + - "ramdisk-42951-post-init-script.patch" diff --git a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS220+.yml b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS220+.yml index 240c98a3..efbafeaf 100644 --- a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS220+.yml +++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS220+.yml @@ -21,7 +21,7 @@ platform: "geminilake" unique: "synology_geminilake_220+" serial: prefix: - - "0000" + - "0000" middle: "XXX" suffix: "alpha" dom: 2 @@ -37,10 +37,10 @@ productvers: synoinfo: <<: *synoinfo patch: - - "ramdisk-common-disable-root-pwd.patch" - - "ramdisk-25556-init-script.patch" - - "ramdisk-common-etc-rc.patch" - - "ramdisk-25556-post-init-script.patch" + - "ramdisk-common-disable-root-pwd.patch" + - "ramdisk-25556-init-script.patch" + - "ramdisk-common-etc-rc.patch" + - "ramdisk-25556-post-init-script.patch" "7.0": kver: "4.4.180" @@ -50,10 +50,10 @@ productvers: synoinfo: <<: *synoinfo patch: - - "ramdisk-common-disable-root-pwd.patch" - - "ramdisk-common-init-script.patch" - - "ramdisk-common-etc-rc.patch" - - "ramdisk-common-post-init-script.patch" + - "ramdisk-common-disable-root-pwd.patch" + - "ramdisk-common-init-script.patch" + - "ramdisk-common-etc-rc.patch" + - "ramdisk-common-post-init-script.patch" "7.1": kver: "4.4.180" @@ -63,10 +63,10 @@ productvers: synoinfo: <<: *synoinfo patch: - - "ramdisk-common-disable-root-pwd.patch" - - "ramdisk-common-init-script.patch" - - "ramdisk-common-etc-rc.patch" - - "ramdisk-42951-post-init-script.patch" + - "ramdisk-common-disable-root-pwd.patch" + - "ramdisk-common-init-script.patch" + - "ramdisk-common-etc-rc.patch" + - "ramdisk-42951-post-init-script.patch" "7.2": kver: "4.4.302" @@ -76,7 +76,7 @@ productvers: synoinfo: <<: *synoinfo patch: - - "ramdisk-64216-disable-root-pwd.patch" - - "ramdisk-64216-init-script.patch" - - "ramdisk-common-etc-rc.patch" - - "ramdisk-42951-post-init-script.patch" + - "ramdisk-64216-disable-root-pwd.patch" + - "ramdisk-64216-init-script.patch" + - "ramdisk-common-etc-rc.patch" + - "ramdisk-42951-post-init-script.patch" diff --git a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS2419+.yml b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS2419+.yml index 260d8f57..96e59323 100644 --- a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS2419+.yml +++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS2419+.yml @@ -19,7 +19,7 @@ platform: "denverton" unique: "synology_denverton_2419+" serial: prefix: - - "1880" + - "1880" middle: "QZA" suffix: "alpha" dom: 2 @@ -35,11 +35,11 @@ productvers: synoinfo: <<: *synoinfo patch: - - "ramdisk-common-disable-root-pwd.patch" - - "ramdisk-25556-init-script.patch" - - "ramdisk-common-etc-rc.patch" - - "ramdisk-25556-post-init-script.patch" - - "ramdisk-common-disable-disabled-ports.patch" + - "ramdisk-common-disable-root-pwd.patch" + - "ramdisk-25556-init-script.patch" + - "ramdisk-common-etc-rc.patch" + - "ramdisk-25556-post-init-script.patch" + - "ramdisk-common-disable-disabled-ports.patch" "7.0": kver: "4.4.180" @@ -49,11 +49,11 @@ productvers: synoinfo: <<: *synoinfo patch: - - "ramdisk-common-disable-root-pwd.patch" - - "ramdisk-common-init-script.patch" - - "ramdisk-common-etc-rc.patch" - - "ramdisk-common-post-init-script.patch" - - "ramdisk-common-disable-disabled-ports.patch" + - "ramdisk-common-disable-root-pwd.patch" + - "ramdisk-common-init-script.patch" + - "ramdisk-common-etc-rc.patch" + - "ramdisk-common-post-init-script.patch" + - "ramdisk-common-disable-disabled-ports.patch" "7.1": kver: "4.4.180" @@ -63,11 +63,11 @@ productvers: synoinfo: <<: *synoinfo patch: - - "ramdisk-common-disable-root-pwd.patch" - - "ramdisk-common-init-script.patch" - - "ramdisk-common-etc-rc.patch" - - "ramdisk-42951-post-init-script.patch" - - "ramdisk-42661-disable-disabled-ports.patch" + - "ramdisk-common-disable-root-pwd.patch" + - "ramdisk-common-init-script.patch" + - "ramdisk-common-etc-rc.patch" + - "ramdisk-42951-post-init-script.patch" + - "ramdisk-42661-disable-disabled-ports.patch" "7.2": kver: "4.4.302" @@ -77,8 +77,8 @@ productvers: synoinfo: <<: *synoinfo patch: - - "ramdisk-64216-disable-root-pwd.patch" - - "ramdisk-64216-init-script.patch" - - "ramdisk-common-etc-rc.patch" - - "ramdisk-42951-post-init-script.patch" - - "ramdisk-42661-disable-disabled-ports.patch" + - "ramdisk-64216-disable-root-pwd.patch" + - "ramdisk-64216-init-script.patch" + - "ramdisk-common-etc-rc.patch" + - "ramdisk-42951-post-init-script.patch" + - "ramdisk-42661-disable-disabled-ports.patch" diff --git a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS2422+.yml b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS2422+.yml index 97cc27d9..1fc45945 100644 --- a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS2422+.yml +++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS2422+.yml @@ -19,8 +19,8 @@ platform: "v1000" unique: "synology_v1000_2422+" serial: prefix: - - "2140" - - "2180" + - "2140" + - "2180" middle: "SLR" suffix: "alpha" dom: 2 @@ -36,10 +36,10 @@ productvers: synoinfo: <<: *synoinfo patch: - - "ramdisk-common-disable-root-pwd.patch" - - "ramdisk-common-init-script.patch" - - "ramdisk-common-etc-rc.patch" - - "ramdisk-common-post-init-script.patch" + - "ramdisk-common-disable-root-pwd.patch" + - "ramdisk-common-init-script.patch" + - "ramdisk-common-etc-rc.patch" + - "ramdisk-common-post-init-script.patch" "7.1": kver: "4.4.180" @@ -49,10 +49,10 @@ productvers: synoinfo: <<: *synoinfo patch: - - "ramdisk-common-disable-root-pwd.patch" - - "ramdisk-common-init-script.patch" - - "ramdisk-common-etc-rc.patch" - - "ramdisk-42951-post-init-script.patch" + - "ramdisk-common-disable-root-pwd.patch" + - "ramdisk-common-init-script.patch" + - "ramdisk-common-etc-rc.patch" + - "ramdisk-42951-post-init-script.patch" "7.2": kver: "4.4.302" @@ -62,7 +62,7 @@ productvers: synoinfo: <<: *synoinfo patch: - - "ramdisk-64216-disable-root-pwd.patch" - - "ramdisk-64216-init-script.patch" - - "ramdisk-common-etc-rc.patch" - - "ramdisk-42951-post-init-script.patch" + - "ramdisk-64216-disable-root-pwd.patch" + - "ramdisk-64216-init-script.patch" + - "ramdisk-common-etc-rc.patch" + - "ramdisk-42951-post-init-script.patch" diff --git a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS3615xs.yml b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS3615xs.yml index e0bbf209..5ee94d55 100644 --- a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS3615xs.yml +++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS3615xs.yml @@ -19,10 +19,10 @@ platform: "bromolow" unique: "synology_bromolow_3615xs" serial: prefix: - - "1130" - - "1230" - - "1330" - - "1430" + - "1130" + - "1230" + - "1330" + - "1430" middle: "LWN" suffix: "numeric" dom: 1 @@ -38,11 +38,11 @@ productvers: synoinfo: <<: *synoinfo patch: - - "ramdisk-common-disable-root-pwd.patch" - - "ramdisk-25556-init-script.patch" - - "ramdisk-common-etc-rc.patch" - - "ramdisk-25556-post-init-script.patch" - - "ramdisk-common-disable-disabled-ports.patch" + - "ramdisk-common-disable-root-pwd.patch" + - "ramdisk-25556-init-script.patch" + - "ramdisk-common-etc-rc.patch" + - "ramdisk-25556-post-init-script.patch" + - "ramdisk-common-disable-disabled-ports.patch" "7.0": kver: "3.10.108" @@ -52,11 +52,11 @@ productvers: synoinfo: <<: *synoinfo patch: - - "ramdisk-common-disable-root-pwd.patch" - - "ramdisk-common-init-script.patch" - - "ramdisk-common-etc-rc.patch" - - "ramdisk-common-post-init-script.patch" - - "ramdisk-common-disable-disabled-ports.patch" + - "ramdisk-common-disable-root-pwd.patch" + - "ramdisk-common-init-script.patch" + - "ramdisk-common-etc-rc.patch" + - "ramdisk-common-post-init-script.patch" + - "ramdisk-common-disable-disabled-ports.patch" "7.1": kver: "3.10.108" @@ -66,8 +66,8 @@ productvers: synoinfo: <<: *synoinfo patch: - - "ramdisk-common-disable-root-pwd.patch" - - "ramdisk-common-init-script.patch" - - "ramdisk-common-etc-rc.patch" - - "ramdisk-42951-post-init-script.patch" - - "ramdisk-42661-disable-disabled-ports.patch" + - "ramdisk-common-disable-root-pwd.patch" + - "ramdisk-common-init-script.patch" + - "ramdisk-common-etc-rc.patch" + - "ramdisk-42951-post-init-script.patch" + - "ramdisk-42661-disable-disabled-ports.patch" diff --git a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS3617xs.yml b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS3617xs.yml index ad01c5ea..e20c3955 100644 --- a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS3617xs.yml +++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS3617xs.yml @@ -19,10 +19,10 @@ platform: "broadwell" unique: "synology_broadwell_3617xs" serial: prefix: - - "1130" - - "1230" - - "1330" - - "1430" + - "1130" + - "1230" + - "1330" + - "1430" middle: "ODN" suffix: "numeric" dom: 1 @@ -38,11 +38,11 @@ productvers: synoinfo: <<: *synoinfo patch: - - "ramdisk-common-disable-root-pwd.patch" - - "ramdisk-25556-init-script.patch" - - "ramdisk-common-etc-rc.patch" - - "ramdisk-25556-post-init-script.patch" - - "ramdisk-common-disable-disabled-ports.patch" + - "ramdisk-common-disable-root-pwd.patch" + - "ramdisk-25556-init-script.patch" + - "ramdisk-common-etc-rc.patch" + - "ramdisk-25556-post-init-script.patch" + - "ramdisk-common-disable-disabled-ports.patch" "7.0": kver: "4.4.180" @@ -52,11 +52,11 @@ productvers: synoinfo: <<: *synoinfo patch: - - "ramdisk-common-disable-root-pwd.patch" - - "ramdisk-common-init-script.patch" - - "ramdisk-common-etc-rc.patch" - - "ramdisk-common-post-init-script.patch" - - "ramdisk-common-disable-disabled-ports.patch" + - "ramdisk-common-disable-root-pwd.patch" + - "ramdisk-common-init-script.patch" + - "ramdisk-common-etc-rc.patch" + - "ramdisk-common-post-init-script.patch" + - "ramdisk-common-disable-disabled-ports.patch" "7.1": kver: "4.4.180" @@ -66,11 +66,11 @@ productvers: synoinfo: <<: *synoinfo patch: - - "ramdisk-common-disable-root-pwd.patch" - - "ramdisk-common-init-script.patch" - - "ramdisk-common-etc-rc.patch" - - "ramdisk-42951-post-init-script.patch" - - "ramdisk-42661-disable-disabled-ports.patch" + - "ramdisk-common-disable-root-pwd.patch" + - "ramdisk-common-init-script.patch" + - "ramdisk-common-etc-rc.patch" + - "ramdisk-42951-post-init-script.patch" + - "ramdisk-42661-disable-disabled-ports.patch" "7.2": kver: "4.4.302" @@ -80,8 +80,8 @@ productvers: synoinfo: <<: *synoinfo patch: - - "ramdisk-64216-disable-root-pwd.patch" - - "ramdisk-64216-init-script.patch" - - "ramdisk-common-etc-rc.patch" - - "ramdisk-42951-post-init-script.patch" - - "ramdisk-42661-disable-disabled-ports.patch" + - "ramdisk-64216-disable-root-pwd.patch" + - "ramdisk-64216-init-script.patch" + - "ramdisk-common-etc-rc.patch" + - "ramdisk-42951-post-init-script.patch" + - "ramdisk-42661-disable-disabled-ports.patch" diff --git a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS3622xs+.yml b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS3622xs+.yml index 8e6b0928..2dbce4dc 100644 --- a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS3622xs+.yml +++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS3622xs+.yml @@ -20,7 +20,7 @@ platform: "broadwellnk" unique: "synology_broadwellnk_3622xs+" serial: prefix: - - "2150" + - "2150" middle: "SQR" suffix: "alpha" dom: 1 @@ -36,11 +36,11 @@ productvers: synoinfo: <<: *synoinfo patch: - - "ramdisk-common-disable-root-pwd.patch" - - "ramdisk-common-init-script.patch" - - "ramdisk-common-etc-rc.patch" - - "ramdisk-common-post-init-script.patch" - - "ramdisk-common-disable-disabled-ports.patch" + - "ramdisk-common-disable-root-pwd.patch" + - "ramdisk-common-init-script.patch" + - "ramdisk-common-etc-rc.patch" + - "ramdisk-common-post-init-script.patch" + - "ramdisk-common-disable-disabled-ports.patch" "7.1": kver: "4.4.180" @@ -50,11 +50,11 @@ productvers: synoinfo: <<: *synoinfo patch: - - "ramdisk-common-disable-root-pwd.patch" - - "ramdisk-common-init-script.patch" - - "ramdisk-common-etc-rc.patch" - - "ramdisk-42951-post-init-script.patch" - - "ramdisk-42661-disable-disabled-ports.patch" + - "ramdisk-common-disable-root-pwd.patch" + - "ramdisk-common-init-script.patch" + - "ramdisk-common-etc-rc.patch" + - "ramdisk-42951-post-init-script.patch" + - "ramdisk-42661-disable-disabled-ports.patch" "7.2": kver: "4.4.302" @@ -64,8 +64,8 @@ productvers: synoinfo: <<: *synoinfo patch: - - "ramdisk-64216-disable-root-pwd.patch" - - "ramdisk-64216-init-script.patch" - - "ramdisk-common-etc-rc.patch" - - "ramdisk-42951-post-init-script.patch" - - "ramdisk-42661-disable-disabled-ports.patch" + - "ramdisk-64216-disable-root-pwd.patch" + - "ramdisk-64216-init-script.patch" + - "ramdisk-common-etc-rc.patch" + - "ramdisk-42951-post-init-script.patch" + - "ramdisk-42661-disable-disabled-ports.patch" diff --git a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS423+.yml b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS423+.yml index 2dddd100..a9ab63a3 100644 --- a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS423+.yml +++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS423+.yml @@ -21,7 +21,7 @@ platform: "geminilake" unique: "synology_geminilake_423+" serial: prefix: - - "22A0" + - "22A0" middle: "VKR" suffix: "alpha" dom: 2 @@ -37,10 +37,10 @@ productvers: synoinfo: <<: *synoinfo patch: - - "ramdisk-common-disable-root-pwd.patch" - - "ramdisk-common-init-script.patch" - - "ramdisk-common-etc-rc.patch" - - "ramdisk-42951-post-init-script.patch" + - "ramdisk-common-disable-root-pwd.patch" + - "ramdisk-common-init-script.patch" + - "ramdisk-common-etc-rc.patch" + - "ramdisk-42951-post-init-script.patch" "7.2": kver: "4.4.302" @@ -50,7 +50,7 @@ productvers: synoinfo: <<: *synoinfo patch: - - "ramdisk-64216-disable-root-pwd.patch" - - "ramdisk-64216-init-script.patch" - - "ramdisk-common-etc-rc.patch" - - "ramdisk-42951-post-init-script.patch" + - "ramdisk-64216-disable-root-pwd.patch" + - "ramdisk-64216-init-script.patch" + - "ramdisk-common-etc-rc.patch" + - "ramdisk-42951-post-init-script.patch" diff --git a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS718+.yml b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS718+.yml index 37c3893e..7f2632e7 100644 --- a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS718+.yml +++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS718+.yml @@ -20,11 +20,11 @@ platform: "apollolake" unique: "synology_apollolake_718+" serial: prefix: - - "1930" + - "1930" middle: "PEN" suffix: "numeric" flags: -- "movbe" + - "movbe" dom: 2 dt: false disks: 4 @@ -38,11 +38,11 @@ productvers: synoinfo: <<: *synoinfo patch: - - "ramdisk-common-disable-root-pwd.patch" - - "ramdisk-25556-init-script.patch" - - "ramdisk-common-etc-rc.patch" - - "ramdisk-25556-post-init-script.patch" - - "ramdisk-common-disable-disabled-ports.patch" + - "ramdisk-common-disable-root-pwd.patch" + - "ramdisk-25556-init-script.patch" + - "ramdisk-common-etc-rc.patch" + - "ramdisk-25556-post-init-script.patch" + - "ramdisk-common-disable-disabled-ports.patch" "7.0": kver: "4.4.180" @@ -52,11 +52,11 @@ productvers: synoinfo: <<: *synoinfo patch: - - "ramdisk-common-disable-root-pwd.patch" - - "ramdisk-common-init-script.patch" - - "ramdisk-common-etc-rc.patch" - - "ramdisk-common-post-init-script.patch" - - "ramdisk-common-disable-disabled-ports.patch" + - "ramdisk-common-disable-root-pwd.patch" + - "ramdisk-common-init-script.patch" + - "ramdisk-common-etc-rc.patch" + - "ramdisk-common-post-init-script.patch" + - "ramdisk-common-disable-disabled-ports.patch" "7.1": kver: "4.4.180" @@ -66,11 +66,11 @@ productvers: synoinfo: <<: *synoinfo patch: - - "ramdisk-common-disable-root-pwd.patch" - - "ramdisk-common-init-script.patch" - - "ramdisk-common-etc-rc.patch" - - "ramdisk-42951-post-init-script.patch" - - "ramdisk-42661-disable-disabled-ports.patch" + - "ramdisk-common-disable-root-pwd.patch" + - "ramdisk-common-init-script.patch" + - "ramdisk-common-etc-rc.patch" + - "ramdisk-42951-post-init-script.patch" + - "ramdisk-42661-disable-disabled-ports.patch" "7.2": kver: "4.4.302" @@ -80,8 +80,8 @@ productvers: synoinfo: <<: *synoinfo patch: - - "ramdisk-64216-disable-root-pwd.patch" - - "ramdisk-64216-init-script.patch" - - "ramdisk-common-etc-rc.patch" - - "ramdisk-42951-post-init-script.patch" - - "ramdisk-42661-disable-disabled-ports.patch" + - "ramdisk-64216-disable-root-pwd.patch" + - "ramdisk-64216-init-script.patch" + - "ramdisk-common-etc-rc.patch" + - "ramdisk-42951-post-init-script.patch" + - "ramdisk-42661-disable-disabled-ports.patch" diff --git a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS720+.yml b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS720+.yml index 28e1ff87..14363895 100644 --- a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS720+.yml +++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS720+.yml @@ -20,8 +20,8 @@ platform: "geminilake" unique: "synology_geminilake_720+" serial: prefix: - - "2010" - - "2110" + - "2010" + - "2110" middle: "QWR" suffix: "alpha" dom: 2 @@ -37,10 +37,10 @@ productvers: synoinfo: <<: *synoinfo patch: - - "ramdisk-common-disable-root-pwd.patch" - - "ramdisk-25556-init-script.patch" - - "ramdisk-common-etc-rc.patch" - - "ramdisk-25556-post-init-script.patch" + - "ramdisk-common-disable-root-pwd.patch" + - "ramdisk-25556-init-script.patch" + - "ramdisk-common-etc-rc.patch" + - "ramdisk-25556-post-init-script.patch" "7.0": kver: "4.4.180" @@ -50,10 +50,10 @@ productvers: synoinfo: <<: *synoinfo patch: - - "ramdisk-common-disable-root-pwd.patch" - - "ramdisk-common-init-script.patch" - - "ramdisk-common-etc-rc.patch" - - "ramdisk-common-post-init-script.patch" + - "ramdisk-common-disable-root-pwd.patch" + - "ramdisk-common-init-script.patch" + - "ramdisk-common-etc-rc.patch" + - "ramdisk-common-post-init-script.patch" "7.1": kver: "4.4.180" @@ -63,10 +63,10 @@ productvers: synoinfo: <<: *synoinfo patch: - - "ramdisk-common-disable-root-pwd.patch" - - "ramdisk-common-init-script.patch" - - "ramdisk-common-etc-rc.patch" - - "ramdisk-42951-post-init-script.patch" + - "ramdisk-common-disable-root-pwd.patch" + - "ramdisk-common-init-script.patch" + - "ramdisk-common-etc-rc.patch" + - "ramdisk-42951-post-init-script.patch" "7.2": kver: "4.4.302" @@ -76,7 +76,7 @@ productvers: synoinfo: <<: *synoinfo patch: - - "ramdisk-64216-disable-root-pwd.patch" - - "ramdisk-64216-init-script.patch" - - "ramdisk-common-etc-rc.patch" - - "ramdisk-42951-post-init-script.patch" + - "ramdisk-64216-disable-root-pwd.patch" + - "ramdisk-64216-init-script.patch" + - "ramdisk-common-etc-rc.patch" + - "ramdisk-42951-post-init-script.patch" diff --git a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS723+.yml b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS723+.yml index 55fbbea2..90b01be5 100644 --- a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS723+.yml +++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS723+.yml @@ -19,7 +19,7 @@ platform: "r1000" unique: "synology_r1000_723+" serial: prefix: - - "2270" + - "2270" middle: "TQR" suffix: "alpha" dom: 2 @@ -35,10 +35,10 @@ productvers: synoinfo: <<: *synoinfo patch: - - "ramdisk-common-disable-root-pwd.patch" - - "ramdisk-common-init-script.patch" - - "ramdisk-common-etc-rc.patch" - - "ramdisk-42951-post-init-script.patch" + - "ramdisk-common-disable-root-pwd.patch" + - "ramdisk-common-init-script.patch" + - "ramdisk-common-etc-rc.patch" + - "ramdisk-42951-post-init-script.patch" "7.2": kver: "4.4.302" @@ -48,7 +48,7 @@ productvers: synoinfo: <<: *synoinfo patch: - - "ramdisk-64216-disable-root-pwd.patch" - - "ramdisk-64216-init-script.patch" - - "ramdisk-common-etc-rc.patch" - - "ramdisk-42951-post-init-script.patch" + - "ramdisk-64216-disable-root-pwd.patch" + - "ramdisk-64216-init-script.patch" + - "ramdisk-common-etc-rc.patch" + - "ramdisk-42951-post-init-script.patch" diff --git a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS918+.yml b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS918+.yml index 5783e645..34d0b530 100644 --- a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS918+.yml +++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS918+.yml @@ -20,11 +20,11 @@ platform: "apollolake" unique: "synology_apollolake_918+" serial: prefix: - - "1910" + - "1910" middle: "PDN" suffix: "numeric" flags: -- "movbe" + - "movbe" dom: 2 dt: false disks: 4 @@ -38,11 +38,11 @@ productvers: synoinfo: <<: *synoinfo patch: - - "ramdisk-common-disable-root-pwd.patch" - - "ramdisk-25556-init-script.patch" - - "ramdisk-common-etc-rc.patch" - - "ramdisk-25556-post-init-script.patch" - - "ramdisk-common-disable-disabled-ports.patch" + - "ramdisk-common-disable-root-pwd.patch" + - "ramdisk-25556-init-script.patch" + - "ramdisk-common-etc-rc.patch" + - "ramdisk-25556-post-init-script.patch" + - "ramdisk-common-disable-disabled-ports.patch" "7.0": kver: "4.4.180" @@ -52,11 +52,11 @@ productvers: synoinfo: <<: *synoinfo patch: - - "ramdisk-common-disable-root-pwd.patch" - - "ramdisk-common-init-script.patch" - - "ramdisk-common-etc-rc.patch" - - "ramdisk-common-post-init-script.patch" - - "ramdisk-common-disable-disabled-ports.patch" + - "ramdisk-common-disable-root-pwd.patch" + - "ramdisk-common-init-script.patch" + - "ramdisk-common-etc-rc.patch" + - "ramdisk-common-post-init-script.patch" + - "ramdisk-common-disable-disabled-ports.patch" "7.1": kver: "4.4.180" @@ -66,11 +66,11 @@ productvers: synoinfo: <<: *synoinfo patch: - - "ramdisk-common-disable-root-pwd.patch" - - "ramdisk-common-init-script.patch" - - "ramdisk-common-etc-rc.patch" - - "ramdisk-42951-post-init-script.patch" - - "ramdisk-42661-disable-disabled-ports.patch" + - "ramdisk-common-disable-root-pwd.patch" + - "ramdisk-common-init-script.patch" + - "ramdisk-common-etc-rc.patch" + - "ramdisk-42951-post-init-script.patch" + - "ramdisk-42661-disable-disabled-ports.patch" "7.2": kver: "4.4.302" @@ -80,8 +80,8 @@ productvers: synoinfo: <<: *synoinfo patch: - - "ramdisk-64216-disable-root-pwd.patch" - - "ramdisk-64216-init-script.patch" - - "ramdisk-common-etc-rc.patch" - - "ramdisk-42951-post-init-script.patch" - - "ramdisk-42661-disable-disabled-ports.patch" + - "ramdisk-64216-disable-root-pwd.patch" + - "ramdisk-64216-init-script.patch" + - "ramdisk-common-etc-rc.patch" + - "ramdisk-42951-post-init-script.patch" + - "ramdisk-42661-disable-disabled-ports.patch" diff --git a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS920+.yml b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS920+.yml index 48f99f03..3d3190b5 100644 --- a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS920+.yml +++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS920+.yml @@ -21,10 +21,10 @@ platform: "geminilake" unique: "synology_geminilake_920+" serial: prefix: - - "2030" - - "2040" - - "20C0" - - "2150" + - "2030" + - "2040" + - "20C0" + - "2150" middle: "SBR" suffix: "alpha" dom: 2 @@ -40,10 +40,10 @@ productvers: synoinfo: <<: *synoinfo patch: - - "ramdisk-common-disable-root-pwd.patch" - - "ramdisk-25556-init-script.patch" - - "ramdisk-common-etc-rc.patch" - - "ramdisk-25556-post-init-script.patch" + - "ramdisk-common-disable-root-pwd.patch" + - "ramdisk-25556-init-script.patch" + - "ramdisk-common-etc-rc.patch" + - "ramdisk-25556-post-init-script.patch" "7.0": kver: "4.4.180" @@ -53,10 +53,10 @@ productvers: synoinfo: <<: *synoinfo patch: - - "ramdisk-common-disable-root-pwd.patch" - - "ramdisk-common-init-script.patch" - - "ramdisk-common-etc-rc.patch" - - "ramdisk-common-post-init-script.patch" + - "ramdisk-common-disable-root-pwd.patch" + - "ramdisk-common-init-script.patch" + - "ramdisk-common-etc-rc.patch" + - "ramdisk-common-post-init-script.patch" "7.1": kver: "4.4.180" @@ -66,10 +66,10 @@ productvers: synoinfo: <<: *synoinfo patch: - - "ramdisk-common-disable-root-pwd.patch" - - "ramdisk-common-init-script.patch" - - "ramdisk-common-etc-rc.patch" - - "ramdisk-42951-post-init-script.patch" + - "ramdisk-common-disable-root-pwd.patch" + - "ramdisk-common-init-script.patch" + - "ramdisk-common-etc-rc.patch" + - "ramdisk-42951-post-init-script.patch" "7.2": kver: "4.4.302" @@ -79,7 +79,7 @@ productvers: synoinfo: <<: *synoinfo patch: - - "ramdisk-64216-disable-root-pwd.patch" - - "ramdisk-64216-init-script.patch" - - "ramdisk-common-etc-rc.patch" - - "ramdisk-42951-post-init-script.patch" + - "ramdisk-64216-disable-root-pwd.patch" + - "ramdisk-64216-init-script.patch" + - "ramdisk-common-etc-rc.patch" + - "ramdisk-42951-post-init-script.patch" diff --git a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS923+.yml b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS923+.yml index 629bf453..12e2af1e 100644 --- a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS923+.yml +++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS923+.yml @@ -19,7 +19,7 @@ platform: "r1000" unique: "synology_r1000_923+" serial: prefix: - - "2270" + - "2270" middle: "TQR" suffix: "alpha" dom: 2 @@ -35,10 +35,10 @@ productvers: synoinfo: <<: *synoinfo patch: - - "ramdisk-common-disable-root-pwd.patch" - - "ramdisk-common-init-script.patch" - - "ramdisk-common-etc-rc.patch" - - "ramdisk-42951-post-init-script.patch" + - "ramdisk-common-disable-root-pwd.patch" + - "ramdisk-common-init-script.patch" + - "ramdisk-common-etc-rc.patch" + - "ramdisk-42951-post-init-script.patch" "7.2": kver: "4.4.302" @@ -48,7 +48,7 @@ productvers: synoinfo: <<: *synoinfo patch: - - "ramdisk-64216-disable-root-pwd.patch" - - "ramdisk-64216-init-script.patch" - - "ramdisk-common-etc-rc.patch" - - "ramdisk-42951-post-init-script.patch" + - "ramdisk-64216-disable-root-pwd.patch" + - "ramdisk-64216-init-script.patch" + - "ramdisk-common-etc-rc.patch" + - "ramdisk-42951-post-init-script.patch" diff --git a/files/board/arpl/overlayfs/opt/arpl/model-configs/DVA1622.yml b/files/board/arpl/overlayfs/opt/arpl/model-configs/DVA1622.yml index 8c7bcb82..d27a63a4 100644 --- a/files/board/arpl/overlayfs/opt/arpl/model-configs/DVA1622.yml +++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/DVA1622.yml @@ -20,10 +20,10 @@ platform: "geminilake" unique: "synology_geminilake_dva1622" serial: prefix: - - "2030" - - "2040" - - "20C0" - - "2150" + - "2030" + - "2040" + - "20C0" + - "2150" middle: "UBR" suffix: "alpha" dom: 2 @@ -39,10 +39,10 @@ productvers: synoinfo: <<: *synoinfo patch: - - "ramdisk-common-disable-root-pwd.patch" - - "ramdisk-common-init-script.patch" - - "ramdisk-common-etc-rc.patch" - - "ramdisk-42951-post-init-script.patch" + - "ramdisk-common-disable-root-pwd.patch" + - "ramdisk-common-init-script.patch" + - "ramdisk-common-etc-rc.patch" + - "ramdisk-42951-post-init-script.patch" "7.2": kver: "4.4.302" @@ -52,7 +52,7 @@ productvers: synoinfo: <<: *synoinfo patch: - - "ramdisk-64216-disable-root-pwd.patch" - - "ramdisk-64216-init-script.patch" - - "ramdisk-common-etc-rc.patch" - - "ramdisk-42951-post-init-script.patch" + - "ramdisk-64216-disable-root-pwd.patch" + - "ramdisk-64216-init-script.patch" + - "ramdisk-common-etc-rc.patch" + - "ramdisk-42951-post-init-script.patch" diff --git a/files/board/arpl/overlayfs/opt/arpl/model-configs/DVA3219.yml b/files/board/arpl/overlayfs/opt/arpl/model-configs/DVA3219.yml index f313973c..a1a08acf 100644 --- a/files/board/arpl/overlayfs/opt/arpl/model-configs/DVA3219.yml +++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/DVA3219.yml @@ -19,12 +19,12 @@ platform: "denverton" unique: "synology_denverton_dva3219" serial: prefix: - - "1930" - - "1940" + - "1930" + - "1940" middle: "RFR" suffix: "alpha" flags: -- "movbe" + - "movbe" dom: 2 dt: false disks: 4 @@ -38,11 +38,11 @@ productvers: synoinfo: <<: *synoinfo patch: - - "ramdisk-common-disable-root-pwd.patch" - - "ramdisk-25556-init-script.patch" - - "ramdisk-common-etc-rc.patch" - - "ramdisk-25556-post-init-script.patch" - - "ramdisk-common-disable-disabled-ports.patch" + - "ramdisk-common-disable-root-pwd.patch" + - "ramdisk-25556-init-script.patch" + - "ramdisk-common-etc-rc.patch" + - "ramdisk-25556-post-init-script.patch" + - "ramdisk-common-disable-disabled-ports.patch" "7.0": kver: "4.4.180" @@ -52,11 +52,11 @@ productvers: synoinfo: <<: *synoinfo patch: - - "ramdisk-common-disable-root-pwd.patch" - - "ramdisk-common-init-script.patch" - - "ramdisk-common-etc-rc.patch" - - "ramdisk-common-post-init-script.patch" - - "ramdisk-common-disable-disabled-ports.patch" + - "ramdisk-common-disable-root-pwd.patch" + - "ramdisk-common-init-script.patch" + - "ramdisk-common-etc-rc.patch" + - "ramdisk-common-post-init-script.patch" + - "ramdisk-common-disable-disabled-ports.patch" "7.1": kver: "4.4.180" @@ -66,11 +66,11 @@ productvers: synoinfo: <<: *synoinfo patch: - - "ramdisk-common-disable-root-pwd.patch" - - "ramdisk-common-init-script.patch" - - "ramdisk-common-etc-rc.patch" - - "ramdisk-42951-post-init-script.patch" - - "ramdisk-42661-disable-disabled-ports.patch" + - "ramdisk-common-disable-root-pwd.patch" + - "ramdisk-common-init-script.patch" + - "ramdisk-common-etc-rc.patch" + - "ramdisk-42951-post-init-script.patch" + - "ramdisk-42661-disable-disabled-ports.patch" "7.2": kver: "4.4.302" @@ -80,8 +80,8 @@ productvers: synoinfo: <<: *synoinfo patch: - - "ramdisk-64216-disable-root-pwd.patch" - - "ramdisk-64216-init-script.patch" - - "ramdisk-common-etc-rc.patch" - - "ramdisk-42951-post-init-script.patch" - - "ramdisk-42661-disable-disabled-ports.patch" + - "ramdisk-64216-disable-root-pwd.patch" + - "ramdisk-64216-init-script.patch" + - "ramdisk-common-etc-rc.patch" + - "ramdisk-42951-post-init-script.patch" + - "ramdisk-42661-disable-disabled-ports.patch" diff --git a/files/board/arpl/overlayfs/opt/arpl/model-configs/DVA3221.yml b/files/board/arpl/overlayfs/opt/arpl/model-configs/DVA3221.yml index 401a204e..d344f7a5 100644 --- a/files/board/arpl/overlayfs/opt/arpl/model-configs/DVA3221.yml +++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/DVA3221.yml @@ -19,14 +19,14 @@ platform: "denverton" unique: "synology_denverton_dva3221" serial: prefix: - - "2030" - - "2040" - - "20C0" - - "2150" + - "2030" + - "2040" + - "20C0" + - "2150" middle: "SJR" suffix: "alpha" flags: -- "movbe" + - "movbe" dom: 2 dt: false disks: 4 @@ -40,11 +40,11 @@ productvers: synoinfo: <<: *synoinfo patch: - - "ramdisk-common-disable-root-pwd.patch" - - "ramdisk-25556-init-script.patch" - - "ramdisk-common-etc-rc.patch" - - "ramdisk-25556-post-init-script.patch" - - "ramdisk-common-disable-disabled-ports.patch" + - "ramdisk-common-disable-root-pwd.patch" + - "ramdisk-25556-init-script.patch" + - "ramdisk-common-etc-rc.patch" + - "ramdisk-25556-post-init-script.patch" + - "ramdisk-common-disable-disabled-ports.patch" "7.0": kver: "4.4.180" @@ -54,11 +54,11 @@ productvers: synoinfo: <<: *synoinfo patch: - - "ramdisk-common-disable-root-pwd.patch" - - "ramdisk-common-init-script.patch" - - "ramdisk-common-etc-rc.patch" - - "ramdisk-common-post-init-script.patch" - - "ramdisk-common-disable-disabled-ports.patch" + - "ramdisk-common-disable-root-pwd.patch" + - "ramdisk-common-init-script.patch" + - "ramdisk-common-etc-rc.patch" + - "ramdisk-common-post-init-script.patch" + - "ramdisk-common-disable-disabled-ports.patch" "7.1": kver: "4.4.180" @@ -68,11 +68,11 @@ productvers: synoinfo: <<: *synoinfo patch: - - "ramdisk-common-disable-root-pwd.patch" - - "ramdisk-common-init-script.patch" - - "ramdisk-common-etc-rc.patch" - - "ramdisk-42951-post-init-script.patch" - - "ramdisk-42661-disable-disabled-ports.patch" + - "ramdisk-common-disable-root-pwd.patch" + - "ramdisk-common-init-script.patch" + - "ramdisk-common-etc-rc.patch" + - "ramdisk-42951-post-init-script.patch" + - "ramdisk-42661-disable-disabled-ports.patch" "7.2": kver: "4.4.302" @@ -82,8 +82,8 @@ productvers: synoinfo: <<: *synoinfo patch: - - "ramdisk-64216-disable-root-pwd.patch" - - "ramdisk-64216-init-script.patch" - - "ramdisk-common-etc-rc.patch" - - "ramdisk-42951-post-init-script.patch" - - "ramdisk-42661-disable-disabled-ports.patch" + - "ramdisk-64216-disable-root-pwd.patch" + - "ramdisk-64216-init-script.patch" + - "ramdisk-common-etc-rc.patch" + - "ramdisk-42951-post-init-script.patch" + - "ramdisk-42661-disable-disabled-ports.patch" diff --git a/files/board/arpl/overlayfs/opt/arpl/model-configs/FS2500.yml b/files/board/arpl/overlayfs/opt/arpl/model-configs/FS2500.yml index 10c3c520..a45a87e5 100644 --- a/files/board/arpl/overlayfs/opt/arpl/model-configs/FS2500.yml +++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/FS2500.yml @@ -19,7 +19,7 @@ platform: "v1000" unique: "synology_v1000_fs2500" serial: prefix: - - "1960" + - "1960" middle: "PSN" suffix: "numeric" dom: 2 @@ -35,10 +35,10 @@ productvers: synoinfo: <<: *synoinfo patch: - - "ramdisk-common-disable-root-pwd.patch" - - "ramdisk-common-init-script.patch" - - "ramdisk-common-etc-rc.patch" - - "ramdisk-common-post-init-script.patch" + - "ramdisk-common-disable-root-pwd.patch" + - "ramdisk-common-init-script.patch" + - "ramdisk-common-etc-rc.patch" + - "ramdisk-common-post-init-script.patch" "7.1": kver: "4.4.180" @@ -48,10 +48,10 @@ productvers: synoinfo: <<: *synoinfo patch: - - "ramdisk-common-disable-root-pwd.patch" - - "ramdisk-common-init-script.patch" - - "ramdisk-common-etc-rc.patch" - - "ramdisk-42951-post-init-script.patch" + - "ramdisk-common-disable-root-pwd.patch" + - "ramdisk-common-init-script.patch" + - "ramdisk-common-etc-rc.patch" + - "ramdisk-42951-post-init-script.patch" "7.2": kver: "4.4.302" @@ -61,7 +61,7 @@ productvers: synoinfo: <<: *synoinfo patch: - - "ramdisk-64216-disable-root-pwd.patch" - - "ramdisk-64216-init-script.patch" - - "ramdisk-common-etc-rc.patch" - - "ramdisk-42951-post-init-script.patch" + - "ramdisk-64216-disable-root-pwd.patch" + - "ramdisk-64216-init-script.patch" + - "ramdisk-common-etc-rc.patch" + - "ramdisk-42951-post-init-script.patch" diff --git a/files/board/arpl/overlayfs/opt/arpl/model-configs/FS3017.yml.disabled b/files/board/arpl/overlayfs/opt/arpl/model-configs/FS3017.yml.disabled index 1033a2f3..d5a19d6d 100644 --- a/files/board/arpl/overlayfs/opt/arpl/model-configs/FS3017.yml.disabled +++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/FS3017.yml.disabled @@ -75,4 +75,4 @@ productvers: - "ramdisk-64216-disable-root-pwd.patch" - "ramdisk-64216-init-script.patch" - "ramdisk-common-etc-rc.patch" - - "ramdisk-42951-post-init-script.patch" \ No newline at end of file + - "ramdisk-42951-post-init-script.patch" diff --git a/files/board/arpl/overlayfs/opt/arpl/model-configs/FS6400.yml.disabled b/files/board/arpl/overlayfs/opt/arpl/model-configs/FS6400.yml.disabled index 21e49ba1..0b5518d4 100644 --- a/files/board/arpl/overlayfs/opt/arpl/model-configs/FS6400.yml.disabled +++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/FS6400.yml.disabled @@ -77,4 +77,4 @@ productvers: - "ramdisk-64216-disable-root-pwd.patch" - "ramdisk-64216-init-script.patch" - "ramdisk-common-etc-rc.patch" - - "ramdisk-42951-post-init-script.patch" \ No newline at end of file + - "ramdisk-42951-post-init-script.patch" diff --git a/files/board/arpl/overlayfs/opt/arpl/model-configs/RS1221+.yml b/files/board/arpl/overlayfs/opt/arpl/model-configs/RS1221+.yml index c09ee08a..82fb4c96 100644 --- a/files/board/arpl/overlayfs/opt/arpl/model-configs/RS1221+.yml +++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/RS1221+.yml @@ -22,7 +22,7 @@ platform: "v1000" unique: "synology_v1000_rs1221+" serial: prefix: - - "20B0" + - "20B0" middle: "RWR" suffix: "alpha" dom: 2 @@ -38,10 +38,10 @@ productvers: synoinfo: <<: *synoinfo patch: - - "ramdisk-common-disable-root-pwd.patch" - - "ramdisk-25556-init-script.patch" - - "ramdisk-common-etc-rc.patch" - - "ramdisk-25556-post-init-script.patch" + - "ramdisk-common-disable-root-pwd.patch" + - "ramdisk-25556-init-script.patch" + - "ramdisk-common-etc-rc.patch" + - "ramdisk-25556-post-init-script.patch" "7.0": kver: "4.4.180" @@ -51,10 +51,10 @@ productvers: synoinfo: <<: *synoinfo patch: - - "ramdisk-common-disable-root-pwd.patch" - - "ramdisk-common-init-script.patch" - - "ramdisk-common-etc-rc.patch" - - "ramdisk-common-post-init-script.patch" + - "ramdisk-common-disable-root-pwd.patch" + - "ramdisk-common-init-script.patch" + - "ramdisk-common-etc-rc.patch" + - "ramdisk-common-post-init-script.patch" "7.1": kver: "4.4.180" @@ -64,10 +64,10 @@ productvers: synoinfo: <<: *synoinfo patch: - - "ramdisk-common-disable-root-pwd.patch" - - "ramdisk-common-init-script.patch" - - "ramdisk-common-etc-rc.patch" - - "ramdisk-42951-post-init-script.patch" + - "ramdisk-common-disable-root-pwd.patch" + - "ramdisk-common-init-script.patch" + - "ramdisk-common-etc-rc.patch" + - "ramdisk-42951-post-init-script.patch" "7.2": kver: "4.4.302" @@ -77,7 +77,7 @@ productvers: synoinfo: <<: *synoinfo patch: - - "ramdisk-64216-disable-root-pwd.patch" - - "ramdisk-64216-init-script.patch" - - "ramdisk-common-etc-rc.patch" - - "ramdisk-42951-post-init-script.patch" + - "ramdisk-64216-disable-root-pwd.patch" + - "ramdisk-64216-init-script.patch" + - "ramdisk-common-etc-rc.patch" + - "ramdisk-42951-post-init-script.patch" diff --git a/files/board/arpl/overlayfs/opt/arpl/model-configs/RS1619xs+.yml b/files/board/arpl/overlayfs/opt/arpl/model-configs/RS1619xs+.yml index 9fd94174..0bb0c3ff 100644 --- a/files/board/arpl/overlayfs/opt/arpl/model-configs/RS1619xs+.yml +++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/RS1619xs+.yml @@ -19,7 +19,7 @@ platform: "broadwellnk" unique: "synology_broadwellnk_rs1619xs+" serial: prefix: - - "1920" + - "1920" middle: "QPR" suffix: "alpha" dom: 2 @@ -35,11 +35,11 @@ productvers: synoinfo: <<: *synoinfo patch: - - "ramdisk-common-disable-root-pwd.patch" - - "ramdisk-25556-init-script.patch" - - "ramdisk-common-etc-rc.patch" - - "ramdisk-25556-post-init-script.patch" - - "ramdisk-common-disable-disabled-ports.patch" + - "ramdisk-common-disable-root-pwd.patch" + - "ramdisk-25556-init-script.patch" + - "ramdisk-common-etc-rc.patch" + - "ramdisk-25556-post-init-script.patch" + - "ramdisk-common-disable-disabled-ports.patch" "7.0": kver: "4.4.180" @@ -49,11 +49,11 @@ productvers: synoinfo: <<: *synoinfo patch: - - "ramdisk-common-disable-root-pwd.patch" - - "ramdisk-common-init-script.patch" - - "ramdisk-common-etc-rc.patch" - - "ramdisk-common-post-init-script.patch" - - "ramdisk-common-disable-disabled-ports.patch" + - "ramdisk-common-disable-root-pwd.patch" + - "ramdisk-common-init-script.patch" + - "ramdisk-common-etc-rc.patch" + - "ramdisk-common-post-init-script.patch" + - "ramdisk-common-disable-disabled-ports.patch" "7.1": kver: "4.4.180" @@ -63,11 +63,11 @@ productvers: synoinfo: <<: *synoinfo patch: - - "ramdisk-common-disable-root-pwd.patch" - - "ramdisk-common-init-script.patch" - - "ramdisk-common-etc-rc.patch" - - "ramdisk-42951-post-init-script.patch" - - "ramdisk-42661-disable-disabled-ports.patch" + - "ramdisk-common-disable-root-pwd.patch" + - "ramdisk-common-init-script.patch" + - "ramdisk-common-etc-rc.patch" + - "ramdisk-42951-post-init-script.patch" + - "ramdisk-42661-disable-disabled-ports.patch" "7.2": kver: "4.4.302" @@ -77,8 +77,8 @@ productvers: synoinfo: <<: *synoinfo patch: - - "ramdisk-64216-disable-root-pwd.patch" - - "ramdisk-64216-init-script.patch" - - "ramdisk-common-etc-rc.patch" - - "ramdisk-42951-post-init-script.patch" - - "ramdisk-42661-disable-disabled-ports.patch" + - "ramdisk-64216-disable-root-pwd.patch" + - "ramdisk-64216-init-script.patch" + - "ramdisk-common-etc-rc.patch" + - "ramdisk-42951-post-init-script.patch" + - "ramdisk-42661-disable-disabled-ports.patch" diff --git a/files/board/arpl/overlayfs/opt/arpl/model-configs/RS3413xs+.yml b/files/board/arpl/overlayfs/opt/arpl/model-configs/RS3413xs+.yml index e782613b..fb4bd633 100644 --- a/files/board/arpl/overlayfs/opt/arpl/model-configs/RS3413xs+.yml +++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/RS3413xs+.yml @@ -19,10 +19,10 @@ platform: "bromolow" unique: "synology_bromolow_rs3413xs+" serial: prefix: - - "1130" - - "1230" - - "1330" - - "1430" + - "1130" + - "1230" + - "1330" + - "1430" middle: "LWN" suffix: "numeric" dom: 1 @@ -38,11 +38,11 @@ productvers: synoinfo: <<: *synoinfo patch: - - "ramdisk-common-disable-root-pwd.patch" - - "ramdisk-25556-init-script.patch" - - "ramdisk-common-etc-rc.patch" - - "ramdisk-25556-post-init-script.patch" - - "ramdisk-common-disable-disabled-ports.patch" + - "ramdisk-common-disable-root-pwd.patch" + - "ramdisk-25556-init-script.patch" + - "ramdisk-common-etc-rc.patch" + - "ramdisk-25556-post-init-script.patch" + - "ramdisk-common-disable-disabled-ports.patch" "7.0": kver: "3.10.108" @@ -52,11 +52,11 @@ productvers: synoinfo: <<: *synoinfo patch: - - "ramdisk-common-disable-root-pwd.patch" - - "ramdisk-common-init-script.patch" - - "ramdisk-common-etc-rc.patch" - - "ramdisk-common-post-init-script.patch" - - "ramdisk-common-disable-disabled-ports.patch" + - "ramdisk-common-disable-root-pwd.patch" + - "ramdisk-common-init-script.patch" + - "ramdisk-common-etc-rc.patch" + - "ramdisk-common-post-init-script.patch" + - "ramdisk-common-disable-disabled-ports.patch" "7.1": kver: "3.10.108" @@ -66,8 +66,8 @@ productvers: synoinfo: <<: *synoinfo patch: - - "ramdisk-common-disable-root-pwd.patch" - - "ramdisk-common-init-script.patch" - - "ramdisk-common-etc-rc.patch" - - "ramdisk-42951-post-init-script.patch" - - "ramdisk-42661-disable-disabled-ports.patch" + - "ramdisk-common-disable-root-pwd.patch" + - "ramdisk-common-init-script.patch" + - "ramdisk-common-etc-rc.patch" + - "ramdisk-42951-post-init-script.patch" + - "ramdisk-42661-disable-disabled-ports.patch" diff --git a/files/board/arpl/overlayfs/opt/arpl/model-configs/RS3618xs.yml b/files/board/arpl/overlayfs/opt/arpl/model-configs/RS3618xs.yml index ae1834e9..4bdbfb12 100644 --- a/files/board/arpl/overlayfs/opt/arpl/model-configs/RS3618xs.yml +++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/RS3618xs.yml @@ -20,10 +20,10 @@ platform: "broadwell" unique: "synology_broadwell_rs3618xs" serial: prefix: - - "1130" - - "1230" - - "1330" - - "1430" + - "1130" + - "1230" + - "1330" + - "1430" middle: "ODN" suffix: "alpha" dom: 2 @@ -39,11 +39,11 @@ productvers: synoinfo: <<: *synoinfo patch: - - "ramdisk-common-disable-root-pwd.patch" - - "ramdisk-25556-init-script.patch" - - "ramdisk-common-etc-rc.patch" - - "ramdisk-25556-post-init-script.patch" - - "ramdisk-common-disable-disabled-ports.patch" + - "ramdisk-common-disable-root-pwd.patch" + - "ramdisk-25556-init-script.patch" + - "ramdisk-common-etc-rc.patch" + - "ramdisk-25556-post-init-script.patch" + - "ramdisk-common-disable-disabled-ports.patch" "7.0": kver: "4.4.180" @@ -53,11 +53,11 @@ productvers: synoinfo: <<: *synoinfo patch: - - "ramdisk-common-disable-root-pwd.patch" - - "ramdisk-common-init-script.patch" - - "ramdisk-common-etc-rc.patch" - - "ramdisk-common-post-init-script.patch" - - "ramdisk-common-disable-disabled-ports.patch" + - "ramdisk-common-disable-root-pwd.patch" + - "ramdisk-common-init-script.patch" + - "ramdisk-common-etc-rc.patch" + - "ramdisk-common-post-init-script.patch" + - "ramdisk-common-disable-disabled-ports.patch" "7.1": kver: "4.4.180" @@ -67,11 +67,11 @@ productvers: synoinfo: <<: *synoinfo patch: - - "ramdisk-common-disable-root-pwd.patch" - - "ramdisk-common-init-script.patch" - - "ramdisk-common-etc-rc.patch" - - "ramdisk-42951-post-init-script.patch" - - "ramdisk-42661-disable-disabled-ports.patch" + - "ramdisk-common-disable-root-pwd.patch" + - "ramdisk-common-init-script.patch" + - "ramdisk-common-etc-rc.patch" + - "ramdisk-42951-post-init-script.patch" + - "ramdisk-42661-disable-disabled-ports.patch" "7.2": kver: "4.4.302" @@ -81,8 +81,8 @@ productvers: synoinfo: <<: *synoinfo patch: - - "ramdisk-64216-disable-root-pwd.patch" - - "ramdisk-64216-init-script.patch" - - "ramdisk-common-etc-rc.patch" - - "ramdisk-42951-post-init-script.patch" - - "ramdisk-42661-disable-disabled-ports.patch" + - "ramdisk-64216-disable-root-pwd.patch" + - "ramdisk-64216-init-script.patch" + - "ramdisk-common-etc-rc.patch" + - "ramdisk-42951-post-init-script.patch" + - "ramdisk-42661-disable-disabled-ports.patch" diff --git a/files/board/arpl/overlayfs/opt/arpl/model-configs/RS3621xs+.yml b/files/board/arpl/overlayfs/opt/arpl/model-configs/RS3621xs+.yml index ed5aaae1..22aa6ffe 100644 --- a/files/board/arpl/overlayfs/opt/arpl/model-configs/RS3621xs+.yml +++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/RS3621xs+.yml @@ -19,7 +19,7 @@ platform: "broadwellnk" unique: "synology_broadwellnk_rs3621xs+" serial: prefix: - - "20A0" + - "20A0" middle: "SZR" suffix: "alpha" dom: 2 @@ -35,11 +35,11 @@ productvers: synoinfo: <<: *synoinfo patch: - - "ramdisk-common-disable-root-pwd.patch" - - "ramdisk-25556-init-script.patch" - - "ramdisk-common-etc-rc.patch" - - "ramdisk-25556-post-init-script.patch" - - "ramdisk-common-disable-disabled-ports.patch" + - "ramdisk-common-disable-root-pwd.patch" + - "ramdisk-25556-init-script.patch" + - "ramdisk-common-etc-rc.patch" + - "ramdisk-25556-post-init-script.patch" + - "ramdisk-common-disable-disabled-ports.patch" "7.0": kver: "4.4.180" @@ -49,11 +49,11 @@ productvers: synoinfo: <<: *synoinfo patch: - - "ramdisk-common-disable-root-pwd.patch" - - "ramdisk-common-init-script.patch" - - "ramdisk-common-etc-rc.patch" - - "ramdisk-common-post-init-script.patch" - - "ramdisk-common-disable-disabled-ports.patch" + - "ramdisk-common-disable-root-pwd.patch" + - "ramdisk-common-init-script.patch" + - "ramdisk-common-etc-rc.patch" + - "ramdisk-common-post-init-script.patch" + - "ramdisk-common-disable-disabled-ports.patch" "7.1": kver: "4.4.180" @@ -63,11 +63,11 @@ productvers: synoinfo: <<: *synoinfo patch: - - "ramdisk-common-disable-root-pwd.patch" - - "ramdisk-common-init-script.patch" - - "ramdisk-common-etc-rc.patch" - - "ramdisk-42951-post-init-script.patch" - - "ramdisk-42661-disable-disabled-ports.patch" + - "ramdisk-common-disable-root-pwd.patch" + - "ramdisk-common-init-script.patch" + - "ramdisk-common-etc-rc.patch" + - "ramdisk-42951-post-init-script.patch" + - "ramdisk-42661-disable-disabled-ports.patch" "7.2": kver: "4.4.302" @@ -77,8 +77,8 @@ productvers: synoinfo: <<: *synoinfo patch: - - "ramdisk-64216-disable-root-pwd.patch" - - "ramdisk-64216-init-script.patch" - - "ramdisk-common-etc-rc.patch" - - "ramdisk-42951-post-init-script.patch" - - "ramdisk-42661-disable-disabled-ports.patch" + - "ramdisk-64216-disable-root-pwd.patch" + - "ramdisk-64216-init-script.patch" + - "ramdisk-common-etc-rc.patch" + - "ramdisk-42951-post-init-script.patch" + - "ramdisk-42661-disable-disabled-ports.patch" diff --git a/files/board/arpl/overlayfs/opt/arpl/model-configs/RS4021xs+.yml b/files/board/arpl/overlayfs/opt/arpl/model-configs/RS4021xs+.yml index e9a4704f..3e2eb756 100644 --- a/files/board/arpl/overlayfs/opt/arpl/model-configs/RS4021xs+.yml +++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/RS4021xs+.yml @@ -19,7 +19,7 @@ platform: "broadwellnk" unique: "synology_broadwellnk_rs4021xs+" serial: prefix: - - "2160" + - "2160" middle: "T2R" suffix: "alpha" dom: 2 @@ -35,11 +35,11 @@ productvers: synoinfo: <<: *synoinfo patch: - - "ramdisk-common-disable-root-pwd.patch" - - "ramdisk-25556-init-script.patch" - - "ramdisk-common-etc-rc.patch" - - "ramdisk-25556-post-init-script.patch" - - "ramdisk-common-disable-disabled-ports.patch" + - "ramdisk-common-disable-root-pwd.patch" + - "ramdisk-25556-init-script.patch" + - "ramdisk-common-etc-rc.patch" + - "ramdisk-25556-post-init-script.patch" + - "ramdisk-common-disable-disabled-ports.patch" "7.0": kver: "4.4.180" @@ -49,11 +49,11 @@ productvers: synoinfo: <<: *synoinfo patch: - - "ramdisk-common-disable-root-pwd.patch" - - "ramdisk-common-init-script.patch" - - "ramdisk-common-etc-rc.patch" - - "ramdisk-common-post-init-script.patch" - - "ramdisk-common-disable-disabled-ports.patch" + - "ramdisk-common-disable-root-pwd.patch" + - "ramdisk-common-init-script.patch" + - "ramdisk-common-etc-rc.patch" + - "ramdisk-common-post-init-script.patch" + - "ramdisk-common-disable-disabled-ports.patch" "7.1": kver: "4.4.180" @@ -63,11 +63,11 @@ productvers: synoinfo: <<: *synoinfo patch: - - "ramdisk-common-disable-root-pwd.patch" - - "ramdisk-common-init-script.patch" - - "ramdisk-common-etc-rc.patch" - - "ramdisk-42951-post-init-script.patch" - - "ramdisk-42661-disable-disabled-ports.patch" + - "ramdisk-common-disable-root-pwd.patch" + - "ramdisk-common-init-script.patch" + - "ramdisk-common-etc-rc.patch" + - "ramdisk-42951-post-init-script.patch" + - "ramdisk-42661-disable-disabled-ports.patch" "7.2": kver: "4.4.302" @@ -77,8 +77,8 @@ productvers: synoinfo: <<: *synoinfo patch: - - "ramdisk-64216-disable-root-pwd.patch" - - "ramdisk-64216-init-script.patch" - - "ramdisk-common-etc-rc.patch" - - "ramdisk-42951-post-init-script.patch" - - "ramdisk-42661-disable-disabled-ports.patch" + - "ramdisk-64216-disable-root-pwd.patch" + - "ramdisk-64216-init-script.patch" + - "ramdisk-common-etc-rc.patch" + - "ramdisk-42951-post-init-script.patch" + - "ramdisk-42661-disable-disabled-ports.patch" diff --git a/files/board/arpl/overlayfs/opt/arpl/model-configs/SA3400.yml b/files/board/arpl/overlayfs/opt/arpl/model-configs/SA3400.yml index 186bdec8..12dda09c 100644 --- a/files/board/arpl/overlayfs/opt/arpl/model-configs/SA3400.yml +++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/SA3400.yml @@ -21,7 +21,7 @@ platform: "broadwellnk" unique: "synology_broadwellnk_sa3400" serial: prefix: - - "1920" + - "1920" middle: "RJR" suffix: "alpha" dom: 1 @@ -37,11 +37,11 @@ productvers: synoinfo: <<: *synoinfo patch: - - "ramdisk-common-disable-root-pwd.patch" - - "ramdisk-25556-init-script.patch" - - "ramdisk-common-etc-rc.patch" - - "ramdisk-25556-post-init-script.patch" - - "ramdisk-common-disable-disabled-ports.patch" + - "ramdisk-common-disable-root-pwd.patch" + - "ramdisk-25556-init-script.patch" + - "ramdisk-common-etc-rc.patch" + - "ramdisk-25556-post-init-script.patch" + - "ramdisk-common-disable-disabled-ports.patch" "7.0": kver: "4.4.180" @@ -51,11 +51,11 @@ productvers: synoinfo: <<: *synoinfo patch: - - "ramdisk-common-disable-root-pwd.patch" - - "ramdisk-common-init-script.patch" - - "ramdisk-common-etc-rc.patch" - - "ramdisk-common-post-init-script.patch" - - "ramdisk-common-disable-disabled-ports.patch" + - "ramdisk-common-disable-root-pwd.patch" + - "ramdisk-common-init-script.patch" + - "ramdisk-common-etc-rc.patch" + - "ramdisk-common-post-init-script.patch" + - "ramdisk-common-disable-disabled-ports.patch" "7.1": kver: "4.4.180" @@ -65,11 +65,11 @@ productvers: synoinfo: <<: *synoinfo patch: - - "ramdisk-common-disable-root-pwd.patch" - - "ramdisk-common-init-script.patch" - - "ramdisk-common-etc-rc.patch" - - "ramdisk-42951-post-init-script.patch" - - "ramdisk-42661-disable-disabled-ports.patch" + - "ramdisk-common-disable-root-pwd.patch" + - "ramdisk-common-init-script.patch" + - "ramdisk-common-etc-rc.patch" + - "ramdisk-42951-post-init-script.patch" + - "ramdisk-42661-disable-disabled-ports.patch" "7.2": kver: "4.4.302" @@ -79,8 +79,8 @@ productvers: synoinfo: <<: *synoinfo patch: - - "ramdisk-64216-disable-root-pwd.patch" - - "ramdisk-64216-init-script.patch" - - "ramdisk-common-etc-rc.patch" - - "ramdisk-42951-post-init-script.patch" - - "ramdisk-42661-disable-disabled-ports.patch" + - "ramdisk-64216-disable-root-pwd.patch" + - "ramdisk-64216-init-script.patch" + - "ramdisk-common-etc-rc.patch" + - "ramdisk-42951-post-init-script.patch" + - "ramdisk-42661-disable-disabled-ports.patch" diff --git a/files/board/arpl/overlayfs/opt/arpl/model-configs/SA3600.yml.disabled b/files/board/arpl/overlayfs/opt/arpl/model-configs/SA3600.yml.disabled index 080b7c8b..8c55cf94 100644 --- a/files/board/arpl/overlayfs/opt/arpl/model-configs/SA3600.yml.disabled +++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/SA3600.yml.disabled @@ -85,4 +85,4 @@ productvers: - "ramdisk-64216-init-script.patch" - "ramdisk-common-etc-rc.patch" - "ramdisk-42951-post-init-script.patch" - - "ramdisk-42661-disable-disabled-ports.patch" \ No newline at end of file + - "ramdisk-42661-disable-disabled-ports.patch" diff --git a/files/board/arpl/overlayfs/opt/arpl/model-configs/SA6400.yml b/files/board/arpl/overlayfs/opt/arpl/model-configs/SA6400.yml index a5caa28f..87553ae1 100644 --- a/files/board/arpl/overlayfs/opt/arpl/model-configs/SA6400.yml +++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/SA6400.yml @@ -17,7 +17,7 @@ platform: "epyc7002" unique: "synology_epyc7002_sa6400" serial: prefix: - - "2270" + - "2270" middle: "UMR" suffix: "alpha" dom: -1 @@ -34,10 +34,10 @@ productvers: synoinfo: <<: *synoinfo patch: - - "ramdisk-common-disable-root-pwd.patch" - - "ramdisk-common-sa6400-init-script.patch" - - "ramdisk-common-etc-rc.patch" - - "ramdisk-42951-post-init-script.patch" + - "ramdisk-common-disable-root-pwd.patch" + - "ramdisk-common-sa6400-init-script.patch" + - "ramdisk-common-etc-rc.patch" + - "ramdisk-42951-post-init-script.patch" "7.2": kpre: "7.2" @@ -48,7 +48,7 @@ productvers: synoinfo: <<: *synoinfo patch: - - "ramdisk-64216-disable-root-pwd.patch" - - "ramdisk-64216-sa6400-init-script.patch" - - "ramdisk-common-etc-rc.patch" - - "ramdisk-42951-post-init-script.patch" + - "ramdisk-64216-disable-root-pwd.patch" + - "ramdisk-64216-sa6400-init-script.patch" + - "ramdisk-common-etc-rc.patch" + - "ramdisk-42951-post-init-script.patch" diff --git a/update-list.yml b/update-list.yml index 983d955a..6ed60731 100644 --- a/update-list.yml +++ b/update-list.yml @@ -2,5 +2,5 @@ remove: replace: ".buildroot/output/images/bzImage": "/mnt/p3/bzImage-arpl" ".buildroot/output/images/rootfs.cpio.xz": "/mnt/p3/initrd-arpl" - "files/board/arpl/p1/ARPL-VERSION" : "/mnt/p1/ARPL-VERSION" - "files/board/arpl/p1/boot/grub/grub.cfg": "/mnt/p1/boot/grub/grub.cfg" \ No newline at end of file + "files/board/arpl/p1/ARPL-VERSION": "/mnt/p1/ARPL-VERSION" + "files/board/arpl/p1/boot/grub/grub.cfg": "/mnt/p1/boot/grub/grub.cfg"