Update VERSION

Changing EFI 32bit

.github/FUNDING.yml

@@ -0,0 +1,3 @@
+# These are supported funding model platforms
+
+github: fbelavenuto

.github/workflows/main.yml

@@ -2,8 +2,8 @@ name: Build image
 
 on:
   push:
-#    branches:
+    branches:
-#      - main
+      - main
     tags:
       - v*
   workflow_dispatch:
@@ -27,6 +27,7 @@ jobs:
         run: |
           sudo apt-get update
           sudo apt-get install -y libelf-dev qemu-utils
+          sudo cp -f files/board/arpl/overlayfs/usr/bin/yq /usr/bin/yq
 
       # Prepare buildroot for first make (for cache)
       - name: Prepare buildroot
@@ -47,35 +48,45 @@ jobs:
         id: build
         run: |
           VERSION=`<VERSION`
-          echo "::set-output name=VERSION::${VERSION}"
+          echo "VERSION=${VERSION}" >> $GITHUB_OUTPUT
           # Remove old files
           rm -rf .buildroot/output/target/opt/arpl
           rm -rf .buildroot/board/arpl/overlayfs
           rm -rf .buildroot/board/arpl/p1
           rm -rf .buildroot/board/arpl/p3
           # Get latest LKMs
-          # echo "Getting latest LKMs"
+          echo "Getting latest LKMs"
-          # TAG=`curl -s https://api.github.com/repos/fbelavenuto/redpill-lkm/releases/latest | grep "tag_name" | awk '{print substr($2, 2, length($2)-3)}'`
+          TAG=`curl -s https://api.github.com/repos/fbelavenuto/redpill-lkm/releases/latest | grep "tag_name" | awk '{print substr($2, 2, length($2)-3)}'`
-          # curl -L "https://github.com/fbelavenuto/redpill-lkm/releases/download/${TAG}/rp-lkms.zip" -o /tmp/rp-lkms.zip
+          curl -L "https://github.com/fbelavenuto/redpill-lkm/releases/download/${TAG}/rp-lkms.zip" -o /tmp/rp-lkms.zip
-          # rm -rf files/board/arpl/p3/lkms/*
+          rm -rf files/board/arpl/p3/lkms/*
-          # unzip /tmp/rp-lkms.zip -d files/board/arpl/p3/lkms
+          unzip /tmp/rp-lkms.zip -d files/board/arpl/p3/lkms
-          # # Get latest addons and install its
+          # Get latest addons and install its
-          # echo "Getting latest Addons"
+          echo "Getting latest Addons"
-          # TAG=`curl -s https://api.github.com/repos/fbelavenuto/arpl-addons/releases/latest | grep "tag_name" | awk '{print substr($2, 2, length($2)-3)}'`
+          TAG=`curl -s https://api.github.com/repos/fbelavenuto/arpl-addons/releases/latest | grep "tag_name" | awk '{print substr($2, 2, length($2)-3)}'`
-          # curl -L "https://github.com/fbelavenuto/arpl-addons/releases/download/${TAG}/addons.zip" -o /tmp/addons.zip
+          curl -L "https://github.com/fbelavenuto/arpl-addons/releases/download/${TAG}/addons.zip" -o /tmp/addons.zip
-          # mkdir -p /tmp/addons
+          mkdir -p /tmp/addons
-          # unzip /tmp/addons.zip -d /tmp/addons
+          unzip /tmp/addons.zip -d /tmp/addons
-          # DEST_PATH="files/board/arpl/p3/addons"
+          DEST_PATH="files/board/arpl/p3/addons"
-          # echo "Installing addons to ${DEST_PATH}"
+          echo "Installing addons to ${DEST_PATH}"
-          # for PKG in `ls /tmp/addons/*.addon`; do
+          for PKG in `ls /tmp/addons/*.addon`; do
-          #   ADDON=`basename ${PKG} | sed 's|.addon||'`
+            ADDON=`basename ${PKG} | sed 's|.addon||'`
-          #   mkdir -p "${DEST_PATH}/${ADDON}"
+            mkdir -p "${DEST_PATH}/${ADDON}"
-          #   echo "Extracting ${PKG} to ${DEST_PATH}/${ADDON}"
+            echo "Extracting ${PKG} to ${DEST_PATH}/${ADDON}"
-          #   tar xaf "${PKG}" -C "${DEST_PATH}/${ADDON}"
+            tar xaf "${PKG}" -C "${DEST_PATH}/${ADDON}"
-          # done
+          done
+          # Get latest modules
+          echo "Getting latest modules"
+          MODULES_DIR="files/board/arpl/p3/modules"
+          TAG=`curl -s https://api.github.com/repos/fbelavenuto/arpl-modules/releases/latest | grep "tag_name" | awk '{print substr($2, 2, length($2)-3)}'`
+          while read PLATFORM KVER; do
+            FILE="${PLATFORM}-${KVER}"
+            curl -L "https://github.com/fbelavenuto/arpl-modules/releases/download/${TAG}/${FILE}.tgz" -o "${MODULES_DIR}/${FILE}.tgz"
+          done < PLATFORMS
+          curl -L "https://github.com/fbelavenuto/arpl-modules/releases/download/${TAG}/firmware.tgz" -o "${MODULES_DIR}/firmware.tgz"
           # Copy files
           echo "Copying files"
           sed 's/^ARPL_VERSION=.*/ARPL_VERSION="'${VERSION}'"/' -i files/board/arpl/overlayfs/opt/arpl/include/consts.sh
+          echo "${VERSION}" > files/board/arpl/p1/ARPL-VERSION
           cp -Ru files/* .buildroot/
           cd .buildroot
           echo "Generating default config"
@@ -84,14 +95,21 @@ jobs:
           echo "Building..."
           make BR2_EXTERNAL=../external
           cd -
-          qemu-img convert -O vmdk arpl.img arpl.vmdk
+          qemu-img convert -O vmdk arpl.img arpl-dyn.vmdk
+          qemu-img convert -O vmdk -o adapter_type=lsilogic arpl.img -o subformat=monolithicFlat arpl.vmdk
 
-      # Zip image
+      # Zip image and generate checksum
       - name: Pack
         shell: bash
         run: |
           zip -9 "arpl-${{ steps.build.outputs.VERSION }}.img.zip" arpl.img
-          zip -9 "arpl-${{ steps.build.outputs.VERSION }}.vmdk.zip" arpl.vmdk
+          zip -9 "arpl-${{ steps.build.outputs.VERSION }}.vmdk-dyn.zip" arpl-dyn.vmdk
+          zip -9 "arpl-${{ steps.build.outputs.VERSION }}.vmdk-flat.zip" arpl.vmdk arpl-flat.vmdk
+          sha256sum update-list.yml > sha256sum
+          yq '.replace | explode(.) | to_entries | map([.key])[] | .[]' update-list.yml | while read F; do
+            (cd `dirname ${F}` && sha256sum `basename ${F}`) >> sha256sum
+          done
+          yq '.replace | explode(.) | to_entries | map([.key])[] | .[]' update-list.yml | xargs zip -9j "update.zip" sha256sum update-list.yml
 
       # Upload artifact
       - name: Upload
@@ -100,7 +118,7 @@ jobs:
           name: Images
           path: |
             arpl.img
-            arpl.vmdk
+            arpl*.vmdk
           retention-days: 5
 
       # Publish a release if is a tag
@@ -110,6 +128,6 @@ jobs:
         with:
           files: |
             arpl-${{ steps.build.outputs.VERSION }}.img.zip
-            arpl-${{ steps.build.outputs.VERSION }}.vmdk.zip
+            arpl-${{ steps.build.outputs.VERSION }}.vmdk-dyn.zip
-            .buildroot/output/images/bzImage
+            arpl-${{ steps.build.outputs.VERSION }}.vmdk-flat.zip
-            .buildroot/output/images/rootfs.cpio.xz
+            update.zip

.gitignore

@@ -4,8 +4,12 @@ arpl*.img
 arpl*.vmdk
 *.zip
 .buildroot
-test.sh
+test*.sh
-docker/Dockerfile
+docker/syno-compiler/Dockerfile
-docker/cache
+cache
 *.bak
 *.o
+/files/board/arpl/p3/addons
+/files/board/arpl/p3/lkms
+/files/board/arpl/p3/modules
+/tests

PLATFORMS

@@ -5,3 +5,4 @@ broadwellnk	4.4.180
 denverton	4.4.180
 geminilake	4.4.180
 v1000   4.4.180
+r1000   4.4.180

README.md

@@ -2,28 +2,94 @@
 
 This particular project was created to facilitate my testing with Redpill and I decided to share it with other users.
 
-It is still in alpha stage, with little documentation, but it is functional. I'm Brazilian and my English is not good, so I apologize for my translations.
+I'm Brazilian and my English is not good, so I apologize for my translations.
 
-I tried to make the system as user-friendly as possible, to make life easier. The loader automatically detects which device is being used, SATADom or USB, detecting its VID and PID correctly. redpill-lkm has been edited to allow booting the kernel without setting the variables related to network interfaces so the loader (and user) doesn't have to worry about that. The Jun's code that makes the zImage and Ramdisk patch is embedded, if there is a change in "zImage" or "rd.gz" by some update, the loader re-applies the patches. Builds 42218 and 42661 up to update5 are working. Automatic updates should still be disabled as we are not sure if this technique will work forever. The most important kernel modules are built into the DSM ramdisk image for automatic peripheral detection.
+I tried to make the system as user-friendly as possible, to make life easier. The loader automatically detects which device is being used, SATADoM or USB, detecting its VID and PID correctly. redpill-lkm has been edited to allow booting the kernel without setting the variables related to network interfaces so the loader (and user) doesn't have to worry about that. The Jun's code that makes the zImage and Ramdisk patch is embedded, if there is a change in "zImage" or "rd.gz" by some smallupdate, the loader re-applies the patches. The most important kernel modules are built into the DSM ramdisk image for automatic peripheral detection.
+
+# Important considerations
+
+ - Some users have experienced an excessively long time to boot. In this case is highly recommended to use an SSD for the loader in the case of the option via DoM or a fast USB flash drive;
+
+ - You must have at least 4GB of RAM, both in baremetal and VMs;
+
+ - The DSM kernel is compatible with SATA ports, not SAS/SCSI/etc. For device-tree models only SATA ports work. For the other models, another type of disks may work;
+
+ - It is possible to use HBA cards, however SMART and serial numbers are only functional on DS3615xs, DS3617xs and DS3622xs+ models.
 
 # Use
 
-To use this project, download the latest image available and burn it to a USB stick or SATA disk-on-module. Set the PC to boot from the burned media and follow the informations on the screen. When booting, the user can call the "menu.sh" command from the computer itself, access via SSH or use the virtual terminal (ttyd) by typing the address provided on the screen (http://(ip):7681). The loader will automatically increase the size of the last partition and use this space as cache if it is larger than 2GiB.
+## General
 
-### It is highly recommended to use an SSD for the loader in the case of the option via DoM or a fast USB flash drive
+To use this project, download the latest image available and burn it to a USB stick or SATA disk-on-module. Set the PC to boot from the burned media and follow the informations on the screen.
 
-The menu system is dynamic and I hope it is intuitive enough that the user can use it without any problems. Its allows you to choose a model, the existing buildnumber for the chosen model, type or randomly create a serial number, add/remove addons, add/remove/view "cmdline" and "synoinfo" entries, choose the LKM version, create the loader, boot, manually edit the configuration file, choose a keymap, update and exit.
+The loader will automatically increase the size of the last partition and use this space as cache if it is larger than 2GiB.
 
-Changing addons and synoinfo entries require re-creating the loader, cmdline entries do not.
+## Acessing loader
 
-There is no need to configure the VID/PID (if using a USB stick) or define the MAC Addresses of the network interfaces. If the user wants to modify the MAC Address of any interface, he must manually add "cmdline" entries in the corresponding menu (set "netif_num" according to "mac1..4" entries).
+### Via terminal
 
-If a model is chosen that uses the Device-tree system to define the HDs, there is no need to configure anything. In the case of models that do not use device-tree, the configurations must be done manually and for this there is an option in the "Cmdline" menu to display the SATA controllers, DUMMY ports and ports in use, to assist in the creation of the "SataPortMap", "DiskIdxMap" and "sata_remap" if necessary.
+Call the "menu.sh" command from the computer itself.
 
-Another important point is that the loader detects whether or not the CPU has the FMA3 instruction and does not display the models that require it. So if the DS918+ and DVA3221 models are not displayed it is because of the CPU's lack of support for FMA instructions.
+### Via web
+
+From another machine into same network, type the address provided on the screen `http://<ip>:7681` in browser.
+
+### Via ssh
+
+From another machine into same network, use a ssh client, username `root` and password `Redp1lL-1s-4weSomE`
+
+## Using loader
+
+The menu system is dynamic and I hope it is intuitive enough that the user can use it without any problems.
+
+There is no need to configure the VID/PID (if using a USB stick) or define the MAC Addresses of the network interfaces. If the user wants to modify the MAC Address of any interface, uses the "Change MAC" into "cmdline" menu.
+
+If a model is chosen that uses the Device-tree system to define the HDs, there is no need to configure anything. In the case of models that do not use device-tree, the configurations must be done manually and for this there is an option in the "cmdline" menu to display the SATA controllers, DUMMY ports and ports in use, to assist in the creation of the "SataPortMap", "DiskIdxMap" and "sata_remap" if necessary.
+
+Another important point is that the loader detects whether or not the CPU has the FMA3 instruction and does not display the models that require it. So if the DS918+ and DVA3221 models are not displayed it is because of the CPU's lack of support for FMA instructions. You can disable this restriction and test at your own risk.
 
 I developed a simple patch to no longer display the DUMMY port error on models without device-tree, the user will be able to install without having to worry about it.
 
+## Quickstart guide
+
+After booting the loader, the following screen should appear. Type menu.sh and press `<ENTER>`:
+
+![](doc/first-screen.png)
+
+If you prefer, you can access it via the web:
+
+![](doc/ttyd.png)
+
+Select the "model" option and choose the model you prefer:
+
+![](doc/model.png)
+
+Select the "Buildnumber" option and choose the first option:
+
+![](doc/buildnumber.png)
+
+Go to "Serial" menu and choose "Generate a random serial number".
+
+Select the "Build" option and wait for the loader to be generated:
+
+![](doc/making.png)
+
+Select the "Boot" option and wait for the DSM to boot:
+
+![](doc/DSM%20boot.png)
+
+The DSM kernel does not display messages on the screen, so it is necessary to continue the process of configuring DSM through the browser by accessing the address `http://<ip>`.
+There are several tutorials on how to configure DSM over the internet, which will not be covered here.
+
+# Tutorials
+
+An ARPL user (Rikkie) created a tutorial to install ARPL on a proxmox server:
+https://hotstuff.asia/2023/01/03/xpenology-with-arpl-on-proxmox-the-easy-way/
+
+# Troubles/questions/etc
+
+Please search the forums at https://xpenology.com/forum if your question/problem has been discussed and resolved. If you can't find a solution, use github issues.
+
 # Thanks
 
 All code was based on the work of TTG, pocopico, jumkey and others involved in continuing TTG's original redpill-load project.

TODO

@@ -1,6 +1,10 @@
 A fazer
- - Checar se tem como atualizar microcode via addon/modules/whatever...
+ - Checar NVME no modelo DS920+, DS918+
- - Estudar acrescentar modo simples e avançado do menu
+ - Checar módulo tg3 no próprio loader (BCM57780 [14e4:1692]) (#31)
+ - "Sensitive data" (#312)
+ - Checar drivers para MMC/SD/eMMC
+ - Checar drivers para chelsio T420, T520 e T580
+ - Melhorar função getAllModules()
 
 Concluidos:
  - Generalizar código dos addons
@@ -29,3 +33,9 @@ Concluidos:
  - Mudar synoinfo para ler do modelo e preencher no user_config, para usuário poder deletar entradas do modelo
  - Validar netif_num e macX
  - Descobrir como é o serial do DS2422+
+ - Retirar o ttyd da memória quando o root do dsm dar boot
+ - Adicionar mais binários para o addon dbgutils (nano, strace, etc)
+ - Checar se tem como atualizar microcode via addon/modules/whatever... (NOP)
+ - Estudar acrescentar modo simples e avançado do menu (NOP)
+ - J4125, HP G7 N40L desligando (#110 #160)
+ - Ver se vale a pena colocar uma opção para configurações extras, como escolher qual módulo realtek usar (R8168 ou R8169)

VERSION

@@ -1 +1 @@
-0.4-alpha3
+1.0-beta10a

docker/syno-compiler/Dockerfile.template

@@ -3,7 +3,7 @@ ARG PLATFORMS="@@@PLATFORMS@@@"
 ARG TOOLKIT_VER="@@@TOOLKIT_VER@@@"
 
 # Copy downloaded toolkits
-ADD cache/$TOOLKIT_VER /cache
+ADD cache /cache
 # Extract toolkits
 RUN for V in ${PLATFORMS}; do \
       echo "${V}" | while IFS=':' read PLATFORM KVER; do \
@@ -23,16 +23,19 @@ ENV SHELL=/bin/bash \
     ARCH=x86_64
 
 RUN apt update --yes && \
-    apt install --yes --no-install-recommends --no-install-suggests \
+    apt install --yes --no-install-recommends --no-install-suggests --allow-unauthenticated \
-      ca-certificates nano curl bc kmod git gettext texinfo autopoint \
+      ca-certificates nano curl bc kmod git gettext texinfo autopoint gawk sudo \
       build-essential make ncurses-dev libssl-dev autogen automake pkg-config libtool xsltproc gperf && \
     apt-get clean && \
-    rm -rf /var/lib/apt/lists/*
+    rm -rf /var/lib/apt/lists/* && \
+    useradd --home-dir /input --no-create-home --shell /bin/bash --uid 1000 arpl && \
+    echo "arpl ALL=(ALL) NOPASSWD:ALL" > /etc/sudoers.d/arpl
 
 COPY --from=stage /opt /opt
 COPY files/ /
 
 WORKDIR /input
 VOLUME /input /output
+USER arpl
 
 ENTRYPOINT ["/opt/do.sh"]

docker/syno-compiler/build.sh

@@ -1,5 +1,8 @@
 #!/usr/bin/env bash
 
+CACHE_DIR="cache"
+PLATFORM_FILE="../../PLATFORMS"
+
 ###############################################################################
 function trap_cancel() {
     echo "Press Control+C once more terminate the process (or wait 2s for it to restart)"
@@ -19,32 +22,34 @@ function prepare() {
   URLS["denverton"]="https://global.download.synology.com/download/ToolChain/toolchain/${TOOLCHAIN_VER}/Intel%20x86%20Linux%204.4.180%20%28Denverton%29/denverton-${GCCLIB_VER}_x86_64-GPL.txz"
   URLS["geminilake"]="https://global.download.synology.com/download/ToolChain/toolchain/${TOOLCHAIN_VER}/Intel%20x86%20Linux%204.4.180%20%28GeminiLake%29/geminilake-${GCCLIB_VER}_x86_64-GPL.txz"
   URLS["v1000"]="https://global.download.synology.com/download/ToolChain/toolchain/${TOOLCHAIN_VER}/Intel%20x86%20Linux%204.4.180%20%28V1000%29/v1000-${GCCLIB_VER}_x86_64-GPL.txz"
+  URLS["r1000"]="https://global.download.synology.com/download/ToolChain/toolchain/${TOOLCHAIN_VER}/AMD%20x86%20Linux%204.4.180%20%28r1000%29/r1000-${GCCLIB_VER}_x86_64-GPL.txz"
+  URLS["epyc7002"]="https://global.download.synology.com/download/ToolChain/toolchain/${TOOLCHAIN_VER}/AMD%20x86%20Linux%20Linux%205.10.55%20%28epyc7002%29/epyc7002-${GCCLIB_VER}_x86_64-GPL.txz"
 
   # Read platforms/kerver version
   echo "Reading platforms"
   declare -A PLATFORMS
   while read PLATFORM KVER; do
     PLATFORMS[${PLATFORM}]="${KVER}"
-  done <../PLATFORMS
+  done < ${PLATFORM_FILE}
 
   # Download toolkits
-  mkdir -p cache
+  mkdir -p ${CACHE_DIR}
 
   for PLATFORM in ${!PLATFORMS[@]}; do
     KVER="${PLATFORMS[${PLATFORM}]}"
-    echo -n "Checking cache/${TOOLKIT_VER}/ds.${PLATFORM}-${TOOLKIT_VER}.dev.txz... "
+    echo -n "Checking ${CACHE_DIR}/ds.${PLATFORM}-${TOOLKIT_VER}.dev.txz... "
-    if [ ! -f "cache/${TOOLKIT_VER}/ds.${PLATFORM}-${TOOLKIT_VER}.dev.txz" ]; then
+    if [ ! -f "${CACHE_DIR}/ds.${PLATFORM}-${TOOLKIT_VER}.dev.txz" ]; then
       URL="https://global.download.synology.com/download/ToolChain/toolkit/${TOOLKIT_VER}/${PLATFORM}/ds.${PLATFORM}-${TOOLKIT_VER}.dev.txz"
       echo "Downloading ${URL}"
-      curl -L "${URL}" -o "cache/${TOOLKIT_VER}/ds.${PLATFORM}-${TOOLKIT_VER}.dev.txz"
+      curl -L "${URL}" -o "${CACHE_DIR}/ds.${PLATFORM}-${TOOLKIT_VER}.dev.txz"
     else
       echo "OK"
     fi
-    echo -n "Checking cache/${TOOLKIT_VER}/${PLATFORM}-toolchain.txz... "
+    echo -n "Checking ${CACHE_DIR}/${PLATFORM}-toolchain.txz... "
-    if [ ! -f "cache/${TOOLKIT_VER}/${PLATFORM}-toolchain.txz" ]; then
+    if [ ! -f "${CACHE_DIR}/${PLATFORM}-toolchain.txz" ]; then
       URL=${URLS["${PLATFORM}"]}
       echo "Downloading ${URL}"
-      curl -L "${URL}" -o "cache/${TOOLKIT_VER}/${PLATFORM}-toolchain.txz"
+      curl -L "${URL}" -o "${CACHE_DIR}/${PLATFORM}-toolchain.txz"
     else
       echo "OK"
     fi
@@ -62,13 +67,13 @@ function prepare() {
 }
 
 # 7.0
-TOOLKIT_VER="7.0"
+#TOOLKIT_VER="7.0"
-TOOLCHAIN_VER="7.0-41890"
+#TOOLCHAIN_VER="7.0-41890"
-GCCLIB_VER="gcc750_glibc226"
+#GCCLIB_VER="gcc750_glibc226"
-prepare
+#prepare
-echo "Building ${TOOLKIT_VER}"
+#echo "Building ${TOOLKIT_VER}"
-docker image rm fbelavenuto/syno-compiler:${TOOLKIT_VER} >/dev/null 2>&1
+#docker image rm fbelavenuto/syno-compiler:${TOOLKIT_VER} >/dev/null 2>&1
-docker buildx build . --load --tag fbelavenuto/syno-compiler:${TOOLKIT_VER}
+#docker buildx build . --load --tag fbelavenuto/syno-compiler:${TOOLKIT_VER}
 
 # 7.1
 TOOLKIT_VER="7.1"

docker/syno-compiler/files/opt/do.sh

@@ -9,12 +9,16 @@ function export-vars() {
     echo "Use: export-vars <platform>"
     exit 1
   fi
+  export PLATFORM="${1}"
   export KSRC="/opt/${1}/build"
   export CROSS_COMPILE="/opt/${1}/bin/x86_64-pc-linux-gnu-"
   export CFLAGS="-I/opt/${1}/include"
   export LDFLAGS="-I/opt/${1}/lib"
   export LD_LIBRARY_PATH="/opt/${1}/lib"
   export ARCH=x86_64
+  export CC="x86_64-pc-linux-gnu-gcc"
+  export LD="x86_64-pc-linux-gnu-ld"
+  export PATH="/opt/${1}/bin:${PATH}"
 }
 
 ###############################################################################
@@ -43,6 +47,7 @@ function compile-module {
     echo "Platform ${1} not found."
     exit 1
   fi
+  unset VALID
   echo -e "Compiling module for \033[7m${PLATFORM}-${KVER}\033[0m..."
   cp -R /input /tmp
   export-vars ${PLATFORM}

docker/syno-toolkit/Dockerfile

@@ -0,0 +1,15 @@
+FROM scratch
+ARG PLATFORM
+ARG TOOLKIT_VER
+ARG CACHE_DIR
+
+ENV PLATFORM=${PLATFORM} TOOLKIT_VER=${TOOLKIT_VER}
+ADD ${CACHE_DIR}/base_env-${TOOLKIT_VER}.txz /
+ADD ${CACHE_DIR}/ds.${PLATFORM}-${TOOLKIT_VER}.env.txz /
+ADD ${CACHE_DIR}/ds.${PLATFORM}-${TOOLKIT_VER}.dev.txz /
+ADD rootfs /
+
+WORKDIR /input
+VOLUME /input /output
+
+ENTRYPOINT ["/usr/bin/do.sh"]

docker/syno-toolkit/build.sh

@@ -0,0 +1,61 @@
+#!/usr/bin/env bash
+
+set -e
+
+CACHE_DIR="cache"
+PLATFORM_FILE="../../PLATFORMS"
+TOOLKIT_VER=7.1
+
+###############################################################################
+function trap_cancel() {
+    echo "Press Control+C once more terminate the process (or wait 2s for it to restart)"
+    sleep 2 || exit 1
+}
+trap trap_cancel SIGINT SIGTERM
+cd `dirname $0`
+
+# Read platforms/kerver version
+echo "Reading platforms"
+declare -A PLATFORMS
+while read PLATFORM KVER; do
+  PLATFORMS[${PLATFORM}]="${KVER}"
+done < ${PLATFORM_FILE}
+
+# Download toolkits
+mkdir -p ${CACHE_DIR}
+
+# Check base environment
+echo -n "Checking ${CACHE_DIR}/base_env-${TOOLKIT_VER}.txz... "
+if [ ! -f "${CACHE_DIR}/base_env-${TOOLKIT_VER}.txz" ]; then
+  URL="https://global.download.synology.com/download/ToolChain/toolkit/${TOOLKIT_VER}/${PLATFORM}/base_env-${TOOLKIT_VER}.txz"
+  echo "Downloading ${URL}"
+  curl -L "${URL}" -o "${CACHE_DIR}/base_env-${TOOLKIT_VER}.txz"
+else
+  echo "OK"
+fi
+
+# Check all platforms
+for PLATFORM in ${!PLATFORMS[@]}; do
+  echo -n "Checking ${CACHE_DIR}/ds.${PLATFORM}-${TOOLKIT_VER}.dev.txz... "
+  if [ ! -f "${CACHE_DIR}/ds.${PLATFORM}-${TOOLKIT_VER}.dev.txz" ]; then
+    URL="https://global.download.synology.com/download/ToolChain/toolkit/${TOOLKIT_VER}/${PLATFORM}/ds.${PLATFORM}-${TOOLKIT_VER}.dev.txz"
+    echo "Downloading ${URL}"
+    curl -L "${URL}" -o "${CACHE_DIR}/ds.${PLATFORM}-${TOOLKIT_VER}.dev.txz"
+  else
+    echo "OK"
+  fi
+  echo -n "Checking ${CACHE_DIR}/ds.${PLATFORM}-${TOOLKIT_VER}.env.txz... "
+  if [ ! -f "${CACHE_DIR}/ds.${PLATFORM}-${TOOLKIT_VER}.env.txz" ]; then
+    URL="https://global.download.synology.com/download/ToolChain/toolkit/${TOOLKIT_VER}/${PLATFORM}/ds.${PLATFORM}-${TOOLKIT_VER}.env.txz"
+    echo "Downloading ${URL}"
+    curl -L "${URL}" -o "${CACHE_DIR}/ds.${PLATFORM}-${TOOLKIT_VER}.env.txz"
+  else
+    echo "OK"
+  fi
+done
+
+# Generate docker images
+for PLATFORM in ${!PLATFORMS[@]}; do
+  docker buildx build . --build-arg PLATFORM=${PLATFORM} --build-arg TOOLKIT_VER=${TOOLKIT_VER} --build-arg CACHE_DIR="${CACHE_DIR}" \
+    --tag fbelavenuto/syno-toolkit:${PLATFORM}-${TOOLKIT_VER} --load
+done

docker/syno-toolkit/rootfs/etc/profile.d/login.sh

@@ -0,0 +1,10 @@
+export PATH="/usr/local/x86_64-pc-linux-gnu/bin:${PATH}"
+[[ "$-" != *i* ]] && return
+export LS_OPTIONS='--color=auto'
+export SHELL='linux'
+eval "`dircolors`"
+alias ls='ls -F -h --color=always -v --author --time-style=long-iso'
+alias ll='ls -l'
+alias l='ls -l -a'
+alias h='history 25'
+alias j='jobs -l'

docker/syno-toolkit/rootfs/usr/bin/do.sh

@@ -0,0 +1,52 @@
+#!/usr/bin/env bash
+
+set -e
+
+###############################################################################
+function compile-module {
+  echo -e "Compiling module for \033[7m${PLATFORM}\033[0m..."
+  cp -R /input /tmp
+  make -C ${KSRC} M=/tmp/input ${PLATFORM^^}-Y=y ${PLATFORM^^}-M=m modules
+  while read F; do
+    strip -g "${F}"
+    echo "Copying `basename ${F}`"
+    cp "${F}" "/output"
+    chown 1000.1000 "/output/`basename ${F}`"
+  done < <(find /tmp/input -name \*.ko)
+}
+
+###############################################################################
+function compile-lkm {
+  cp -R /input /tmp
+  make -C "/tmp/input" dev-v7
+  strip -g "/tmp/input/redpill.ko"
+  mv "/tmp/input/redpill.ko" "/output/redpill-dev.ko"
+  chown 1000.1000 /output/redpill-dev.ko
+  make -C "/tmp/input" clean
+  make -C "/tmp/input" prod-v7
+  strip -g "/tmp/input/redpill.ko"
+  mv "/tmp/input/redpill.ko" "/output/redpill-prod.ko"
+  chown 1000.1000 /output/redpill-prod.ko
+}
+
+###############################################################################
+###############################################################################
+
+if [ $# -lt 1 ]; then
+  echo "Use: <command> (<params>)"
+  echo "Commands: shell | compile-module | compile-lkm"
+  exit 1
+fi
+export KSRC="/usr/local/x86_64-pc-linux-gnu/x86_64-pc-linux-gnu/sys-root/usr/lib/modules/DSM-${TOOLKIT_VER}/build"
+export LINUX_SRC="/usr/local/x86_64-pc-linux-gnu/x86_64-pc-linux-gnu/sys-root/usr/lib/modules/DSM-${TOOLKIT_VER}/build"
+export CROSS_COMPILE="/usr/local/x86_64-pc-linux-gnu/bin/x86_64-pc-linux-gnu-"
+export ARCH=x86_64
+export CC="x86_64-pc-linux-gnu-gcc"
+export LD="x86_64-pc-linux-gnu-ld"
+
+case $1 in
+  shell) shift && bash -l $@ ;;
+  compile-module) compile-module ;;
+  compile-lkm) compile-lkm ;;
+  *) echo "Command not recognized: $1" ;;
+esac

files/board/arpl/kernel_defconfig

@@ -17,8 +17,10 @@ CONFIG_CGROUP_SCHED=y
 CONFIG_CGROUP_FREEZER=y
 CONFIG_CPUSETS=y
 CONFIG_CGROUP_CPUACCT=y
+CONFIG_NAMESPACES=y
 CONFIG_BLK_DEV_INITRD=y
 CONFIG_KALLSYMS_ALL=y
+CONFIG_EMBEDDED=y
 # CONFIG_COMPAT_BRK is not set
 CONFIG_PROFILING=y
 CONFIG_SMP=y
@@ -31,8 +33,6 @@ CONFIG_NUMA=y
 CONFIG_X86_CHECK_BIOS_CORRUPTION=y
 # CONFIG_MTRR_SANITIZER is not set
 CONFIG_EFI=y
-CONFIG_EFI_STUB=y
-CONFIG_EFI_MIXED=y
 CONFIG_HZ_1000=y
 CONFIG_KEXEC=y
 CONFIG_CRASH_DUMP=y
@@ -110,6 +110,8 @@ CONFIG_PCIEPORTBUS=y
 CONFIG_HOTPLUG_PCI=y
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
+CONFIG_FW_LOADER_USER_HELPER=y
+CONFIG_FW_LOADER_COMPRESS=y
 CONFIG_DEBUG_DEVRES=y
 CONFIG_CONNECTOR=y
 CONFIG_EFI_VARS=y
@@ -143,7 +145,7 @@ CONFIG_MEGARAID_MM=m
 CONFIG_MEGARAID_MAILBOX=m
 CONFIG_MEGARAID_LEGACY=m
 CONFIG_MEGARAID_SAS=m
-CONFIG_SCSI_MPT2SAS=m
+CONFIG_SCSI_MPT3SAS=m
 CONFIG_SCSI_MPI3MR=m
 CONFIG_SCSI_SMARTPQI=m
 CONFIG_SCSI_UFSHCD=m
@@ -178,49 +180,35 @@ CONFIG_SCSI_VIRTIO=m
 CONFIG_SCSI_DH=y
 CONFIG_ATA=y
 CONFIG_SATA_AHCI=y
+CONFIG_SATA_AHCI_PLATFORM=m
+CONFIG_SATA_ACARD_AHCI=m
+CONFIG_SATA_SIL24=m
+CONFIG_PDC_ADMA=m
+CONFIG_SATA_QSTOR=m
 CONFIG_ATA_PIIX=y
+CONFIG_SATA_DWC=m
 CONFIG_SATA_MV=m
 CONFIG_SATA_NV=m
+CONFIG_SATA_PROMISE=m
 CONFIG_SATA_SIL=m
 CONFIG_SATA_SIS=m
+CONFIG_SATA_SVW=m
 CONFIG_SATA_ULI=m
 CONFIG_SATA_VIA=m
-CONFIG_PATA_ALI=m
+CONFIG_SATA_VITESSE=m
-CONFIG_PATA_AMD=y
-CONFIG_PATA_ARTOP=m
-CONFIG_PATA_ATIIXP=m
-CONFIG_PATA_ATP867X=m
-CONFIG_PATA_CMD64X=m
-CONFIG_PATA_EFAR=m
-CONFIG_PATA_HPT366=m
-CONFIG_PATA_HPT37X=m
-CONFIG_PATA_HPT3X2N=m
-CONFIG_PATA_HPT3X3=m
-CONFIG_PATA_IT821X=m
-CONFIG_PATA_JMICRON=m
-CONFIG_PATA_NINJA32=m
-CONFIG_PATA_NS87415=m
-CONFIG_PATA_OLDPIIX=y
-CONFIG_PATA_PDC2027X=m
-CONFIG_PATA_PDC_OLD=m
-CONFIG_PATA_RDC=m
-CONFIG_PATA_SCH=y
-CONFIG_PATA_SERVERWORKS=m
-CONFIG_PATA_SIL680=m
-CONFIG_PATA_TRIFLEX=m
-CONFIG_PATA_VIA=m
-CONFIG_PATA_WINBOND=m
 CONFIG_ATA_GENERIC=y
 CONFIG_MD=y
 CONFIG_BLK_DEV_MD=y
 CONFIG_BLK_DEV_DM=y
 CONFIG_DM_MIRROR=y
+CONFIG_DM_RAID=m
 CONFIG_DM_ZERO=y
 CONFIG_FUSION=y
 CONFIG_FUSION_SPI=m
 CONFIG_FUSION_SAS=m
 CONFIG_FUSION_CTL=m
 CONFIG_NETDEVICES=y
+CONFIG_NET_TEAM=m
 CONFIG_MACVLAN=m
 CONFIG_IPVLAN=m
 CONFIG_VXLAN=m
@@ -298,6 +286,7 @@ CONFIG_QED=m
 CONFIG_QEDE=m
 CONFIG_QCOM_EMAC=m
 CONFIG_RMNET=m
+CONFIG_R8169=m
 CONFIG_SXGBE_ETH=m
 CONFIG_SFC=m
 # CONFIG_SFC_MCDI_MON is not set
@@ -371,14 +360,29 @@ CONFIG_AGP=y
 CONFIG_AGP_AMD64=y
 CONFIG_AGP_INTEL=y
 CONFIG_DRM=y
-CONFIG_DRM_VIRTIO_GPU=m
 CONFIG_FB=y
+CONFIG_FIRMWARE_EDID=y
+CONFIG_FB_MODE_HELPERS=y
 CONFIG_FB_VESA=y
 CONFIG_FB_EFI=y
 CONFIG_BACKLIGHT_CLASS_DEVICE=y
+CONFIG_FRAMEBUFFER_CONSOLE=y
 CONFIG_HIDRAW=y
+CONFIG_HID_A4TECH=y
+CONFIG_HID_APPLE=y
+CONFIG_HID_BELKIN=y
+CONFIG_HID_CHERRY=y
+CONFIG_HID_CHICONY=y
+CONFIG_HID_CYPRESS=y
+CONFIG_HID_EZKEY=y
 CONFIG_HID_GYRATION=y
+CONFIG_HID_ITE=y
+CONFIG_HID_KENSINGTON=y
+CONFIG_HID_LOGITECH=y
 CONFIG_LOGITECH_FF=y
+CONFIG_HID_REDRAGON=y
+CONFIG_HID_MICROSOFT=y
+CONFIG_HID_MONTEREY=y
 CONFIG_HID_NTRIG=y
 CONFIG_HID_PANTHERLORD=y
 CONFIG_PANTHERLORD_FF=y
@@ -448,9 +452,6 @@ CONFIG_AUTOFS4_FS=y
 CONFIG_MSDOS_FS=y
 CONFIG_VFAT_FS=y
 CONFIG_PROC_KCORE=y
-CONFIG_TMPFS=y
-CONFIG_TMPFS_POSIX_ACL=y
-CONFIG_TMPFS_INODE64=y
 CONFIG_HUGETLBFS=y
 CONFIG_NFS_FS=y
 CONFIG_NFS_V3_ACL=y
@@ -484,7 +485,6 @@ CONFIG_SYSTEM_TRUSTED_KEYRING=y
 CONFIG_CRC_CCITT=y
 CONFIG_PRINTK_TIME=y
 CONFIG_MAGIC_SYSRQ=y
-CONFIG_DEBUG_KERNEL=y
 CONFIG_DEBUG_STACK_USAGE=y
 # CONFIG_SCHED_DEBUG is not set
 CONFIG_SCHEDSTATS=y

files/board/arpl/make-img.sh

@@ -15,7 +15,7 @@ BOARD_PATH="${CONFIG_DIR}/board/arpl"
 
 echo "Creating image file"
 # Create image zeroed
-dd if="/dev/zero" of="${IMAGE_FILE}" bs=1M count=500 conv=sync 2>/dev/null
+dd if="/dev/zero" of="${IMAGE_FILE}" bs=1M count=1024 conv=sync 2>/dev/null
 # Copy grub stage1 to image
 dd if="${BOARD_PATH}/grub.bin" of="${IMAGE_FILE}" conv=notrunc,sync 2>/dev/null
 # Create partitions on image

files/board/arpl/overlayfs/etc/inittab

@@ -25,11 +25,14 @@ null::sysinit:/bin/ln -sf /proc/self/fd/0 /dev/stdin
 null::sysinit:/bin/ln -sf /proc/self/fd/1 /dev/stdout
 null::sysinit:/bin/ln -sf /proc/self/fd/2 /dev/stderr
 ::sysinit:/bin/hostname -F /etc/hostname
+# Reduce kernel logs
+::sysinit:/usr/bin/dmesg -n 1
 # now run any rc scripts
 ::sysinit:/etc/init.d/rcS
 
 # Login in terminals
-::respawn:/sbin/agetty -a root --noclear tty1
+tty1::respawn:/sbin/agetty -a root --noclear tty1
+tty2::askfirst:/sbin/agetty --noclear tty2
 ttyS0::askfirst:/sbin/agetty -a root ttyS0 115200 linux
 ::respawn:/usr/bin/ttyd login -f root
 
@@ -40,3 +43,4 @@ ttyS0::askfirst:/sbin/agetty -a root ttyS0 115200 linux
 ::shutdown:/etc/init.d/rcK
 ::shutdown:/sbin/swapoff -a
 ::shutdown:/bin/umount -a -r
+::shutdown:/usr/sbin/kexec -e -a

files/board/arpl/overlayfs/etc/samba/smb.conf

@@ -4,6 +4,8 @@
   obey pam restrictions = yes
   map to guest = Bad User
   usershare allow guests = yes
+  dfree command = /usr/bin/df
+
 [arpl]
   browseable = yes
   public = yes

files/board/arpl/overlayfs/opt/arpl/boot.sh

@@ -7,16 +7,20 @@ set -e
 # Sanity check
 loaderIsConfigured || die "Loader is not configured!"
 
-# Print text centralized, if variable ${COLUMNS} is defined
+# Print text centralized
 clear
+[ -z "${COLUMNS}" ] && COLUMNS=50
 TITLE="Welcome to Automated Redpill Loader v${ARPL_VERSION}"
-printf "\033[1;44m%*s\n" $COLUMNS ""
+printf "\033[1;44m%*s\n" ${COLUMNS} ""
-printf "\033[1;44m%*s\033[A\n" $COLUMNS ""
+printf "\033[1;44m%*s\033[A\n" ${COLUMNS} ""
-printf "\033[1;32m%*s\033[0m\n" $(((${#TITLE}+$COLUMNS)/2)) "${TITLE}"
+printf "\033[1;32m%*s\033[0m\n" $(((${#TITLE}+${COLUMNS})/2)) "${TITLE}"
-printf "\033[1;44m%*s\033[0m\n" $COLUMNS ""
+printf "\033[1;44m%*s\033[0m\n" ${COLUMNS} ""
 TITLE="BOOTING..."
 printf "\033[1;33m%*s\033[0m\n" $(((${#TITLE}+${COLUMNS})/2)) "${TITLE}"
 
+history -w
+sync
+
 # Check if DSM zImage changed, patch it if necessary
 ZIMAGE_HASH="`readConfigKey "zimage-hash" "${USER_CONFIG_FILE}"`"
 if [ "`sha256sum "${ORI_ZIMAGE_FILE}" | awk '{print$1}'`" != "${ZIMAGE_HASH}" ]; then
@@ -74,7 +78,7 @@ done < <(readConfigMap "cmdline" "${USER_CONFIG_FILE}")
 # Check if machine has EFI
 [ -d /sys/firmware/efi ] && EFI=1 || EFI=0
 # Read EFI bug value
-EFI_BUG="`readModelKey "${MODEL}" "builds.${BUILD}.efi-bug"`"
+[ "${MODEL}" = "DS3615" ] && EFI_BUG=1 || EFI_BUG=0
 
 LOADER_DISK="`blkid | grep 'LABEL="ARPL3"' | cut -d3 -f1`"
 BUS=`udevadm info --query property --name ${LOADER_DISK} | grep ID_BUS | cut -d= -f2`
@@ -88,7 +92,7 @@ fi
 # Validate netif_num
 NETIF_NUM=${CMDLINE["netif_num"]}
 MACS=0
-for N in `seq 1 4`; do
+for N in `seq 1 9`; do
   [ -n "${CMDLINE["mac${N}"]}" ] && MACS=$((${MACS}+1))
 done
 if [ ${NETIF_NUM} -ne ${MACS} ]; then
@@ -101,15 +105,18 @@ CMDLINE_LINE=""
 grep -q "force_junior" /proc/cmdline && CMDLINE_LINE+="force_junior "
 [ ${EFI} -eq 1 ] && CMDLINE_LINE+="withefi "
 [ "${BUS}" = "ata" ] && CMDLINE_LINE+="synoboot_satadom=${DOM} dom_szmax=${SIZE} "
-CMDLINE_LINE+="console=ttyS0,115200n8 earlyprintk log_buf_len=32M earlycon=uart8250,io,0x3f8,115200n8 elevator=elevator root=/dev/md0 loglevel=15"
+CMDLINE_DIRECT="${CMDLINE_LINE}"
+CMDLINE_LINE+="console=ttyS0,115200n8 earlyprintk earlycon=uart8250,io,0x3f8,115200n8 root=/dev/md0 loglevel=15 log_buf_len=32M"
 for KEY in ${!CMDLINE[@]}; do
   VALUE="${CMDLINE[${KEY}]}"
   CMDLINE_LINE+=" ${KEY}"
+  CMDLINE_DIRECT+=" ${KEY}"
   [ -n "${VALUE}" ] && CMDLINE_LINE+="=${VALUE}"
+  [ -n "${VALUE}" ] && CMDLINE_DIRECT+="=${VALUE}"
 done
 # Escape special chars
 CMDLINE_LINE=`echo ${CMDLINE_LINE} | sed 's/>/\\\\>/g'`
-
+CMDLINE_DIRECT=`echo ${CMDLINE_DIRECT} | sed 's/>/\\\\>/g'`
 echo -e "Cmdline:\n\033[1;36m${CMDLINE_LINE}\033[0m"
 
 # Wait for an IP
@@ -120,7 +127,7 @@ while true; do
   if [ -n "${IP}" ]; then
     echo -e ": \033[1;32m${IP}\033[0m"
     break
-  elif [ ${COUNT} -eq 15 ]; then
+  elif [ ${COUNT} -eq 30 ]; then
     echo -e ": \033[1;31mERROR\033[0m"
     break
   fi
@@ -129,18 +136,24 @@ while true; do
   echo -n "."
 done
 
+DIRECT="`readConfigKey "directboot" "${USER_CONFIG_FILE}"`"
+if [ "${DIRECT}" = "true" ]; then
+  grub-editenv ${GRUB_PATH}/grubenv set dsm_cmdline="${CMDLINE_DIRECT}"
+  echo -e "\033[1;33mReboot to boot directly in DSM\033[0m"
+  grub-editenv ${GRUB_PATH}/grubenv set next_entry="direct"
+  reboot
+  sleep 100
+  exit
+fi
 echo -e "\033[1;37mLoading DSM kernel...\033[0m"
 
 # Executes DSM kernel via KEXEC
-history -w
-sync
 if [ "${EFI_BUG}" = "yes" -a ${EFI} -eq 1 ]; then
   echo -e "\033[1;33mWarning, running kexec with --noefi param, strange things will happen!!\033[0m"
   kexec --noefi -l "${MOD_ZIMAGE_FILE}" --initrd "${MOD_RDGZ_FILE}" --command-line="${CMDLINE_LINE}" >"${LOG_FILE}" 2>&1 || dieLog
 else
   kexec -l "${MOD_ZIMAGE_FILE}" --initrd "${MOD_RDGZ_FILE}" --command-line="${CMDLINE_LINE}" >"${LOG_FILE}" 2>&1 || dieLog
 fi
-/sbin/swapoff -a >/dev/null 2>&1 || true
-/bin/umount -a -r >/dev/null 2>&1 || true
 echo -e "\033[1;37mBooting...\033[0m"
-kexec -e -a >"${LOG_FILE}" 2>&1 || dieLog
+poweroff
+while true; do sleep 1; done # infinity loop

files/board/arpl/overlayfs/opt/arpl/include/consts.sh

@@ -1,5 +1,5 @@
 
-ARPL_VERSION="0.4-alpha3"
+ARPL_VERSION="1.0-beta11"
 
 # Define paths
 TMP_PATH="/tmp"
@@ -8,6 +8,7 @@ RAMDISK_PATH="${TMP_PATH}/ramdisk"
 LOG_FILE="${TMP_PATH}/log.txt"
 
 USER_CONFIG_FILE="${BOOTLOADER_PATH}/user-config.yml"
+GRUB_PATH="${BOOTLOADER_PATH}/grub"
 
 ORI_ZIMAGE_FILE="${SLPART_PATH}/zImage"
 ORI_RDGZ_FILE="${SLPART_PATH}/rd.gz"

files/board/arpl/overlayfs/opt/arpl/include/functions.sh

@@ -146,3 +146,48 @@ function arrayExistItem() {
   done
   return ${EXISTS}
 }
+
+###############################################################################
+# Get values in .conf K=V file
+# 1 - key
+# 2 - file
+function _get_conf_kv() {
+  grep "${1}" "${2}" | sed "s|^${1}=\"\(.*\)\"$|\1|g"
+}
+
+###############################################################################
+# Replace/remove/add values in .conf K=V file
+# 1 - name
+# 2 - new_val
+# 3 - path
+function _set_conf_kv() {
+  # Delete
+  if [ -z "$2" ]; then
+    sed -i "$3" -e "s/^$1=.*$//"
+    return $?;
+  fi
+
+  # Replace
+  if grep -q "^$1=" "$3"; then
+    sed -i "$3" -e "s\"^$1=.*\"$1=\\\"$2\\\"\""
+    return $?
+  fi
+
+  # Add if doesn't exist
+  echo "$1=\"$2\"" >> $3
+}
+
+###############################################################################
+# Find and mount the DSM root filesystem
+# (based on pocopico's TCRP code)
+function findAndMountDSMRoot() {
+  [ $(mount | grep -i "${DSMROOT_PATH}" | wc -l) -gt 0 ] && return 0
+  dsmrootdisk="$(blkid /dev/sd* | grep -i raid | awk '{print $1 " " $4}' | grep UUID | grep sd[a-z]1 | head -1 | awk -F ":" '{print $1}')"
+  [ -z "${dsmrootdisk}" ] && return -1
+  [ $(mount | grep -i "${DSMROOT_PATH}" | wc -l) -eq 0 ] && mount -t ext4 $dsmrootdisk "${DSMROOT_PATH}"
+  if [ $(mount | grep -i "${DSMROOT_PATH}" | wc -l) -eq 0 ]; then
+    echo "Failed to mount"
+    return -1
+  fi
+  return 0
+}

files/board/arpl/overlayfs/opt/arpl/include/modules.sh

@@ -0,0 +1,22 @@
+
+###############################################################################
+# Return list of all modules available
+# 1 - Platform
+# 2 - Kernel Version
+function getAllModules() {
+  PLATFORM=${1}
+  KVER=${2}
+  # Unzip modules for temporary folder
+  rm -rf "${TMP_PATH}/modules"
+  mkdir -p "${TMP_PATH}/modules"
+  gzip -dc "${MODULES_PATH}/${PLATFORM}-${KVER}.tgz" | tar xf - -C "${TMP_PATH}/modules"
+  # Get list of all modules
+  for F in `ls ${TMP_PATH}/modules/*.ko`; do
+    X=`basename ${F}`
+    M=${X:0:-3}
+    DESC=`modinfo ${F} | awk -F':' '/description:/{ print $2}' | awk '{sub(/^[ ]+/,""); print}'`
+    [ -z "${DESC}" ] && DESC="${X}"
+    echo "${M} \"${DESC}\""
+  done
+  rm -rf "${TMP_PATH}/modules"
+}

files/board/arpl/overlayfs/opt/arpl/init.sh

@@ -37,6 +37,7 @@ fsck.ext2 -p ${LOADER_DISK}3 >/dev/null 2>&1 || true
 mkdir -p ${BOOTLOADER_PATH}
 mkdir -p ${SLPART_PATH}
 mkdir -p ${CACHE_PATH}
+mkdir -p ${DSMROOT_PATH}
 # Mount the partitions
 mount ${LOADER_DISK}1 ${BOOTLOADER_PATH} || die "Can't mount ${BOOTLOADER_PATH}"
 mount ${LOADER_DISK}2 ${SLPART_PATH}     || die "Can't mount ${SLPART_PATH}"
@@ -50,6 +51,17 @@ ln -s "${CACHE_PATH}/ssh" "/etc/ssh"
 rm -rf ~/.bash_history
 ln -s ${CACHE_PATH}/.bash_history ~/.bash_history
 
+# Check if exists directories into P3 partition, if yes remove and link it
+if [ -d "${CACHE_PATH}/model-configs" ]; then
+  rm -rf "${MODEL_CONFIG_PATH}"
+  ln -s "${CACHE_PATH}/model-configs" "${MODEL_CONFIG_PATH}"
+fi
+
+if [ -d "${CACHE_PATH}/patch" ]; then
+  rm -rf "${PATCH_PATH}"
+  ln -s "${CACHE_PATH}/patch" "${PATCH_PATH}"
+fi
+
 # Get first MAC address
 MAC=`ip link show eth0 | awk '/ether/{print$2}'`
 MACF=`echo ${MAC} | sed 's/://g'`
@@ -58,6 +70,7 @@ MACF=`echo ${MAC} | sed 's/://g'`
 if [ ! -f "${USER_CONFIG_FILE}" ]; then
   touch "${USER_CONFIG_FILE}"
   writeConfigKey "lkm" "dev" "${USER_CONFIG_FILE}"
+  writeConfigKey "directboot" "false" "${USER_CONFIG_FILE}"
   writeConfigKey "model" "" "${USER_CONFIG_FILE}"
   writeConfigKey "build" "" "${USER_CONFIG_FILE}"
   writeConfigKey "sn" "" "${USER_CONFIG_FILE}"
@@ -71,6 +84,7 @@ if [ ! -f "${USER_CONFIG_FILE}" ]; then
   writeConfigKey "addons" "{}" "${USER_CONFIG_FILE}"
   writeConfigKey "addons.misc" "" "${USER_CONFIG_FILE}"
   writeConfigKey "addons.acpid" "" "${USER_CONFIG_FILE}"
+  writeConfigKey "modules" "{}" "${USER_CONFIG_FILE}"
   # Initialize with real MAC
   writeConfigKey "cmdline.netif_num" "1" "${USER_CONFIG_FILE}"
   writeConfigKey "cmdline.mac1" "${MACF}" "${USER_CONFIG_FILE}"
@@ -147,7 +161,7 @@ fi
 COUNT=0
 echo -n "Waiting IP."
 while true; do
-  if [ ${COUNT} -eq 15 ]; then
+  if [ ${COUNT} -eq 30 ]; then
     echo "ERROR"
     break
   fi
@@ -169,6 +183,12 @@ echo -e "User config is on \033[1;32m${USER_CONFIG_FILE}\033[0m"
 echo -e "Default SSH Root password is \033[1;31mRedp1lL-1s-4weSomE\033[0m"
 echo
 
+# Check memory
+RAM=`free -m | awk '/Mem:/{print$2}'`
+if [ ${RAM} -le 3500 ]; then
+  echo -e "\033[1;33mYou have less than 4GB of RAM, if errors occur in loader creation, please increase the amount of memory.\033[0m\n"
+fi
+
 mkdir -p "${ADDONS_PATH}"
 mkdir -p "${LKM_PATH}"
 mkdir -p "${MODULES_PATH}"

files/board/arpl/overlayfs/opt/arpl/menu.sh

@@ -2,13 +2,14 @@
 
 . /opt/arpl/include/functions.sh
 . /opt/arpl/include/addons.sh
+. /opt/arpl/include/modules.sh
 
-# Check partition 3 space, if < 2GiB uses ramdisk
+# Check partition 3 space, if < 2GiB is necessary clean cache folder
-RAMCACHE=0
+CLEARCACHE=0
 LOADER_DISK="`blkid | grep 'LABEL="ARPL3"' | cut -d3 -f1`"
 LOADER_DEVICE_NAME=`echo ${LOADER_DISK} | sed 's|/dev/||'`
 if [ `cat /sys/block/${LOADER_DEVICE_NAME}/${LOADER_DEVICE_NAME}3/size` -lt 4194304 ]; then
-  RAMCACHE=1
+  CLEARCACHE=1
 fi
 
 # Get actual IP
@@ -22,6 +23,7 @@ BUILD="`readConfigKey "build" "${USER_CONFIG_FILE}"`"
 LAYOUT="`readConfigKey "layout" "${USER_CONFIG_FILE}"`"
 KEYMAP="`readConfigKey "keymap" "${USER_CONFIG_FILE}"`"
 LKM="`readConfigKey "lkm" "${USER_CONFIG_FILE}"`"
+DIRECTBOOT="`readConfigKey "directboot" "${USER_CONFIG_FILE}"`"
 SN="`readConfigKey "sn" "${USER_CONFIG_FILE}"`"
 
 ###############################################################################
@@ -59,73 +61,86 @@ function backtitle() {
 ###############################################################################
 # Shows available models to user choose one
 function modelMenu() {
-  RESTRICT=1
+  if [ -z "${1}" ]; then
-  FLGBETA=0
+    RESTRICT=1
-  while true; do
+    FLGBETA=0
-    echo "" > "${TMP_PATH}/menu"
+    dialog --backtitle "`backtitle`" --title "Model" --aspect 18 \
-    FLGNEX=0
+      --infobox "Reading models" 0 0
-    while read M; do
+    while true; do
-      M="`basename ${M}`"
+      echo "" > "${TMP_PATH}/menu"
-      M="${M::-4}"
+      FLGNEX=0
-      PLATFORM=`readModelKey "${M}" "platform"`
+      while read M; do
-      DT="`readModelKey "${M}" "dt"`"
+        M="`basename ${M}`"
-      BETA="`readModelKey "${M}" "beta"`"
+        M="${M::-4}"
-      [ "${BETA}" = "true" -a ${FLGBETA} -eq 0 ] && continue
+        PLATFORM=`readModelKey "${M}" "platform"`
-      # Check id model is compatible with CPU
+        DT="`readModelKey "${M}" "dt"`"
-      COMPATIBLE=1
+        BETA="`readModelKey "${M}" "beta"`"
-      if [ ${RESTRICT} -eq 1 ]; then
+        [ "${BETA}" = "true" -a ${FLGBETA} -eq 0 ] && continue
-        for F in `readModelArray "${M}" "flags"`; do
+        # Check id model is compatible with CPU
-          if ! grep -q "^flags.*${F}.*" /proc/cpuinfo; then
+        COMPATIBLE=1
-            COMPATIBLE=0
+        if [ ${RESTRICT} -eq 1 ]; then
-            FLGNEX=1
+          for F in `readModelArray "${M}" "flags"`; do
-            break
+            if ! grep -q "^flags.*${F}.*" /proc/cpuinfo; then
-          fi
+              COMPATIBLE=0
-        done
+              FLGNEX=1
+              break
+            fi
+          done
+        fi
+        [ "${DT}" = "true" ] && DT="-DT" || DT=""
+        [ ${COMPATIBLE} -eq 1 ] && echo "${M} \"\Zb${PLATFORM}${DT}\Zn\" " >> "${TMP_PATH}/menu"
+      done < <(find "${MODEL_CONFIG_PATH}" -maxdepth 1 -name \*.yml | sort)
+      [ ${FLGNEX} -eq 1 ] && echo "f \"\Z1Disable flags restriction\Zn\"" >> "${TMP_PATH}/menu"
+      [ ${FLGBETA} -eq 0 ] && echo "b \"\Z1Show beta models\Zn\"" >> "${TMP_PATH}/menu"
+      dialog --backtitle "`backtitle`" --colors --menu "Choose the model" 0 0 0 \
+        --file "${TMP_PATH}/menu" 2>${TMP_PATH}/resp
+      [ $? -ne 0 ] && return
+      resp=$(<${TMP_PATH}/resp)
+      [ -z "${resp}" ] && return
+      if [ "${resp}" = "f" ]; then
+        RESTRICT=0
+        continue
       fi
-      [ "${DT}" = "true" ] && DT="-DT" || DT=""
+      if [ "${resp}" = "b" ]; then
-      [ ${COMPATIBLE} -eq 1 ] && echo "${M} \"\Zb${PLATFORM}${DT}\Zn\" " >> "${TMP_PATH}/menu"
+        FLGBETA=1
-    done < <(find "${MODEL_CONFIG_PATH}" -maxdepth 1 -name \*.yml | sort)
+        continue
-    [ ${FLGNEX} -eq 1 ] && echo "f \"\Z1Disable flags restriction\Zn\"" >> "${TMP_PATH}/menu"
+      fi
-    [ ${FLGBETA} -eq 0 ] && echo "b \"\Z1Show beta models\Zn\"" >> "${TMP_PATH}/menu"
+      break
-    dialog --backtitle "`backtitle`" --colors --menu "Choose the model" 0 0 0 \
+    done
-      --file "${TMP_PATH}/menu" 2>${TMP_PATH}/resp
+  else
-    [ $? -ne 0 ] && return
+    resp="${1}"
-    resp=$(<${TMP_PATH}/resp)
+  fi
-    [ -z "${resp}" ] && return
+  # If user change model, clean buildnumber and S/N
-    if [ "${resp}" = "f" ]; then
+  if [ "${MODEL}" != "${resp}" ]; then
-      RESTRICT=0
+    MODEL=${resp}
-      continue
+    writeConfigKey "model" "${MODEL}" "${USER_CONFIG_FILE}"
-    fi
+    BUILD=""
-    if [ "${resp}" = "b" ]; then
+    writeConfigKey "build" "${BUILD}" "${USER_CONFIG_FILE}"
-      FLGBETA=1
+    SN=""
-      continue
+    writeConfigKey "sn" "${SN}" "${USER_CONFIG_FILE}"
-    fi
+    # Delete old files
-    # If user change model, clean buildnumber and S/N
+    rm -f "${ORI_ZIMAGE_FILE}" "${ORI_RDGZ_FILE}" "${MOD_ZIMAGE_FILE}" "${MOD_RDGZ_FILE}"
-    if [ "${MODEL}" != "${resp}" ]; then
+    DIRTY=1
-      MODEL=${resp}
+  fi
-      writeConfigKey "model" "${MODEL}" "${USER_CONFIG_FILE}"
-      BUILD=""
-      writeConfigKey "build" "${BUILD}" "${USER_CONFIG_FILE}"
-      SN=""
-      writeConfigKey "sn" "${SN}" "${USER_CONFIG_FILE}"
-      # Delete old files
-      rm -f "${ORI_ZIMAGE_FILE}" "${ORI_RDGZ_FILE}" "${MOD_ZIMAGE_FILE}" "${MOD_RDGZ_FILE}"
-      DIRTY=1
-    fi
-    break
-  done
 }
 
 ###############################################################################
 # Shows available buildnumbers from a model to user choose one
 function buildMenu() {
   ITEMS="`readConfigEntriesArray "builds" "${MODEL_CONFIG_PATH}/${MODEL}.yml" | sort -r`"
-  dialog --clear --no-items --backtitle "`backtitle`" \
+  if [ -z "${1}" ]; then
-    --menu "Choose a build number" 0 0 0 ${ITEMS} 2>${TMP_PATH}/resp
+    dialog --clear --no-items --backtitle "`backtitle`" \
-  [ $? -ne 0 ] && return
+      --menu "Choose a build number" 0 0 0 ${ITEMS} 2>${TMP_PATH}/resp
-  resp=$(<${TMP_PATH}/resp)
+    [ $? -ne 0 ] && return
-  [ -z "${resp}" ] && return
+    resp=$(<${TMP_PATH}/resp)
+    [ -z "${resp}" ] && return
+  else
+    if ! arrayExistItem "${1}" ${ITEMS}; then return; fi
+    resp="${1}"
+  fi
   if [ "${BUILD}" != "${resp}" ]; then
+    dialog --backtitle "`backtitle`" --title "Build Number" \
+      --infobox "Reconfiguring Synoinfo, Addons and Modules" 0 0
     BUILD=${resp}
     writeConfigKey "build" "${BUILD}" "${USER_CONFIG_FILE}"
     # Delete synoinfo and reload model/build synoinfo
@@ -142,6 +157,11 @@ function buildMenu() {
         deleteConfigKey "addons.${ADDON}" "${USER_CONFIG_FILE}"
       fi
     done < <(readConfigMap "addons" "${USER_CONFIG_FILE}")
+    # Rebuild modules
+    writeConfigKey "modules" "{}" "${USER_CONFIG_FILE}"
+    while read ID DESC; do
+      writeConfigKey "modules.${ID}" "" "${USER_CONFIG_FILE}"
+    done < <(getAllModules "${PLATFORM}" "${KVER}")
     # Remove old files
     rm -f "${ORI_ZIMAGE_FILE}" "${ORI_RDGZ_FILE}" "${MOD_ZIMAGE_FILE}" "${MOD_RDGZ_FILE}"
     DIRTY=1
@@ -287,8 +307,8 @@ function addonMenu() {
         [ -z "${URL}" ] && continue
         clear
         echo "Downloading ${URL}"
-        curl --insecure -L "${URL}" -o "${TMP_PATH}/addon.tgz" --progress-bar
+        STATUS=`curl --insecure -w "%{http_code}" -L "${URL}" -o "${TMP_PATH}/addon.tgz" --progress-bar`
-        if [ $? -ne 0 ]; then
+        if [ $? -ne 0 -o ${STATUS} -ne 200 ]; then
           dialog --backtitle "`backtitle`" --title "Error downloading" --aspect 18 \
             --msgbox "Check internet, URL or cache disk space" 0 0
           return 1
@@ -314,7 +334,7 @@ function cmdlineMenu() {
   while IFS="=" read KEY VALUE; do
     [ -n "${KEY}" ] && CMDLINE["${KEY}"]="${VALUE}"
   done < <(readConfigMap "cmdline" "${USER_CONFIG_FILE}")
-  echo "a \"Add/edit an cmdline item\""                         > "${TMP_PATH}/menu"
+  echo "a \"Add/edit a cmdline item\""                         > "${TMP_PATH}/menu"
   echo "d \"Delete cmdline item(s)\""                           >> "${TMP_PATH}/menu"
   echo "c \"Define a custom MAC\""                              >> "${TMP_PATH}/menu"
   echo "s \"Show user cmdline\""                                >> "${TMP_PATH}/menu"
@@ -445,7 +465,7 @@ function synoinfoMenu() {
     [ -n "${KEY}" ] && SYNOINFO["${KEY}"]="${VALUE}"
   done < <(readConfigMap "synoinfo" "${USER_CONFIG_FILE}")
 
-  echo "a \"Add/edit an synoinfo item\""   > "${TMP_PATH}/menu"
+  echo "a \"Add/edit a synoinfo item\""   > "${TMP_PATH}/menu"
   echo "d \"Delete synoinfo item(s)\""    >> "${TMP_PATH}/menu"
   if [ "${DT}" != "true" ]; then
     echo "x \"Set maxdisks manually\""    >> "${TMP_PATH}/menu"
@@ -526,28 +546,34 @@ function extractDsmFiles() {
   RAMDISK_HASH="`readModelKey "${MODEL}" "builds.${BUILD}.pat.ramdisk-hash"`"
   ZIMAGE_HASH="`readModelKey "${MODEL}" "builds.${BUILD}.pat.zimage-hash"`"
 
-  if [ ${RAMCACHE} -eq 0 ]; then
+  # If we have little disk space, clean cache folder
-    OUT_PATH="${CACHE_PATH}/dl"
+  if [ ${CLEARCACHE} -eq 1 ]; then
-    echo "Cache in disk"
+    echo "Cleaning cache"
-  else
+    rm -rf "${CACHE_PATH}/dl"
-    OUT_PATH="${TMP_PATH}/dl"
-    echo "Cache in ram"
   fi
-  mkdir -p "${OUT_PATH}"
+  mkdir -p "${CACHE_PATH}/dl"
+
+  SPACELEFT=`df --block-size=1 | awk '/'${LOADER_DEVICE_NAME}'3/{print$4}'`  # Check disk space left
 
   PAT_FILE="${MODEL}-${BUILD}.pat"
-  PAT_PATH="${OUT_PATH}/${PAT_FILE}"
+  PAT_PATH="${CACHE_PATH}/dl/${PAT_FILE}"
   EXTRACTOR_PATH="${CACHE_PATH}/extractor"
   EXTRACTOR_BIN="syno_extract_system_patch"
   OLDPAT_URL="https://global.download.synology.com/download/DSM/release/7.0.1/42218/DSM_DS3622xs%2B_42218.pat"
-  OLDPAT_PATH="${OUT_PATH}/DS3622xs+-42218.pat"
 
   if [ -f "${PAT_PATH}" ]; then
     echo "${PAT_FILE} cached."
   else
     echo "Downloading ${PAT_FILE}"
-    curl --insecure -L "${PAT_URL}" -o "${PAT_PATH}" --progress-bar
+    # Discover remote file size
-    if [ $? -ne 0 ]; then
+    FILESIZE=`curl --insecure -sLI "${PAT_URL}" | grep -i Content-Length | awk '{print$2}'`
+    if [ 0${FILESIZE} -ge ${SPACELEFT} ]; then
+      # No disk space to download, change it to RAMDISK
+      PAT_PATH="${TMP_PATH}/${PAT_FILE}"
+    fi
+    STATUS=`curl --insecure -w "%{http_code}" -L "${PAT_URL}" -o "${PAT_PATH}" --progress-bar`
+    if [ $? -ne 0 -o ${STATUS} -ne 200 ]; then
+      rm "${PAT_PATH}"
       dialog --backtitle "`backtitle`" --title "Error downloading" --aspect 18 \
         --msgbox "Check internet or cache disk space" 0 0
       return 1
@@ -589,6 +615,8 @@ function extractDsmFiles() {
       ;;
   esac
 
+  SPACELEFT=`df --block-size=1 | awk '/'${LOADER_DEVICE_NAME}'3/{print$4}'`  # Check disk space left
+
   if [ "${isencrypted}" = "yes" ]; then
     # Check existance of extractor
     if [ -f "${EXTRACTOR_PATH}/${EXTRACTOR_BIN}" ]; then
@@ -597,24 +625,34 @@ function extractDsmFiles() {
       # Extractor not exists, get it.
       mkdir -p "${EXTRACTOR_PATH}"
       # Check if old pat already downloaded
+      OLDPAT_PATH="${CACHE_PATH}/dl/DS3622xs+-42218.pat"
       if [ ! -f "${OLDPAT_PATH}" ]; then
         echo "Downloading old pat to extract synology .pat extractor..."
-        curl --insecure -L "${OLDPAT_URL}" \
+        # Discover remote file size
-          -o "${OLDPAT_PATH}"  --progress-bar
+        FILESIZE=`curl --insecure -sLI "${OLDPAT_URL}" | grep -i Content-Length | awk '{print$2}'`
-        if [ $? -ne 0 ]; then
+        if [ 0${FILESIZE} -ge ${SPACELEFT} ]; then
+          # No disk space to download, change it to RAMDISK
+          OLDPAT_PATH="${TMP_PATH}/DS3622xs+-42218.pat"
+        fi
+        STATUS=`curl --insecure -w "%{http_code}" -L "${OLDPAT_URL}" -o "${OLDPAT_PATH}"  --progress-bar`
+        if [ $? -ne 0 -o ${STATUS} -ne 200 ]; then
+          rm "${OLDPAT_PATH}"
           dialog --backtitle "`backtitle`" --title "Error downloading" --aspect 18 \
             --msgbox "Check internet or cache disk space" 0 0
           return 1
         fi
       fi
-      # Extract ramdisk from PAT
+      # Extract DSM ramdisk file from PAT
       rm -rf "${RAMDISK_PATH}"
       mkdir -p "${RAMDISK_PATH}"
       tar -xf "${OLDPAT_PATH}" -C "${RAMDISK_PATH}" rd.gz >"${LOG_FILE}" 2>&1
       if [ $? -ne 0 ]; then
+        rm -f "${OLDPAT_PATH}"
+        rm -rf "${RAMDISK_PATH}"
         dialog --backtitle "`backtitle`" --title "Error extracting" --textbox "${LOG_FILE}" 0 0
+        return 1
       fi
-
+      [ ${CLEARCACHE} -eq 1 ] && rm -f "${OLDPAT_PATH}"
       # Extract all files from rd.gz
       (cd "${RAMDISK_PATH}"; xz -dc < rd.gz | cpio -idm) >/dev/null 2>&1 || true
       # Copy only necessary files
@@ -664,9 +702,12 @@ function extractDsmFiles() {
   cp "${UNTAR_PAT_PATH}/GRUB_VER"        "${SLPART_PATH}"
   cp "${UNTAR_PAT_PATH}/zImage"          "${ORI_ZIMAGE_FILE}"
   cp "${UNTAR_PAT_PATH}/rd.gz"           "${ORI_RDGZ_FILE}"
+  rm -rf "${UNTAR_PAT_PATH}"
   echo "OK"
 }
 
+###############################################################################
+# Where the magic happens!
 function make() {
   clear
   PLATFORM="`readModelKey "${MODEL}" "platform"`"
@@ -708,14 +749,164 @@ function make() {
 }
 
 ###############################################################################
-# Calls boot.sh to boot into DSM kernel/ramdisk
+# Advanced menu
-function boot() {
+function advancedMenu() {
-  [ ${DIRTY} -eq 1 ] && dialog --backtitle "`backtitle`" --title "Alert" \
+  NEXT="l"
-    --yesno "Config changed, would you like to rebuild the loader?" 0 0
+  while true; do
-  if [ $? -eq 0 ]; then
+    rm "${TMP_PATH}/menu"
-    make || return
+    if [ -n "${BUILD}" ]; then
+      echo "l \"Switch LKM version: \Z4${LKM}\Zn\""        >> "${TMP_PATH}/menu"
+      echo "o \"Modules\""                                 >> "${TMP_PATH}/menu"
+    fi
+    if loaderIsConfigured; then
+      echo "r \"Switch direct boot: \Z4${DIRECTBOOT}\Zn\"" >> "${TMP_PATH}/menu"
+    fi
+    echo "u \"Edit user config file manually\""            >> "${TMP_PATH}/menu"
+    echo "t \"Try to recovery a DSM installed system\""    >> "${TMP_PATH}/menu"
+    echo "e \"Exit\""                                      >> "${TMP_PATH}/menu"
+
+    dialog --default-item ${NEXT} --backtitle "`backtitle`" --title "Advanced" \
+      --colors --menu "Choose the option" 0 0 0 --file "${TMP_PATH}/menu" \
+      2>${TMP_PATH}/resp
+    [ $? -ne 0 ] && break
+    case `<"${TMP_PATH}/resp"` in
+      l) [ "${LKM}" = "dev" ] && LKM='prod' || LKM='dev'
+        writeConfigKey "lkm" "${LKM}" "${USER_CONFIG_FILE}"
+        DIRTY=1
+        NEXT="o"
+        ;;
+      o) selectModules; NEXT="r" ;;
+      r) [ "${DIRECTBOOT}" = "false" ] && DIRECTBOOT='true' || DIRECTBOOT='false'
+        writeConfigKey "directboot" "${DIRECTBOOT}" "${USER_CONFIG_FILE}"
+        NEXT="u"
+        ;;
+      u) editUserConfig; NEXT="e" ;;
+      t) tryRecoveryDSM ;;
+      e) break ;;
+    esac
+  done
+}
+
+###############################################################################
+# Try to recovery a DSM already installed
+function tryRecoveryDSM() {
+  dialog --backtitle "`backtitle`" --title "Try recovery DSM" --aspect 18 \
+    --infobox "Trying to recovery a DSM installed system" 0 0
+  if findAndMountDSMRoot; then
+    MODEL=""
+    BUILD=""
+    if [ -f "${DSMROOT_PATH}/.syno/patch/VERSION" ]; then
+      eval `cat ${DSMROOT_PATH}/.syno/patch/VERSION | grep unique`
+      eval `cat ${DSMROOT_PATH}/.syno/patch/VERSION | grep base`
+      if [ -n "${unique}" ] ; then
+        while read F; do
+          M="`basename ${F}`"
+          M="${M::-4}"
+          UNIQUE=`readModelKey "${M}" "unique"`
+          [ "${unique}" = "${UNIQUE}" ] || continue
+          # Found
+          modelMenu "${M}"
+        done < <(find "${MODEL_CONFIG_PATH}" -maxdepth 1 -name \*.yml | sort)
+        if [ -n "${MODEL}" ]; then
+          buildMenu ${base}
+          if [ -n "${BUILD}" ]; then
+            cp "${DSMROOT_PATH}/.syno/patch/zImage" "${SLPART_PATH}"
+            cp "${DSMROOT_PATH}/.syno/patch/rd.gz" "${SLPART_PATH}"
+            MSG="Found a installation:\nModel: ${MODEL}\nBuildnumber: ${BUILD}"
+            SN=`_get_conf_kv SN "${DSMROOT_PATH}/etc/synoinfo.conf"`
+            if [ -n "${SN}" ]; then
+              writeConfigKey "sn" "${SN}" "${USER_CONFIG_FILE}"
+              MSG+="\nSerial: ${SN}"
+            fi
+            dialog --backtitle "`backtitle`" --title "Try recovery DSM" \
+              --aspect 18 --msgbox "${MSG}" 0 0
+          fi
+        fi
+      fi
+    fi
+  else
+    dialog --backtitle "`backtitle`" --title "Try recovery DSM" --aspect 18 \
+      --msgbox "Unfortunately I couldn't mount the DSM partition!" 0 0
   fi
-  boot.sh
+}
+
+###############################################################################
+# Permit user select the modules to include
+function selectModules() {
+  PLATFORM="`readModelKey "${MODEL}" "platform"`"
+  KVER="`readModelKey "${MODEL}" "builds.${BUILD}.kver"`"
+  dialog --backtitle "`backtitle`" --title "Modules" --aspect 18 \
+    --infobox "Reading modules" 0 0
+  ALLMODULES=`getAllModules "${PLATFORM}" "${KVER}"`
+  unset USERMODULES
+  declare -A USERMODULES
+  while IFS="=" read KEY VALUE; do
+    [ -n "${KEY}" ] && USERMODULES["${KEY}"]="${VALUE}"
+  done < <(readConfigMap "modules" "${USER_CONFIG_FILE}")
+  # menu loop
+  while true; do
+    dialog --backtitle "`backtitle`" --menu "Choose a option" 0 0 0 \
+      s "Show selected modules" \
+      a "Select all modules" \
+      d "Deselect all modules" \
+      c "Choose modules to include" \
+      e "Exit" \
+      2>${TMP_PATH}/resp
+    [ $? -ne 0 ] && break
+    case "`<${TMP_PATH}/resp`" in
+      s) ITEMS=""
+        for KEY in ${!USERMODULES[@]}; do
+          ITEMS+="${KEY}: ${USERMODULES[$KEY]}\n"
+        done
+        dialog --backtitle "`backtitle`" --title "User modules" \
+          --msgbox "${ITEMS}" 0 0
+        ;;
+      a) dialog --backtitle "`backtitle`" --title "Modules" \
+           --infobox "Selecting all modules" 0 0
+        unset USERMODULES
+        declare -A USERMODULES
+        writeConfigKey "modules" "{}" "${USER_CONFIG_FILE}"
+        while read ID DESC; do
+          USERMODULES["${ID}"]=""
+          writeConfigKey "modules.${ID}" "" "${USER_CONFIG_FILE}"
+        done <<<${ALLMODULES}
+        ;;
+
+      d) dialog --backtitle "`backtitle`" --title "Modules" \
+           --infobox "Deselecting all modules" 0 0
+        writeConfigKey "modules" "{}" "${USER_CONFIG_FILE}"
+        unset USERMODULES
+        declare -A USERMODULES
+        ;;
+
+      c)
+        rm -f "${TMP_PATH}/opts"
+        while read ID DESC; do
+          arrayExistItem "${ID}" "${!USERMODULES[@]}" && ACT="on" || ACT="off"
+          echo "${ID} ${DESC} ${ACT}" >> "${TMP_PATH}/opts"
+        done <<<${ALLMODULES}
+        dialog --backtitle "`backtitle`" --title "Modules" --aspect 18 \
+          --checklist "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`" --title "Modules" \
+           --infobox "Writing to user config" 0 0
+        unset USERMODULES
+        declare -A USERMODULES
+        writeConfigKey "modules" "{}" "${USER_CONFIG_FILE}"
+        for ID in ${resp}; do
+          USERMODULES["${ID}"]=""
+          writeConfigKey "modules.${ID}" "" "${USER_CONFIG_FILE}"
+        done
+        ;;
+
+      e)
+        break
+        ;;
+    esac
+  done
 }
 
 ###############################################################################
@@ -744,6 +935,17 @@ function editUserConfig() {
   DIRTY=1
 }
 
+###############################################################################
+# Calls boot.sh to boot into DSM kernel/ramdisk
+function boot() {
+  [ ${DIRTY} -eq 1 ] && dialog --backtitle "`backtitle`" --title "Alert" \
+    --yesno "Config changed, would you like to rebuild the loader?" 0 0
+  if [ $? -eq 0 ]; then
+    make || return
+  fi
+  boot.sh
+}
+
 ###############################################################################
 # Shows available keymaps to user choose one
 function keymapMenu() {
@@ -798,26 +1000,41 @@ function updateMenu() {
         fi
         dialog --backtitle "`backtitle`" --title "Update arpl" --aspect 18 \
           --infobox "Downloading last version ${TAG}" 0 0
-        curl --insecure -s -L "https://github.com/fbelavenuto/arpl/releases/download/${TAG}/bzImage" -o /tmp/bzImage
+        # Download update file
-        if [ $? -ne 0 ]; then
+        STATUS=`curl --insecure -w "%{http_code}" -L \
+          "https://github.com/fbelavenuto/arpl/releases/download/${TAG}/update.zip" -o /tmp/update.zip`
+        if [ $? -ne 0 -o ${STATUS} -ne 200 ]; then
           dialog --backtitle "`backtitle`" --title "Update arpl" --aspect 18 \
-            --msgbox "Error downloading bzImage" 0 0
+            --msgbox "Error downloading update file" 0 0
           continue
         fi
-        curl --insecure -s -L "https://github.com/fbelavenuto/arpl/releases/download/${TAG}/rootfs.cpio.xz" -o /tmp/rootfs.cpio.xz
+        unzip -oq /tmp/update.zip -d /tmp
         if [ $? -ne 0 ]; then
           dialog --backtitle "`backtitle`" --title "Update arpl" --aspect 18 \
-            --msgbox "Error downloading rootfs.cpio.xz" 0 0
+            --msgbox "Error extracting update file" 0 0
+          continue
+        fi
+        # Check checksums
+        (cd /tmp && sha256sum --status -c sha256sum)
+        if [ $? -ne 0 ]; then
+          dialog --backtitle "`backtitle`" --title "Update arpl" --aspect 18 \
+            --msgbox "Checksum do not match!" 0 0
           continue
         fi
         dialog --backtitle "`backtitle`" --title "Update arpl" --aspect 18 \
           --infobox "Installing new files" 0 0
-        mv /tmp/bzImage "${ARPL_BZIMAGE_FILE}"
+        # Process update-list.yml
-        mv /tmp/rootfs.cpio.xz "${ARPL_RAMDISK_FILE}"
+        while IFS="=" read KEY VALUE; do
+          mv /tmp/`basename "${KEY}"` "${VALUE}"
+        done < <(readConfigMap "replace" "/tmp/update-list.yml")
+        while read F; do
+          [ -f "${F}" ] && rm -f "${F}"
+          [ -d "${F}" ] && rm -Rf "${F}"
+        done < <(readConfigArray "remove" "/tmp/update-list.yml")
         dialog --backtitle "`backtitle`" --title "Update arpl" --aspect 18 \
           --yesno "Arpl updated with success to ${TAG}!\nReboot?" 0 0
         [ $? -ne 0 ] && continue
-        reboot
+        arpl-reboot.sh config
         exit
         ;;
 
@@ -832,8 +1049,8 @@ function updateMenu() {
         fi
         dialog --backtitle "`backtitle`" --title "Update addons" --aspect 18 \
           --infobox "Downloading last version" 0 0
-        curl --insecure -s -L "https://github.com/fbelavenuto/arpl-addons/releases/download/${TAG}/addons.zip" -o /tmp/addons.zip
+        STATUS=`curl --insecure -s -w "%{http_code}" -L "https://github.com/fbelavenuto/arpl-addons/releases/download/${TAG}/addons.zip" -o /tmp/addons.zip`
-        if [ $? -ne 0 ]; then
+        if [ $? -ne 0 -o ${STATUS} -ne 200 ]; then
           dialog --backtitle "`backtitle`" --title "Update addons" --aspect 18 \
             --msgbox "Error downloading new version" 0 0
           continue
@@ -845,6 +1062,7 @@ function updateMenu() {
         unzip /tmp/addons.zip -d /tmp/addons >/dev/null 2>&1
         dialog --backtitle "`backtitle`" --title "Update addons" --aspect 18 \
           --infobox "Installing new addons" 0 0
+        rm -Rf "${ADDONS_PATH}/"*
         for PKG in `ls /tmp/addons/*.addon`; do
           ADDON=`basename ${PKG} | sed 's|.addon||'`
           rm -rf "${ADDONS_PATH}/${ADDON}"
@@ -867,8 +1085,8 @@ function updateMenu() {
         fi
         dialog --backtitle "`backtitle`" --title "Update LKMs" --aspect 18 \
           --infobox "Downloading last version" 0 0
-        curl --insecure -s -L "https://github.com/fbelavenuto/redpill-lkm/releases/download/${TAG}/rp-lkms.zip" -o /tmp/rp-lkms.zip
+        STATUS=`curl --insecure -s -w "%{http_code}" -L "https://github.com/fbelavenuto/redpill-lkm/releases/download/${TAG}/rp-lkms.zip" -o /tmp/rp-lkms.zip`
-        if [ $? -ne 0 ]; then
+        if [ $? -ne 0 -o ${STATUS} -ne 200 ]; then
           dialog --backtitle "`backtitle`" --title "Update LKMs" --aspect 18 \
             --msgbox "Error downloading last version" 0 0
           continue
@@ -905,8 +1123,8 @@ function updateMenu() {
         for P in ${!PLATFORMS[@]}; do
           dialog --backtitle "`backtitle`" --title "Update Modules" --aspect 18 \
             --infobox "Downloading ${P} modules" 0 0
-          curl --insecure -s -L "https://github.com/fbelavenuto/arpl-modules/releases/download/${TAG}/${P}.tgz" -o "/tmp/${P}.tgz"
+          STATUS=`curl --insecure -s -w "%{http_code}" -L "https://github.com/fbelavenuto/arpl-modules/releases/download/${TAG}/${P}.tgz" -o "/tmp/${P}.tgz"`
-          if [ $? -ne 0 ]; then
+          if [ $? -ne 0 -o ${STATUS} -ne 200 ]; then
             dialog --backtitle "`backtitle`" --title "Update Modules" --aspect 18 \
               --msgbox "Error downloading ${P}.tgz" 0 0
             continue
@@ -914,6 +1132,11 @@ function updateMenu() {
           rm "${MODULES_PATH}/${P}.tgz"
           mv "/tmp/${P}.tgz" "${MODULES_PATH}/${P}.tgz"
         done
+        # Rebuild modules
+        writeConfigKey "modules" "{}" "${USER_CONFIG_FILE}"
+        while read ID DESC; do
+          writeConfigKey "modules.${ID}" "" "${USER_CONFIG_FILE}"
+        done < <(getAllModules "${PLATFORM}" "${KVER}")
         DIRTY=1
         dialog --backtitle "`backtitle`" --title "Update Modules" --aspect 18 \
           --msgbox "Modules updated with success!" 0 0
@@ -926,6 +1149,10 @@ function updateMenu() {
 ###############################################################################
 ###############################################################################
 
+if [ "x$1" = "xb" -a -n "${MODEL}" -a -n "${BUILD}" -a loaderIsConfigured ]; then
+  make
+  boot
+fi
 # Main loop
 NEXT="m"
 while true; do
@@ -937,17 +1164,25 @@ while true; do
       echo "a \"Addons\""                             >> "${TMP_PATH}/menu"
       echo "x \"Cmdline menu\""                       >> "${TMP_PATH}/menu"
       echo "i \"Synoinfo menu\""                      >> "${TMP_PATH}/menu"
-      echo "l \"Switch LKM version: \Z4${LKM}\Zn\""   >> "${TMP_PATH}/menu"
+    fi
+  fi
+  echo "v \"Advanced menu\""                          >> "${TMP_PATH}/menu"
+  if [ -n "${MODEL}" ]; then
+    if [ -n "${BUILD}" ]; then
       echo "d \"Build the loader\""                   >> "${TMP_PATH}/menu"
     fi
   fi
-  loaderIsConfigured && echo "b \"Boot the loader\" " >> "${TMP_PATH}/menu"
+  if loaderIsConfigured; then
-  echo "u \"Edit user config file manually\""         >> "${TMP_PATH}/menu"
+    echo "b \"Boot the loader\" "                     >> "${TMP_PATH}/menu"
+  fi
   echo "k \"Choose a keymap\" "                       >> "${TMP_PATH}/menu"
-  [ ${RAMCACHE} -eq 0 -a -d "${CACHE_PATH}/dl" ] && echo "c \"Clean disk cache\"" >> "${TMP_PATH}/menu"
+  if [ ${CLEARCACHE} -eq 1 -a -d "${CACHE_PATH}/dl" ]; then
+    echo "c \"Clean disk cache\""                     >> "${TMP_PATH}/menu"
+  fi
   echo "p \"Update menu\""                            >> "${TMP_PATH}/menu"
-  echo "e \"Exit\"" >> "${TMP_PATH}/menu"
+  echo "e \"Exit\""                                   >> "${TMP_PATH}/menu"
-  dialog --clear --default-item ${NEXT} --backtitle "`backtitle`" --colors \
+
+  dialog --default-item ${NEXT} --backtitle "`backtitle`" --colors \
     --menu "Choose the option" 0 0 0 --file "${TMP_PATH}/menu" \
     2>${TMP_PATH}/resp
   [ $? -ne 0 ] && break
@@ -957,14 +1192,10 @@ while true; do
     s) serialMenu; NEXT="a" ;;
     a) addonMenu; NEXT="x" ;;
     x) cmdlineMenu; NEXT="i" ;;
-    i) synoinfoMenu; NEXT="l" ;;
+    i) synoinfoMenu; NEXT="v" ;;
-    l) [ "${LKM}" = "dev" ] && LKM='prod' || LKM='dev'
+    v) advancedMenu; NEXT="d" ;;
-      writeConfigKey "lkm" "${LKM}" "${USER_CONFIG_FILE}"
-      NEXT="d"
-      ;;
     d) make; NEXT="b" ;;
     b) boot ;;
-    u) editUserConfig; NEXT="u" ;;
     k) keymapMenu ;;
     c) dialog --backtitle "`backtitle`" --title "Cleaning" --aspect 18 \
       --prgbox "rm -rfv \"${CACHE_PATH}/dl\"" 0 0 ;;

files/board/arpl/overlayfs/opt/arpl/model-configs/DS1520+.yml

@@ -2,11 +2,10 @@ id: "DS1520+"
 synoinfo: &synoinfo
   support_disk_compatibility: "no"
   support_memory_compatibility: "no"
+  support_led_brightness_adjustment: "no"
   rss_server: "https://raw.githubusercontent.com/fbelavenuto/arpl/main/rss.xml"
   rss_server_ssl: "https://raw.githubusercontent.com/fbelavenuto/arpl/main/rss.xml"
   rss_server_v2: "https://raw.githubusercontent.com/fbelavenuto/arpl/main/rss.json"
-  small_info_path: "https://example.com/null"
-  security_version_server: "https://example.com/smallupdate"
 cmdline: &cmdline
   intel_iommu: igfx_off
   HddEnableDynamicPower: 1
@@ -14,14 +13,15 @@ cmdline: &cmdline
   synoboot2:
   syno_ttyS0: "serial,0x3f8"
   syno_ttyS1: "serial,0x2f8"
+  elevator: elevator
 platform: "geminilake"
 unique: "synology_geminilake_1520+"
 beta: true
 dom: 2
 serial:
   prefix:
-    - "0000"
+    - "2060"
-  middle: "XXX"
+  middle: "RYR"
   suffix: "alpha"
 disks: 6
 dt: true
@@ -30,7 +30,6 @@ builds:
     ver: "7.0.1"
     kver: "4.4.180"
     rd-compressed: false
-    efi-bug: no
     cmdline:
       <<: *cmdline
     synoinfo:
@@ -44,13 +43,13 @@ builds:
     patch:
       - "ramdisk-common-disable-root-pwd.patch"
       - "ramdisk-common-init-script.patch"
+      - "ramdisk-common-etc-rc.patch"
       - "ramdisk-common-post-init-script.patch"
 
   42661:
     ver: "7.1.0"
     kver: "4.4.180"
     rd-compressed: false
-    efi-bug: no
     cmdline:
       <<: *cmdline
     synoinfo:
@@ -64,24 +63,25 @@ builds:
     patch:
       - "ramdisk-common-disable-root-pwd.patch"
       - "ramdisk-common-init-script.patch"
+      - "ramdisk-common-etc-rc.patch"
       - "ramdisk-42661-post-init-script.patch"
 
-  42951:
+  42962:
     ver: "7.1.1"
     kver: "4.4.180"
     rd-compressed: false
-    efi-bug: no
     cmdline:
       <<: *cmdline
     synoinfo:
       <<: *synoinfo
     pat:
-      url: "https://global.download.synology.com/download/DSM/release/7.1.1/42951/DSM_DS1520%2B_42951.pat"
+      url: "https://global.download.synology.com/download/DSM/release/7.1.1/42962/DSM_DS1520%2B_42962.pat"
-      hash: "32063eb34a0e29402c7774d60bb3b7247f894c60e676a437de00cd21b9b68cdb"
+      hash: "f19d2ac39fae564797c148929b8fe7c9740ac3a74099bf573b68df8fe0228cb3"
-      ramdisk-hash: "1afd618cd6799087320343a48a3992594730e2e807110f2770a4cf3f708f8ccd"
+      ramdisk-hash: "aad75938d165ef5efdbfc4c570c4cd1cc252344d0756dd3d89a44f581aa6be6f"
-      zimage-hash: "bbfa903358576e5545c3c3c021c292637360f0925de5e59cb3e785f92db71fd3"
+      zimage-hash: "89ee173272101e6714728e73930d8b31a414f9f1eca8ab78f45c12fc721138ab"
-      md5-hash: "5fd40dc13c83ff14bc10fd43a7d19606"
+      md5-hash: "b7b4a7c7f9160023e1129e4097403828"
     patch:
       - "ramdisk-common-disable-root-pwd.patch"
       - "ramdisk-common-init-script.patch"
+      - "ramdisk-common-etc-rc.patch"
       - "ramdisk-42951-post-init-script.patch"

files/board/arpl/overlayfs/opt/arpl/model-configs/DS1621+.yml

@@ -2,11 +2,10 @@ id: "DS1621+"
 synoinfo: &synoinfo
   support_disk_compatibility: "no"
   support_memory_compatibility: "no"
+  support_led_brightness_adjustment: "no"
   rss_server: "https://raw.githubusercontent.com/fbelavenuto/arpl/main/rss.xml"
   rss_server_ssl: "https://raw.githubusercontent.com/fbelavenuto/arpl/main/rss.xml"
   rss_server_v2: "https://raw.githubusercontent.com/fbelavenuto/arpl/main/rss.json"
-  small_info_path: "https://example.com/null"
-  security_version_server: "https://example.com/smallupdate"
 cmdline: &cmdline
   SMBusHddDynamicPower: 1
   syno_hdd_powerup_seq: 0
@@ -17,6 +16,7 @@ cmdline: &cmdline
   synoboot2:
   syno_ttyS0: "serial,0x3f8"
   syno_ttyS1: "serial,0x2f8"
+  elevator: elevator
 platform: "v1000"
 unique: "synology_v1000_1621+"
 dom: 2
@@ -32,7 +32,6 @@ builds:
     ver: "7.0.1"
     kver: "4.4.180"
     rd-compressed: false
-    efi-bug: no
     cmdline:
       <<: *cmdline
     synoinfo:
@@ -46,13 +45,13 @@ builds:
     patch:
       - "ramdisk-common-disable-root-pwd.patch"
       - "ramdisk-common-init-script.patch"
+      - "ramdisk-common-etc-rc.patch"
       - "ramdisk-common-post-init-script.patch"
 
   42661:
     ver: "7.1.0"
     kver: "4.4.180"
     rd-compressed: false
-    efi-bug: no
     cmdline:
       <<: *cmdline
     synoinfo:
@@ -66,24 +65,25 @@ builds:
     patch:
       - "ramdisk-common-disable-root-pwd.patch"
       - "ramdisk-common-init-script.patch"
+      - "ramdisk-common-etc-rc.patch"
       - "ramdisk-42661-post-init-script.patch"
 
-  42951:
+  42962:
     ver: "7.1.1"
     kver: "4.4.180"
     rd-compressed: false
-    efi-bug: no
     cmdline:
       <<: *cmdline
     synoinfo:
       <<: *synoinfo
     pat:
-      url: "https://global.download.synology.com/download/DSM/release/7.1.1/42951/DSM_DS1621%2B_42951.pat"
+      url: "https://global.download.synology.com/download/DSM/release/7.1.1/42962/DSM_DS1621%2B_42962.pat"
-      hash: "127bc3a5405761915f8a4669c925defd39b31b9740064af357ff2db928314ac9"
+      hash: "bd88dfdf1eccdf7fefcdac67e11929818ae3aea938fd13286c1ac7b5aaa3964f"
-      ramdisk-hash: "12553531c3e8820241babc6b5176ea6f417368e80740c086b6897a67c8783f6e"
+      ramdisk-hash: "7a900e3017b4ee09b792d2ed291b7229476ae3e583fe559bbd9baaa812705aa0"
-      zimage-hash: "d28951da0eb41286fbe37ffdfc880271787573d68226e5d26321819cf2d2e6e2"
+      zimage-hash: "b0f296aad0cc3b8adba13483f89770d0a4daf9b9cab335910717448b1eaa8254"
-      md5-hash: "4e52301c56ae5e7b03ff9ea1f8392d43"
+      md5-hash: "b5e6be956385c1b49825517409265a44"
     patch:
       - "ramdisk-common-disable-root-pwd.patch"
       - "ramdisk-common-init-script.patch"
+      - "ramdisk-common-etc-rc.patch"
       - "ramdisk-42951-post-init-script.patch"

files/board/arpl/overlayfs/opt/arpl/model-configs/DS2422+.yml

@@ -4,11 +4,10 @@ synoinfo: &synoinfo
   support_memory_compatibility: "no"
   supportraidgroup: "no"
   supportssdcache: "no"
+  support_led_brightness_adjustment: "no"
   rss_server: "https://raw.githubusercontent.com/fbelavenuto/arpl/main/rss.xml"
   rss_server_ssl: "https://raw.githubusercontent.com/fbelavenuto/arpl/main/rss.xml"
   rss_server_v2: "https://raw.githubusercontent.com/fbelavenuto/arpl/main/rss.json"
-  small_info_path: "https://example.com/null"
-  security_version_server: "https://example.com/smallupdate"
 cmdline: &cmdline
   SMBusHddDynamicPower: 1
   vender_format_version: 2
@@ -17,6 +16,7 @@ cmdline: &cmdline
   synoboot2:
   syno_ttyS0: "serial,0x3f8"
   syno_ttyS1: "serial,0x2f8"
+  elevator: elevator
 platform: "v1000"
 unique: "synology_v1000_2422+"
 dom: 2
@@ -33,7 +33,6 @@ builds:
     ver: "7.0.1"
     kver: "4.4.180"
     rd-compressed: false
-    efi-bug: no
     cmdline:
       <<: *cmdline
     synoinfo:
@@ -47,12 +46,12 @@ builds:
     patch:
       - "ramdisk-common-disable-root-pwd.patch"
       - "ramdisk-common-init-script.patch"
+      - "ramdisk-common-etc-rc.patch"
       - "ramdisk-common-post-init-script.patch"
   42661:
     ver: "7.1.0"
     kver: "4.4.180"
     rd-compressed: false
-    efi-bug: no
     cmdline:
       <<: *cmdline
     synoinfo:
@@ -66,24 +65,25 @@ builds:
     patch:
       - "ramdisk-common-disable-root-pwd.patch"
       - "ramdisk-common-init-script.patch"
+      - "ramdisk-common-etc-rc.patch"
       - "ramdisk-42661-post-init-script.patch"
 
-  42951:
+  42962:
     ver: "7.1.1"
     kver: "4.4.180"
     rd-compressed: false
-    efi-bug: no
     cmdline:
       <<: *cmdline
     synoinfo:
       <<: *synoinfo
     pat:
-      url: "https://global.download.synology.com/download/DSM/release/7.1.1/42951/DSM_DS2422%2B_42951.pat"
+      url: "https://global.download.synology.com/download/DSM/release/7.1.1/42962/DSM_DS2422%2B_42962.pat"
-      hash: "ff2e444040f8105079260396649466d791fc8c6613c52ed78d993a784547476d"
+      hash: "a887cc3f06e2b51d34f682a1a812637486aeefbef57c309414f69c3e5514edef"
-      ramdisk-hash: "a3a7571bf0220dfe53f750a554c1b570ce4a66792b0dc1c9f2d093f5d7d212b5"
+      ramdisk-hash: "edcf0e07e2773326d7f6c2f17a0c2d18e8ef4600a720bbdd4965fc1f11eb21e9"
-      zimage-hash: "d28951da0eb41286fbe37ffdfc880271787573d68226e5d26321819cf2d2e6e2"
+      zimage-hash: "b0f296aad0cc3b8adba13483f89770d0a4daf9b9cab335910717448b1eaa8254"
-      md5-hash: "40da0cb929793e3d165f5958d4a5533b"
+      md5-hash: "97e2f7a56f011d8a7414867ac07d37cb"
     patch:
       - "ramdisk-common-disable-root-pwd.patch"
       - "ramdisk-common-init-script.patch"
+      - "ramdisk-common-etc-rc.patch"
       - "ramdisk-42951-post-init-script.patch"

files/board/arpl/overlayfs/opt/arpl/model-configs/DS3615xs.yml

@@ -6,15 +6,16 @@ synoinfo: &synoinfo
   supportssdcache: "no"
   esataportcfg: "0x0"
   usbportcfg: "0x8700"
+  support_led_brightness_adjustment: "no"
   rss_server: "https://raw.githubusercontent.com/fbelavenuto/arpl/main/rss.xml"
   rss_server_ssl: "https://raw.githubusercontent.com/fbelavenuto/arpl/main/rss.xml"
-  small_info_path: "https://example.com/null"
 cmdline: &cmdline
   syno_hdd_powerup_seq: 0
   HddHotplug: 0
   vender_format_version: 2
   syno_port_thaw: 1
   syno_hdd_detect: 0
+  elevator: elevator
 platform: "bromolow"
 unique: "synology_bromolow_3615xs"
 serial:
@@ -32,7 +33,6 @@ builds:
     ver: "7.0.1"
     kver: "3.10.108"
     rd-compressed: false
-    efi-bug: yes
     cmdline:
       <<: *cmdline
     synoinfo:
@@ -46,6 +46,7 @@ builds:
     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"
 
@@ -53,7 +54,6 @@ builds:
     ver: "7.1.0"
     kver: "3.10.108"
     rd-compressed: false
-    efi-bug: yes
     cmdline:
       <<: *cmdline
     synoinfo:
@@ -67,26 +67,27 @@ builds:
     patch:
       - "ramdisk-common-disable-root-pwd.patch"
       - "ramdisk-common-init-script.patch"
+      - "ramdisk-common-etc-rc.patch"
       - "ramdisk-42661-post-init-script.patch"
       - "ramdisk-42661-disable-disabled-ports.patch"
 
-  42951:
+  42962:
     ver: "7.1.1"
     kver: "3.10.108"
     rd-compressed: false
-    efi-bug: no
     cmdline:
       <<: *cmdline
     synoinfo:
       <<: *synoinfo
     pat:
-      url: "https://global.download.synology.com/download/DSM/release/7.1.1/42951/DSM_DS3615xs_42951.pat"
+      url: "https://global.download.synology.com/download/DSM/release/7.1.1/42962/DSM_DS3615xs_42962.pat"
-      hash: "f1de39322babe5664a30e0d16b9ce3d73aeb30742cb7b8def09f40d1577fc5a2"
+      hash: "b79c129354c203b7340010573d16b2d6ebc6a676c946579a959c891a70b8bcfc"
-      ramdisk-hash: "0e353b4a8b1f8efa40e6f853a8d16553dfdf1ebc10bcabbe8dfa7803343c26ef"
+      ramdisk-hash: "e4bdca874027b603a18d7b44cc312f3eb6d6cbf2e49329ef51753fc322d880c0"
-      zimage-hash: "6c535aa513dedc6c2a2b43158e1298c9ea67bf5f909cc19a904e24b51028820b"
+      zimage-hash: "b7d2ca699195a1990f838690be32a65158d4ed01e8126af2ddb27a0f08e177ca"
-      md5-hash: "1f6831d8706d8337f06a6028037fe120"
+      md5-hash: "84a8d6d92a7a44c775ff995cac555a19"
     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"

files/board/arpl/overlayfs/opt/arpl/model-configs/DS3617xs.yml

@@ -6,16 +6,16 @@ synoinfo: &synoinfo
   supportssdcache: "no"
   esataportcfg: "0x00"
   usbportcfg: "0x8700"
+  support_led_brightness_adjustment: "no"
   rss_server: "https://raw.githubusercontent.com/fbelavenuto/arpl/main/rss.xml"
   rss_server_ssl: "https://raw.githubusercontent.com/fbelavenuto/arpl/main/rss.xml"
-  small_info_path: "https://example.com/null"
-  security_version_server: "https://example.com/smallupdate"
 cmdline: &cmdline
   syno_hdd_powerup_seq: 0
   HddHotplug: 0
   vender_format_version: 2
   syno_port_thaw: 1
   syno_hdd_detect: 0
+  elevator: elevator
 platform: "broadwell"
 unique: "synology_broadwell_3617xs"
 dom: 1
@@ -33,7 +33,6 @@ builds:
     ver: "7.0.1"
     kver: "4.4.180"
     rd-compressed: false
-    efi-bug: no
     cmdline:
       <<: *cmdline
     synoinfo:
@@ -47,6 +46,7 @@ builds:
     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"
 
@@ -54,7 +54,6 @@ builds:
     ver: "7.1.0"
     kver: "4.4.180"
     rd-compressed: false
-    efi-bug: no
     cmdline:
       <<: *cmdline
     synoinfo:
@@ -68,26 +67,27 @@ builds:
     patch:
       - "ramdisk-common-disable-root-pwd.patch"
       - "ramdisk-common-init-script.patch"
+      - "ramdisk-common-etc-rc.patch"
       - "ramdisk-42661-post-init-script.patch"
       - "ramdisk-42661-disable-disabled-ports.patch"
 
-  42951:
+  42962:
     ver: "7.1.1"
     kver: "4.4.180"
     rd-compressed: false
-    efi-bug: no
     cmdline:
       <<: *cmdline
     synoinfo:
       <<: *synoinfo
     pat:
-      url: "https://global.download.synology.com/download/DSM/release/7.1.1/42951/DSM_DS3617xs_42951.pat"
+      url: "https://global.download.synology.com/download/DSM/release/7.1.1/42962/DSM_DS3617xs_42962.pat"
-      hash: "d879a5be878c59492e4059a833f17d826ed33fb46552b54759e9c37c6ed17a21"
+      hash: "2a556206201df10245dbcf4cf0366b2f32cb318cd705fbdd74412303d85e7267"
-      ramdisk-hash: "82148561e561e5a3cb5d88cac47515db6d8426771d8965b1b91b7eab6d1e4a10"
+      ramdisk-hash: "c8d067a9737d67453e0b476d7115c3e12b2daf2450c371c19e44e480a1076a94"
-      zimage-hash: "7f354665843d73779ba28a1c610c7fb31526b717ce354d459d7e28b2d05257ab"
+      zimage-hash: "8e6da6c3c9259d23ee5cae3c71691a75b0a281551d19cb75041df469c7524e72"
-      md5-hash: "d6c61c7c84320ccc684b76ae6219e650"
+      md5-hash: "3e034e2cdf90209112e0fdad28474970"
     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"

files/board/arpl/overlayfs/opt/arpl/model-configs/DS3622xs+.yml

@@ -3,21 +3,20 @@ synoinfo: &synoinfo
   support_disk_compatibility: "no"
   support_memory_compatibility: "no"
   supportraidgroup: "no"
-  supportssdcache: "no"
   esataportcfg: "0x00"
   support_bde_internal_10g: "no"
   support_oob_ctl: "no"
+  support_led_brightness_adjustment: "no"
   rss_server: "https://raw.githubusercontent.com/fbelavenuto/arpl/main/rss.xml"     # http://update7.synology.com/autoupdate/genRSS.php
   rss_server_ssl: "https://raw.githubusercontent.com/fbelavenuto/arpl/main/rss.xml" # https://update7.synology.com/autoupdate/genRSS.php
   rss_server_v2: "https://raw.githubusercontent.com/fbelavenuto/arpl/main/rss.json" # https://update7.synology.com/autoupdate/v2/getList
-  small_info_path: "https://example.com/null"                                       # https://update7.synology.com/smallupdate
-  security_version_server: "https://example.com/smallupdate"                        # https://update7.synology.com/securityVersion
 cmdline: &cmdline
   syno_hdd_powerup_seq: 0
   HddHotplug: 0
   vender_format_version: 2
   syno_port_thaw: 1
   syno_hdd_detect: 0
+  elevator: elevator
 platform: "broadwellnk"
 unique: "synology_broadwellnk_3622xs+"
 dom: 1
@@ -35,7 +34,6 @@ builds:
     ver: "7.0.1"
     kver: "4.4.180"
     rd-compressed: false
-    efi-bug: no
     cmdline:
       <<: *cmdline
     synoinfo:
@@ -49,6 +47,7 @@ builds:
     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"
 
@@ -56,7 +55,6 @@ builds:
     ver: "7.1.0"
     kver: "4.4.180"
     rd-compressed: false
-    efi-bug: no
     cmdline:
       <<: *cmdline
     synoinfo:
@@ -70,26 +68,27 @@ builds:
     patch:
       - "ramdisk-common-disable-root-pwd.patch"
       - "ramdisk-common-init-script.patch"
+      - "ramdisk-common-etc-rc.patch"
       - "ramdisk-42661-post-init-script.patch"
       - "ramdisk-42661-disable-disabled-ports.patch"
 
-  42951:
+  42962:
     ver: "7.1.1"
     kver: "4.4.180"
     rd-compressed: false
-    efi-bug: no
     cmdline:
       <<: *cmdline
     synoinfo:
       <<: *synoinfo
     pat:
-      url: "https://global.download.synology.com/download/DSM/release/7.1.1/42951/DSM_DS3622xs%2B_42951.pat"
+      url: "https://global.download.synology.com/download/DSM/release/7.1.1/42962/DSM_DS3622xs%2B_42962.pat"
-      hash: "11f34ae65b13f7feace40e6a7c2399150ef2b4f4eb3a6dcec0be52fca265f151"
+      hash: "b48aadaba7ff561b7d55aa9ed75f1f2f4c49c0c2f73ece4020f3ffd08f6bbfd0"
-      ramdisk-hash: "469d76399eb94fee0cb135c6e178cdea797290671f6bf0ae896d7387f66dc952"
+      ramdisk-hash: "432f315818adad4e1ca54040557e164caf2937004e2d009aac8865391353e2f6"
-      zimage-hash: "9134fc61aea7f687d62728470b8847e640693c444e0afd130882b728ab553fea"
+      zimage-hash: "8903dc99f7201c8656de618d767c05f91bfd32edd9a3706a50fd223237842bf2"
-      md5-hash: "b34b7b7d21af459ae0ba6ea1f9974de6"
+      md5-hash: "1bf63db06cbc048befc24f277dd520f3"
     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"

files/board/arpl/overlayfs/opt/arpl/model-configs/DS918+.yml

@@ -3,20 +3,20 @@ synoinfo: &synoinfo
   support_disk_compatibility: "no"
   support_memory_compatibility: "no"
   esataportcfg: "0x00"
-  support_led_brightness_adjustment: ""
+  support_led_brightness_adjustment: "no"
   support_leds_lp3943: ""
   buzzeroffen: "0xffff"
   rss_server: "https://raw.githubusercontent.com/fbelavenuto/arpl/main/rss.xml"
   rss_server_ssl: "https://raw.githubusercontent.com/fbelavenuto/arpl/main/rss.xml"
   rss_server_v2: "https://raw.githubusercontent.com/fbelavenuto/arpl/main/rss.json"
-  small_info_path: "https://example.com/null"
+  #support_ssd_cache: yes
-  security_version_server: "https://example.com/smallupdate"
 cmdline: &cmdline
   syno_hdd_powerup_seq: 0
   HddHotplug: 0
   vender_format_version: 2
   syno_port_thaw: 1
   syno_hdd_detect: 0
+  elevator: elevator
 platform: "apollolake"
 unique: "synology_apollolake_918+"
 dom: 2
@@ -36,7 +36,6 @@ builds:
     ver: "7.0.1"
     kver: "4.4.180"
     rd-compressed: false
-    efi-bug: no
     cmdline:
       <<: *cmdline
     synoinfo:
@@ -50,6 +49,7 @@ builds:
     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"
 
@@ -57,7 +57,6 @@ builds:
     ver: "7.1.0"
     kver: "4.4.180"
     rd-compressed: false
-    efi-bug: no
     cmdline:
       <<: *cmdline
     synoinfo:
@@ -71,26 +70,27 @@ builds:
     patch:
       - "ramdisk-common-disable-root-pwd.patch"
       - "ramdisk-common-init-script.patch"
+      - "ramdisk-common-etc-rc.patch"
       - "ramdisk-42661-post-init-script.patch"
       - "ramdisk-42661-disable-disabled-ports.patch"
 
-  42951:
+  42962:
     ver: "7.1.1"
     kver: "4.4.180"
     rd-compressed: false
-    efi-bug: no
     cmdline:
       <<: *cmdline
     synoinfo:
       <<: *synoinfo
     pat:
-      url: "https://global.download.synology.com/download/DSM/release/7.1.1/42951/DSM_DS918%2B_42951.pat"
+      url: "https://global.download.synology.com/download/DSM/release/7.1.1/42962/DSM_DS918%2B_42962.pat"
-      hash: "4035aeea248be9c952298a875050625a2485caf46bcd2f9f1c3b21cc8194304b"
+      hash: "c1ffb1b48301fbcf1ccffae00062e95c8b5b18d50a70c3fbb79ea12a38a39bb7"
-      ramdisk-hash: "0eb6433108d8ca1ac1c9b7bf5c35c54c1c0b400f4fcca2c5e95194494fc26686"
+      ramdisk-hash: "6ac446bddba53b1c215e0abbf05236371e5e3b91ab0c4c193a0999cc8b8a857b"
-      zimage-hash: "bb0657c7111a31eaf27e51957ce6f83c6ed48b863666d1ea0a25ed52df3a4020"
+      zimage-hash: "12afcd27e15ba5e4596e1af7275d9462d31c7d8afb32aa723f7b8b7cfa5a19a2"
-      md5-hash: "fbdd1584dfcb1898df5f66a886a6e9b7"
+      md5-hash: "74c067cf1363b9b70522b145b59e1626"
     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"

files/board/arpl/overlayfs/opt/arpl/model-configs/DS920+.yml

@@ -2,11 +2,10 @@ id: "DS920+"
 synoinfo: &synoinfo
   support_disk_compatibility: "no"
   support_memory_compatibility: "no"
+  support_led_brightness_adjustment: "no"
   rss_server: "https://raw.githubusercontent.com/fbelavenuto/arpl/main/rss.xml"
   rss_server_ssl: "https://raw.githubusercontent.com/fbelavenuto/arpl/main/rss.xml"
   rss_server_v2: "https://raw.githubusercontent.com/fbelavenuto/arpl/main/rss.json"
-  small_info_path: "https://example.com/null"
-  security_version_server: "https://example.com/smallupdate"
 cmdline: &cmdline
   intel_iommu: "igfx_off"
   HddEnableDynamicPower: 1
@@ -14,6 +13,7 @@ cmdline: &cmdline
   syno_ttyS0: "serial,0x3f8"
   syno_ttyS1: "serial,0x2f8"
   vender_format_version: 2
+  elevator: elevator
 platform: "geminilake"
 unique: "synology_geminilake_920+"
 dom: 2
@@ -32,7 +32,6 @@ builds:
     ver: "7.0.1"
     kver: "4.4.180"
     rd-compressed: false
-    efi-bug: no
     cmdline:
       <<: *cmdline
     synoinfo:
@@ -46,13 +45,13 @@ builds:
     patch:
       - "ramdisk-common-disable-root-pwd.patch"
       - "ramdisk-common-init-script.patch"
+      - "ramdisk-common-etc-rc.patch"
       - "ramdisk-common-post-init-script.patch"
 
   42661:
     ver: "7.1.0"
     kver: "4.4.180"
     rd-compressed: false
-    efi-bug: no
     cmdline:
       <<: *cmdline
     synoinfo:
@@ -66,24 +65,25 @@ builds:
     patch:
       - "ramdisk-common-disable-root-pwd.patch"
       - "ramdisk-common-init-script.patch"
+      - "ramdisk-common-etc-rc.patch"
       - "ramdisk-42661-post-init-script.patch"
 
-  42951:
+  42962:
     ver: "7.1.1"
     kver: "4.4.180"
     rd-compressed: false
-    efi-bug: no
     cmdline:
       <<: *cmdline
     synoinfo:
       <<: *synoinfo
     pat:
-      url: "https://global.download.synology.com/download/DSM/release/7.1.1/42951/DSM_DS920%2B_42951.pat"
+      url: "https://global.download.synology.com/download/DSM/release/7.1.1/42962/DSM_DS920%2B_42962.pat"
-      hash: "412b94e64fb46bc7732de55bec0892e6ee51529364ae2aa2473d04aa48b9a3bd"
+      hash: "90b1bd215b85eb366b3d3b6bef6bb6bef657dd0caba032dae556717b58e44c06"
-      ramdisk-hash: "1026791ed6b9387fc0fcaec68c4606be35d29582ed7501a2fdf02d62c017e368"
+      ramdisk-hash: "42053cbfbce34d43c50db2d68786360f644fc88af3e9bbaa6377ffa9953bf158"
-      zimage-hash: "bbfa903358576e5545c3c3c021c292637360f0925de5e59cb3e785f92db71fd3"
+      zimage-hash: "89ee173272101e6714728e73930d8b31a414f9f1eca8ab78f45c12fc721138ab"
-      md5-hash: "9fcb2a54b13f4e6acc3947c2165a464b"
+      md5-hash: "ba9fbd499791d19859dd9a53372b016a"
     patch:
       - "ramdisk-common-disable-root-pwd.patch"
       - "ramdisk-common-init-script.patch"
+      - "ramdisk-common-etc-rc.patch"
       - "ramdisk-42951-post-init-script.patch"

files/board/arpl/overlayfs/opt/arpl/model-configs/DS923+.yml

@@ -0,0 +1,49 @@
+id: "DS923+"
+synoinfo: &synoinfo
+  support_disk_compatibility: "no"
+  support_memory_compatibility: "no"
+  support_led_brightness_adjustment: "no"
+  rss_server: "https://raw.githubusercontent.com/fbelavenuto/arpl/main/rss.xml"
+  rss_server_ssl: "https://raw.githubusercontent.com/fbelavenuto/arpl/main/rss.xml"
+  rss_server_v2: "https://raw.githubusercontent.com/fbelavenuto/arpl/main/rss.json"
+cmdline: &cmdline
+  SMBusHddDynamicPower: 1
+  synoboot2:
+  syno_ttyS0: "serial,0x3f8"
+  syno_ttyS1: "serial,0x2f8"
+  vender_format_version: 2
+  elevator: elevator
+platform: "r1000"
+unique: "synology_r1000_923+"
+beta: true
+dom: 2
+dt: true
+serial:
+  prefix:
+    - "2030"
+    - "2040"
+    - "20C0"
+    - "2150"
+  middle: "TQR"
+  suffix: "alpha"
+disks: 4
+builds:
+  42962:
+    ver: "7.1.1"
+    kver: "4.4.180"
+    rd-compressed: false
+    cmdline:
+      <<: *cmdline
+    synoinfo:
+      <<: *synoinfo
+    pat:
+      url: "https://global.download.synology.com/download/DSM/release/7.1.1/42962/DSM_DS923%2B_42962.pat"
+      hash: "e33b47df446ce0bd99c5613767c9dba977915e25acfb5ccb9f5650b14459458f"
+      ramdisk-hash: "0aa3f1b2d00f887aaf0d0e2c8b51ec97bb545bf5f99c40f33d3eaabc32a5ac03"
+      zimage-hash: "1e54804c84e0b4e7f71eff5b5ec8aad9c6ba8fb4fc200ad92251d7d29155a651"
+      md5-hash: "fdff6232dacf9bd3b189506f51577128"
+    patch:
+      - "ramdisk-common-disable-root-pwd.patch"
+      - "ramdisk-common-init-script.patch"
+      - "ramdisk-common-etc-rc.patch"
+      - "ramdisk-42951-post-init-script.patch"

files/board/arpl/overlayfs/opt/arpl/model-configs/DVA1622.yml

@@ -3,11 +3,10 @@ synoinfo: &synoinfo
   support_disk_compatibility: "no"
   support_memory_compatibility: "no"
   buzzeroffen: "0xffff"
+  support_led_brightness_adjustment: "no"
   rss_server: "https://raw.githubusercontent.com/fbelavenuto/arpl/main/rss.xml"
   rss_server_ssl: "https://raw.githubusercontent.com/fbelavenuto/arpl/main/rss.xml"
   rss_server_v2: "https://raw.githubusercontent.com/fbelavenuto/arpl/main/rss.json"
-  small_info_path: "https://example.com/null"
-  security_version_server: "https://example.com/smallupdate"
 cmdline: &cmdline
   intel_iommu: "igfx_off"
   HddEnableDynamicPower: 1
@@ -16,6 +15,7 @@ cmdline: &cmdline
   synoboot2:
   syno_ttyS0: "serial,0x3f8"
   syno_ttyS1: "serial,0x2f8"
+  elevator: elevator
 platform: "geminilake"
 unique: "synology_geminilake_dva1622"
 dom: 2
@@ -34,7 +34,6 @@ builds:
     ver: "7.1.0"
     kver: "4.4.180"
     rd-compressed: false
-    efi-bug: no
     cmdline:
       <<: *cmdline
     synoinfo:
@@ -48,24 +47,25 @@ builds:
     patch:
       - "ramdisk-common-disable-root-pwd.patch"
       - "ramdisk-common-init-script.patch"
+      - "ramdisk-common-etc-rc.patch"
       - "ramdisk-42661-post-init-script.patch"
 
-  42951:
+  42962:
     ver: "7.1.1"
     kver: "4.4.180"
     rd-compressed: false
-    efi-bug: no
     cmdline:
       <<: *cmdline
     synoinfo:
       <<: *synoinfo
     pat:
-      url: "https://global.download.synology.com/download/DSM/release/7.1.1/42951/DSM_DVA1622_42951.pat"
+      url: "https://global.download.synology.com/download/DSM/release/7.1.1/42962/DSM_DVA1622_42962.pat"
-      hash: "2771636333fe1f1f08ad7e80100c0c1224edf1290cea2df848e8d019992b1271"
+      hash: "9106f6bcc52b4bc2b4ce82748788ca353ddecf8b7552e7c6fb477eb4eca42e67"
-      ramdisk-hash: "920336ce890b099b4192cc41e1773e501392b9611cc09c8f96a4e8ed8ddfdfad"
+      ramdisk-hash: "e610146b475074cb1835c7a2528afd0cba389cfa68b8a3ef20214b48ddca78dc"
-      zimage-hash: "bbfa903358576e5545c3c3c021c292637360f0925de5e59cb3e785f92db71fd3"
+      zimage-hash: "89ee173272101e6714728e73930d8b31a414f9f1eca8ab78f45c12fc721138ab"
-      md5-hash: "6e119d8eb2c0a175a56b0bbba1f43372"
+      md5-hash: "862ef2fffc884038bd3804439b974ab9"
     patch:
       - "ramdisk-common-disable-root-pwd.patch"
       - "ramdisk-common-init-script.patch"
+      - "ramdisk-common-etc-rc.patch"
       - "ramdisk-42951-post-init-script.patch"

files/board/arpl/overlayfs/opt/arpl/model-configs/DVA3219.yml

@@ -4,17 +4,19 @@ synoinfo: &synoinfo
   support_memory_compatibility: "no"
   esataportcfg: "0x00"
   support_bde_internal_10g: "no"
+  supportraidgroup: "no"
+  support_syno_hybrid_raid: "yes"
+  support_led_brightness_adjustment: "no"
   rss_server: "https://raw.githubusercontent.com/fbelavenuto/arpl/main/rss.xml"
   rss_server_ssl: "https://raw.githubusercontent.com/fbelavenuto/arpl/main/rss.xml"
   rss_server_v2: "https://raw.githubusercontent.com/fbelavenuto/arpl/main/rss.json"
-  small_info_path: "https://example.com/null"
-  security_version_server: "https://example.com/smallupdate"
 cmdline: &cmdline
   syno_hdd_powerup_seq: 0
   HddHotplug: 0
   vender_format_version: 2
   syno_port_thaw: 1
   syno_hdd_detect: 0
+  elevator: elevator
 platform: "denverton"
 unique: "synology_denverton_dva3219"
 beta: true
@@ -33,7 +35,6 @@ builds:
     ver: "7.0.1"
     kver: "4.4.180"
     rd-compressed: false
-    efi-bug: no
     cmdline:
       <<: *cmdline
     synoinfo:
@@ -47,6 +48,7 @@ builds:
     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"
 
@@ -54,7 +56,6 @@ builds:
     ver: "7.1.0"
     kver: "4.4.180"
     rd-compressed: false
-    efi-bug: no
     cmdline:
       <<: *cmdline
     synoinfo:
@@ -68,26 +69,27 @@ builds:
     patch:
       - "ramdisk-common-disable-root-pwd.patch"
       - "ramdisk-common-init-script.patch"
+      - "ramdisk-common-etc-rc.patch"
       - "ramdisk-42661-post-init-script.patch"
       - "ramdisk-42661-disable-disabled-ports.patch"
 
-  42951:
+  42962:
     ver: "7.1.1"
-    kver: ""
+    kver: "4.4.180"
     rd-compressed: false
-    efi-bug: no
     cmdline:
       <<: *cmdline
     synoinfo:
       <<: *synoinfo
     pat:
-      url: "https://global.download.synology.com/download/DSM/release/7.1.1/42951/DSM_DVA3219_42951.pat"
+      url: "https://global.download.synology.com/download/DSM/release/7.1.1/42962/DSM_DVA3219_42962.pat"
-      hash: "74fc31feb6788ace9ae2ea162e77fb273ae503acecf58abcaa8d60380be2d4ab"
+      hash: "f03395fd9db108d2c5a684b6ba9b4fadc6b1ab05c4e227d401572c01ec4b3dca"
-      ramdisk-hash: "cbaee3c024e6c4752aca2a8e37d8e0bbaae6740c19c633a5fb2d1ecf2e8fb253"
+      ramdisk-hash: "8a36c36096dfc9dd5bbd572a6174719c5018fe5d932a4859832025719abac4fc"
-      zimage-hash: "fb4f70d6f67f77b99973113208590363efcdc6c5856c3a5efb85abd75d750260"
+      zimage-hash: "3c67cefc969ee3de51b7978b8d86cd53cbb0e49ec43b2240bf9b8aad3f2e2200"
-      md5-hash: "309b02195fb52239ee6fdfafdf157cd1"
+      md5-hash: "22f43fb4de401436616f943beaf13bd5"
     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"

files/board/arpl/overlayfs/opt/arpl/model-configs/DVA3221.yml

@@ -4,17 +4,17 @@ synoinfo: &synoinfo
   support_memory_compatibility: "no"
   esataportcfg: "0x00"
   support_bde_internal_10g: "no"
+  support_led_brightness_adjustment: "no"
   rss_server: "https://raw.githubusercontent.com/fbelavenuto/arpl/main/rss.xml"
   rss_server_ssl: "https://raw.githubusercontent.com/fbelavenuto/arpl/main/rss.xml"
   rss_server_v2: "https://raw.githubusercontent.com/fbelavenuto/arpl/main/rss.json"
-  small_info_path: "https://example.com/null"
-  security_version_server: "https://example.com/smallupdate"
 cmdline: &cmdline
   syno_hdd_powerup_seq: 0
   HddHotplug: 0
   vender_format_version: 2
   syno_port_thaw: 1
   syno_hdd_detect: 0
+  elevator: elevator
 platform: "denverton"
 unique: "synology_denverton_dva3221"
 dom: 2
@@ -34,7 +34,6 @@ builds:
     ver: "7.0.1"
     kver: "4.4.180"
     rd-compressed: false
-    efi-bug: no
     cmdline:
       <<: *cmdline
     synoinfo:
@@ -48,6 +47,7 @@ builds:
     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"
 
@@ -55,7 +55,6 @@ builds:
     ver: "7.1.0"
     kver: "4.4.180"
     rd-compressed: false
-    efi-bug: no
     cmdline:
       <<: *cmdline
     synoinfo:
@@ -69,26 +68,27 @@ builds:
     patch:
       - "ramdisk-common-disable-root-pwd.patch"
       - "ramdisk-common-init-script.patch"
+      - "ramdisk-common-etc-rc.patch"
       - "ramdisk-42661-post-init-script.patch"
       - "ramdisk-42661-disable-disabled-ports.patch"
 
-  42951:
+  42962:
     ver: "7.1.1"
     kver: "4.4.180"
     rd-compressed: false
-    efi-bug: no
     cmdline:
       <<: *cmdline
     synoinfo:
       <<: *synoinfo
     pat:
-      url: "https://global.download.synology.com/download/DSM/release/7.1.1/42951/DSM_DVA3221_42951.pat"
+      url: "https://global.download.synology.com/download/DSM/release/7.1.1/42962/DSM_DVA3221_42962.pat"
-      hash: "c16020a308e71eab73a5acfce5290d13e1a1a0960fa7887acad3f9b4a71e56eb"
+      hash: "d83044ff12c9ed81c5e7f5ba4b23b68d96c9a40c29a6a9e5c53ad807d1e27ed2"
-      ramdisk-hash: "491f8863b8a1ee36837dcb7e145f793ca840793d3da2c1e67ce8c5f4df096e80"
+      ramdisk-hash: "7ecb774bfccde028d456613c7232b1d770526ea37e928bf90badac267bafcd78"
-      zimage-hash: "fb4f70d6f67f77b99973113208590363efcdc6c5856c3a5efb85abd75d750260"
+      zimage-hash: "3c67cefc969ee3de51b7978b8d86cd53cbb0e49ec43b2240bf9b8aad3f2e2200"
-      md5-hash: "59c68430cb9cd20322cb287334a4017b"
+      md5-hash: "cff2b34f0d9547781da3cf66e161dc3f"
     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"

files/board/arpl/overlayfs/opt/arpl/model-configs/FS2500.yml

@@ -2,11 +2,10 @@ id: "FS2500"
 synoinfo: &synoinfo
   support_disk_compatibility: "no"
   support_memory_compatibility: "no"
+  support_led_brightness_adjustment: "no"
   rss_server: "https://raw.githubusercontent.com/fbelavenuto/arpl/main/rss.xml"
   rss_server_ssl: "https://raw.githubusercontent.com/fbelavenuto/arpl/main/rss.xml"
   rss_server_v2: "https://raw.githubusercontent.com/fbelavenuto/arpl/main/rss.json"
-  small_info_path: "https://example.com/null"
-  security_version_server: "https://example.com/smallupdate"
 cmdline: &cmdline
   intel_iommu: igfx_off
   SMBusHddDynamicPower: 1
@@ -14,6 +13,7 @@ cmdline: &cmdline
   synoboot2:
   syno_ttyS0: "serial,0x3f8"
   syno_ttyS1: "serial,0x2f8"
+  elevator: elevator
 platform: "v1000"
 unique: "synology_v1000_fs2500"
 beta: true
@@ -30,7 +30,6 @@ builds:
     ver: "7.0.1"
     kver: "4.4.180"
     rd-compressed: false
-    efi-bug: no
     cmdline:
       <<: *cmdline
     synoinfo:
@@ -40,17 +39,17 @@ builds:
       hash: "4d060be8afec548fdb042bc8095524f10ff200033cab74df37ae07f3de5eaa69"
       ramdisk-hash: "cbe9099c57f23ba53415574b011580218fa55a0bdb83c4e4bba9e27100e5379d"
       zimage-hash: "f6816165a52b1f53ce44a45878fe06641da34e9478947f826a236c1a6548f8fd"
-      md5-hash: ""
+      md5-hash: "70550293c612c1fd9a8d1b7485173877"
     patch:
       - "ramdisk-common-disable-root-pwd.patch"
       - "ramdisk-common-init-script.patch"
+      - "ramdisk-common-etc-rc.patch"
       - "ramdisk-common-post-init-script.patch"
 
   42661:
     ver: "7.1"
     kver: "4.4.180"
     rd-compressed: false
-    efi-bug: no
     cmdline:
       <<: *cmdline
     synoinfo:
@@ -64,24 +63,25 @@ builds:
     patch:
       - "ramdisk-common-disable-root-pwd.patch"
       - "ramdisk-common-init-script.patch"
+      - "ramdisk-common-etc-rc.patch"
       - "ramdisk-42661-post-init-script.patch"
       
-  42951:
+  42962:
     ver: "7.1.1"
     kver: "4.4.180"
     rd-compressed: false
-    efi-bug: no
     cmdline:
       <<: *cmdline
     synoinfo:
       <<: *synoinfo
     pat:
-      url: "https://global.download.synology.com/download/DSM/release/7.1.1/42951/DSM_FS2500_42951.pat"
+      url: "https://global.download.synology.com/download/DSM/release/7.1.1/42962/DSM_FS2500_42962.pat"
-      hash: "a878c928d7133c3bf3e10e8d3fb43ca7449a57f01d240a3c80de51cdd43af5c3"
+      hash: "1adc272ba9f308866dc69a8f550d4511966a1156c553f925be167815046a5ab4"
-      ramdisk-hash: "a248103b1b47f800753b627394af8768698b74944d156cb6e40c80cd6ba8556f"
+      ramdisk-hash: "9efc0351212d36e5a51542bff9b2f173beb913c5be3eaaeec1e78625d62763cb"
-      zimage-hash: "d28951da0eb41286fbe37ffdfc880271787573d68226e5d26321819cf2d2e6e2"
+      zimage-hash: "b0f296aad0cc3b8adba13483f89770d0a4daf9b9cab335910717448b1eaa8254"
-      md5-hash: "7b48e21c1f2090bb01d5f14a8e16a435"
+      md5-hash: "3647d21771fe9be4a3898f95491e9393"
     patch:
       - "ramdisk-common-disable-root-pwd.patch"
       - "ramdisk-common-init-script.patch"
+      - "ramdisk-common-etc-rc.patch"
       - "ramdisk-42951-post-init-script.patch"

files/board/arpl/overlayfs/opt/arpl/model-configs/RS4021xs+.yml

@@ -2,19 +2,21 @@ id: "RS4021xs+"
 synoinfo: &synoinfo
   support_disk_compatibility: "no"
   support_memory_compatibility: "no"
+  support_bde_internal_10g: "no"
+  esataportcfg: "0x0"
+  support_led_brightness_adjustment: "no"
+  support_syno_hybrid_raid: "yes"
+  supportraidgroup: "no"
   rss_server: "https://raw.githubusercontent.com/fbelavenuto/arpl/main/rss.xml"
   rss_server_ssl: "https://raw.githubusercontent.com/fbelavenuto/arpl/main/rss.xml"
   rss_server_v2: "https://raw.githubusercontent.com/fbelavenuto/arpl/main/rss.json"
-  small_info_path: "https://example.com/null"
-  security_version_server: "https://example.com/smallupdate"
-  support_bde_internal_10g: "no"
-  esataportcfg: "0x0"
 cmdline: &cmdline
   syno_hdd_powerup_seq: 0
   HddHotplug: 0
   syno_hdd_detect: 0
   syno_port_thaw: 1
   vender_format_version: 2
+  elevator: elevator
 platform: "broadwellnk"
 unique: "synology_broadwellnk_rs4021xs+"
 beta: true
@@ -31,7 +33,6 @@ builds:
     ver: "7.0.1"
     kver: "4.4.180"
     rd-compressed: false
-    efi-bug: no
     cmdline:
       <<: *cmdline
     synoinfo:
@@ -45,6 +46,7 @@ builds:
     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"
 
@@ -52,7 +54,6 @@ builds:
     ver: "7.1"
     kver: "4.4.180"
     rd-compressed: false
-    efi-bug: no
     cmdline:
       <<: *cmdline
     synoinfo:
@@ -66,26 +67,27 @@ builds:
     patch:
       - "ramdisk-common-disable-root-pwd.patch"
       - "ramdisk-common-init-script.patch"
+      - "ramdisk-common-etc-rc.patch"
       - "ramdisk-42661-post-init-script.patch"
       - "ramdisk-42661-disable-disabled-ports.patch"
 
-  42951:
+  42962:
     ver: "7.1.1"
     kver: "4.4.180"
     rd-compressed: false
-    efi-bug: no
     cmdline:
       <<: *cmdline
     synoinfo:
       <<: *synoinfo
     pat:
-      url: "https://global.download.synology.com/download/DSM/release/7.1.1/42951/DSM_RS4021xs%2B_42951.pat"
+      url: "https://global.download.synology.com/download/DSM/release/7.1.1/42962/DSM_RS4021xs%2B_42962.pat"
-      hash: "7c9e076f3007662f63e34fd478fc48f32dee766f1ddc712f25ae91a2e56e078c"
+      hash: "fd848be9336d8b5cc9b514e71d447c7612d0f542d373eef61a6d427430daa931"
-      ramdisk-hash: "c4d23a068a66499c50c9772fc5c90cc38dfcba5c45dcab085eda5d07d720046b"
+      ramdisk-hash: "40775a6b9b4fae2887cd07c0efdfb26e738e2b8de73602657f7bc4407ae4a688"
-      zimage-hash: "9134fc61aea7f687d62728470b8847e640693c444e0afd130882b728ab553fea"
+      zimage-hash: "8903dc99f7201c8656de618d767c05f91bfd32edd9a3706a50fd223237842bf2"
-      md5-hash: "e2d11981bba84b2eb6ba62b8bf2d2d28"
+      md5-hash: "c8574a8e358fe40a7b49bbf1ddf38491"
     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"

files/board/arpl/overlayfs/opt/arpl/model-configs/SA6400.yml.disabled

@@ -0,0 +1,46 @@
+id: "SA6400"
+synoinfo: &synoinfo
+  support_disk_compatibility: "no"
+  support_memory_compatibility: "no"
+  support_led_brightness_adjustment: "no"
+  rss_server: "https://raw.githubusercontent.com/fbelavenuto/arpl/main/rss.xml"
+  rss_server_ssl: "https://raw.githubusercontent.com/fbelavenuto/arpl/main/rss.xml"
+  rss_server_v2: "https://raw.githubusercontent.com/fbelavenuto/arpl/main/rss.json"
+cmdline: &cmdline
+  SMBusHddDynamicPower: 1
+  synoboot2:
+  syno_ttyS0: "serial,0x3f8"
+  syno_ttyS1: "serial,0x2f8"
+  vender_format_version: 2
+  scsi_mod.use_blk_mq: 1
+platform: "epyc7002"
+unique: "synology_epyc7002_sa6400"
+beta: true
+dom: 2
+serial:
+  prefix:
+    - "0000"
+  middle: "XXX"
+  suffix: "alpha"
+disks: 16
+dt: true
+builds:
+  42962:
+    ver: "7.1.1"
+    kver: "5.10.55"
+    rd-compressed: false
+    cmdline:
+      <<: *cmdline
+    synoinfo:
+      <<: *synoinfo
+    pat:
+      url: "https://global.download.synology.com/download/DSM/release/7.1.1/42962/DSM_SA6400_42962.pat"
+      hash: "83fc408380ebb1381224261de6220b873d7b62a99e715557509ae9553f618a71"
+      ramdisk-hash: "d4efe45fc4dd71758fe365f7eb39d24982d1440b00986259cab9a03577982f68"
+      zimage-hash: "d5b8af848fc585695e35bd1c4f4c953fd8e54435b2799face4f8f350bac6df93"
+      md5-hash: "fdbbea86e280a8f754339a064f9ad2df"
+    patch:
+      - "ramdisk-common-disable-root-pwd.patch"
+      - "ramdisk-common-init-script.patch"
+      - "ramdisk-common-etc-rc.patch"
+      - "ramdisk-42951-post-init-script.patch"

files/board/arpl/overlayfs/opt/arpl/modinfo

@@ -0,0 +1 @@
+kmod

files/board/arpl/overlayfs/opt/arpl/patch/ramdisk-common-disable-root-pwd.patch

@@ -1,5 +1,3 @@
-diff --git a/etc/passwd b/etc/passwd
-index 6a0344d..cf95fbd 100644
 --- a/etc/passwd
 +++ b/etc/passwd
 @@ -1,4 +1,4 @@

files/board/arpl/overlayfs/opt/arpl/patch/ramdisk-common-etc-rc.patch

@@ -0,0 +1,9 @@
+--- a/etc/rc
++++ b/etc/rc
+@@ -469,5 +469,5 @@
+ echo "============ Date ============"
+ date
+ echo "=============================="
+-
++/addons/addons.sh rcExit
+ exit 0

files/board/arpl/overlayfs/opt/arpl/patch/ramdisk-common-init-script.patch

@@ -9,11 +9,11 @@
  UmountRoot()
  {
  	grep "^${RootDevice}" /proc/mounts && /bin/umount -f ${Mnt}
-@@ -59,6 +61,7 @@
+@@ -59,5 +61,6 @@
  	fi
  
- 	UmountRoot
 +	/addons/addons.sh jrExit
+ 	UmountRoot
  
  	exit $1
  }

files/board/arpl/overlayfs/opt/arpl/ramdisk-patch.sh

@@ -3,14 +3,22 @@
 . /opt/arpl/include/functions.sh
 . /opt/arpl/include/addons.sh
 
+set -o pipefail # Get exit code from process piped
+
 # Sanity check
-[ -f "${ORI_RDGZ_FILE}" ] || die "${ORI_RDGZ_FILE} not found!"
+[ -f "${ORI_RDGZ_FILE}" ] || (die "${ORI_RDGZ_FILE} not found!" | tee -a "${LOG_FILE}")
 
 echo -n "Patching Ramdisk"
 
 # Remove old rd.gz patched
 rm -f "${MOD_RDGZ_FILE}"
 
+# Check disk space left
+LOADER_DISK="`blkid | grep 'LABEL="ARPL3"' | cut -d3 -f1`"
+LOADER_DEVICE_NAME=`echo ${LOADER_DISK} | sed 's|/dev/||'`
+SPACELEFT=`df --block-size=1 | awk '/'${LOADER_DEVICE_NAME}'3/{print$4}'`
+[ ${SPACELEFT} -le 268435456 ] && rm -rf "${CACHE_PATH}/dl"
+
 # Unzipping ramdisk
 echo -n "."
 rm -rf "${RAMDISK_PATH}"  # Force clean
@@ -23,6 +31,7 @@ mkdir -p "${RAMDISK_PATH}"
 MODEL="`readConfigKey "model" "${USER_CONFIG_FILE}"`"
 BUILD="`readConfigKey "build" "${USER_CONFIG_FILE}"`"
 LKM="`readConfigKey "lkm" "${USER_CONFIG_FILE}"`"
+SN="`readConfigKey "sn" "${USER_CONFIG_FILE}"`"
 
 if [ ${BUILD} -ne ${buildnumber} ]; then
   echo -e "\033[A\n\033[1;32mBuild number changed from \033[1;31m${BUILD}\033[1;32m to \033[1;31m${buildnumber}\033[0m"
@@ -39,19 +48,25 @@ KVER="`readModelKey "${MODEL}" "builds.${BUILD}.kver"`"
 RD_COMPRESSED="`readModelKey "${MODEL}" "builds.${BUILD}.rd-compressed"`"
 
 # Sanity check
-[ -z "${PLATFORM}" -o -z "${KVER}" ] && die "ERROR: Configuration for model ${MODEL} and buildnumber ${BUILD} not found."
+[ -z "${PLATFORM}" -o -z "${KVER}" ] && (die "ERROR: Configuration for model ${MODEL} and buildnumber ${BUILD} not found." | tee -a "${LOG_FILE}")
 
 declare -A SYNOINFO
 declare -A ADDONS
+declare -A USERMODULES
 
 # Read synoinfo and addons from config
 while IFS="=" read KEY VALUE; do
-  [ -n "${KEY}" ] &&  SYNOINFO["${KEY}"]="${VALUE}"
+  [ -n "${KEY}" ] && SYNOINFO["${KEY}"]="${VALUE}"
 done < <(readConfigMap "synoinfo" "${USER_CONFIG_FILE}")
 while IFS="=" read KEY VALUE; do
   [ -n "${KEY}" ] && ADDONS["${KEY}"]="${VALUE}"
 done < <(readConfigMap "addons" "${USER_CONFIG_FILE}")
 
+# Read modules from user config
+while IFS="=" read KEY VALUE; do
+  [ -n "${KEY}" ] && USERMODULES["${KEY}"]="${VALUE}"
+done < <(readConfigMap "modules" "${USER_CONFIG_FILE}")
+
 # Patches
 while read f; do
   echo -n "."
@@ -62,8 +77,10 @@ done < <(readModelArray "${MODEL}" "builds.${BUILD}.patch")
 # Patch /etc/synoinfo.conf
 echo -n "."
 for KEY in ${!SYNOINFO[@]}; do
-  sed -i "s|^${KEY}=.*|${KEY}=\"${SYNOINFO[${KEY}]}\"|" "${RAMDISK_PATH}/etc/synoinfo.conf" >"${LOG_FILE}" 2>&1 || dieLog
+  _set_conf_kv "${KEY}" "${SYNOINFO[${KEY}]}" "${RAMDISK_PATH}/etc/synoinfo.conf" >"${LOG_FILE}" 2>&1 || dieLog
 done
+# Add serial number to synoinfo.conf, to help to recovery a installed DSM
+_set_conf_kv "SN" "${SN}" "${RAMDISK_PATH}/etc/synoinfo.conf" >"${LOG_FILE}" 2>&1 || dieLog
 
 # Patch /sbin/init.post
 echo -n "."
@@ -72,9 +89,11 @@ sed -e "/@@@CONFIG-MANIPULATORS-TOOLS@@@/ {" -e "r ${TMP_PATH}/rp.txt" -e 'd' -e
 rm "${TMP_PATH}/rp.txt"
 touch "${TMP_PATH}/rp.txt"
 for KEY in ${!SYNOINFO[@]}; do
-  echo "_set_conf_kv '${KEY}' '${SYNOINFO[${KEY}]}' '/tmpRoot/etc/synoinfo.conf'" >> "${TMP_PATH}/rp.txt"
+  echo "_set_conf_kv '${KEY}' '${SYNOINFO[${KEY}]}' '/tmpRoot/etc/synoinfo.conf'"          >> "${TMP_PATH}/rp.txt"
   echo "_set_conf_kv '${KEY}' '${SYNOINFO[${KEY}]}' '/tmpRoot/etc.defaults/synoinfo.conf'" >> "${TMP_PATH}/rp.txt"
 done
+echo "_set_conf_kv 'SN' '${SN}' '/tmpRoot/etc/synoinfo.conf'"                              >> "${TMP_PATH}/rp.txt"
+echo "_set_conf_kv 'SN' '${SN}' '/tmpRoot/etc.defaults/synoinfo.conf'"                     >> "${TMP_PATH}/rp.txt"
 sed -e "/@@@CONFIG-GENERATED@@@/ {" -e "r ${TMP_PATH}/rp.txt" -e 'd' -e '}' -i "${RAMDISK_PATH}/sbin/init.post"
 rm "${TMP_PATH}/rp.txt"
 
@@ -82,15 +101,17 @@ echo -n "."
 # Extract modules to ramdisk
 rm -rf "${TMP_PATH}/modules"
 mkdir -p "${TMP_PATH}/modules"
-gzip -dc "${CACHE_PATH}/modules/${PLATFORM}-${KVER}.tgz" | tar xf - -C "${TMP_PATH}/modules"
+gzip -dc "${MODULES_PATH}/${PLATFORM}-${KVER}.tgz" | tar xf - -C "${TMP_PATH}/modules"
 for F in `ls "${TMP_PATH}/modules/"*.ko`; do
   M=`basename ${F}`
-  # Skip existent modules
+  if arrayExistItem "${M:0:-3}" "${!USERMODULES[@]}"; then
-#  [ -f "${RAMDISK_PATH}/usr/lib/modules/${M}" ] || mv "${F}" "${RAMDISK_PATH}/usr/lib/modules/${M}"
+    cp -f "${F}" "${RAMDISK_PATH}/usr/lib/modules/${M}"
-  cp "${F}" "${RAMDISK_PATH}/usr/lib/modules/${M}"
+  else
+    rm -f "${RAMDISK_PATH}/usr/lib/modules/${M}"
+  fi
 done
 mkdir -p "${RAMDISK_PATH}/usr/lib/firmware"
-gzip -dc "${CACHE_PATH}/modules/firmware.tgz" | tar xf - -C "${RAMDISK_PATH}/usr/lib/firmware"
+gzip -dc "${MODULES_PATH}/firmware.tgz" | tar xf - -C "${RAMDISK_PATH}/usr/lib/firmware"
 # Clean
 rm -rf "${TMP_PATH}/modules"
 
@@ -109,7 +130,9 @@ echo -n "."
 mkdir -p "${RAMDISK_PATH}/addons"
 echo "#!/bin/sh" > "${RAMDISK_PATH}/addons/addons.sh"
 echo 'echo "addons.sh called with params ${@}"' >> "${RAMDISK_PATH}/addons/addons.sh"
-# Required eudev and dtbpatch/maxdisks
+chmod +x "${RAMDISK_PATH}/addons/addons.sh"
+
+# Required addons: eudev, dtbpatch/maxdisks, powersched
 installAddon eudev
 echo "/addons/eudev.sh \${1} " >> "${RAMDISK_PATH}/addons/addons.sh" 2>"${LOG_FILE}" || dieLog
 if [ "${DT}" = "true" ]; then
@@ -119,16 +142,17 @@ else
   installAddon maxdisks
   echo "/addons/maxdisks.sh \${1} ${MAXDISKS}" >> "${RAMDISK_PATH}/addons/addons.sh" 2>"${LOG_FILE}" || dieLog
 fi
+installAddon powersched
+echo "/addons/powersched.sh \${1} " >> "${RAMDISK_PATH}/addons/addons.sh" 2>"${LOG_FILE}" || dieLog
 # User addons
 for ADDON in ${!ADDONS[@]}; do
   PARAMS=${ADDONS[${ADDON}]}
   if ! installAddon ${ADDON}; then
-    echo "ADDON ${ADDON} not found!" | tee "${LOG_FILE}"
+    echo "ADDON ${ADDON} not found!" | tee -a "${LOG_FILE}"
     exit 1
   fi
   echo "/addons/${ADDON}.sh \${1} ${PARAMS}" >> "${RAMDISK_PATH}/addons/addons.sh" 2>"${LOG_FILE}" || dieLog
 done
-chmod +x "${RAMDISK_PATH}/addons/addons.sh"
 
 # Build modules dependencies
 /opt/arpl/depmod -a -b ${RAMDISK_PATH} 2>/dev/null

files/board/arpl/overlayfs/opt/arpl/vmlinux-to-bzImage.sh

@@ -1,21 +1,11 @@
 #!/bin/sh
+# Based on code and ideas from @jumkey
 
 . /opt/arpl/include/functions.sh
 
-#zImage_head           16494
+MODEL="`readConfigKey "model" "${USER_CONFIG_FILE}"`"
-#payload(
+BUILD="`readConfigKey "build" "${USER_CONFIG_FILE}"`"
-#  vmlinux.bin         x
+KVER="`readModelKey "${MODEL}" "builds.${BUILD}.kver"`"
-#  padding             0xf00000-x
-#  vmlinux.bin size    4
-#)                     0xf00004
-#zImage_tail(
-#  unknown             72
-#  run_size            4
-#  unknown             30
-#  vmlinux.bin size    4
-#  unknown             114460
-#)                     114570
-#crc32                 4
 
 # Adapted from: scripts/Makefile.lib
 # Usage: size_append FILE [FILE2] [FILEn]...
@@ -51,12 +41,40 @@ size_le () {
 SCRIPT_DIR=`dirname $0`
 VMLINUX_MOD=${1}
 ZIMAGE_MOD=${2}
-gzip -cd "${SCRIPT_DIR}/zImage_template.gz" > "${ZIMAGE_MOD}"
+KVER_MAJOR=${KVER:0:1}
+if [ $KVER_MAJOR -eq 4 ] || [ $KVER_MAJOR -eq 3 ]; then
+  # Kernel version 4.x or 3.x (bromolow)
+  #zImage_head           16494
+  #payload(
+  #  vmlinux.bin         x
+  #  padding             0xf00000-x
+  #  vmlinux.bin size    4
+  #)                     0xf00004
+  #zImage_tail(
+  #  unknown             72
+  #  run_size            4
+  #  unknown             30
+  #  vmlinux.bin size    4
+  #  unknown             114460
+  #)                     114570
+  #crc32                 4
+  gzip -cd "${SCRIPT_DIR}/bzImage-template-v4.gz" > "${ZIMAGE_MOD}"
 
-dd if="${VMLINUX_MOD}" of="${ZIMAGE_MOD}" bs=16494 seek=1 conv=notrunc >"${LOG_FILE}" 2>&1 || dieLog
+  dd if="${VMLINUX_MOD}" of="${ZIMAGE_MOD}" bs=16494 seek=1 conv=notrunc >"${LOG_FILE}" 2>&1 || dieLog
-file_size_le "${VMLINUX_MOD}" | dd of="${ZIMAGE_MOD}" bs=15745134 seek=1 conv=notrunc >"${LOG_FILE}" 2>&1 || dieLog
+  file_size_le "${VMLINUX_MOD}" | dd of="${ZIMAGE_MOD}" bs=15745134 seek=1 conv=notrunc >"${LOG_FILE}" 2>&1 || dieLog
+  file_size_le "${VMLINUX_MOD}" | dd of="${ZIMAGE_MOD}" bs=15745244 seek=1 conv=notrunc >"${LOG_FILE}" 2>&1 || dieLog
 
-RUN_SIZE=`objdump -h ${VMLINUX_MOD} | sh "${SCRIPT_DIR}/calc_run_size.sh"`
+  RUN_SIZE=`objdump -h ${VMLINUX_MOD} | sh "${SCRIPT_DIR}/calc_run_size.sh"`
-size_le $RUN_SIZE | dd of=$ZIMAGE_MOD bs=15745210 seek=1 conv=notrunc >"${LOG_FILE}" 2>&1 || dieLog
+  size_le ${RUN_SIZE} | dd of=${ZIMAGE_MOD} bs=15745210 seek=1 conv=notrunc >"${LOG_FILE}" 2>&1 || dieLog
-file_size_le "${VMLINUX_MOD}" | dd of="${ZIMAGE_MOD}" bs=15745244 seek=1 conv=notrunc >"${LOG_FILE}" 2>&1 || dieLog
+  size_le $(($((16#`crc32 "${ZIMAGE_MOD}" | awk '{print$1}'`)) ^ 0xFFFFFFFF)) | dd of="${ZIMAGE_MOD}" conv=notrunc oflag=append >"${LOG_FILE}" 2>&1 || dieLog
-size_le $(($((16#`crc32 "${ZIMAGE_MOD}" | awk '{print$1}'`)) ^ 0xFFFFFFFF)) | dd of="${ZIMAGE_MOD}" conv=notrunc oflag=append >"${LOG_FILE}" 2>&1 || dieLog
+else
+  # Kernel version 5.x
+  gzip -cd "${SCRIPT_DIR}/bzImage-template-v5.gz" > "${ZIMAGE_MOD}"
+
+  dd if="${VMLINUX_MOD}" of="${ZIMAGE_MOD}" bs=14561 seek=1 conv=notrunc >"${LOG_FILE}" 2>&1 || dieLog
+  file_size_le "${VMLINUX_MOD}" | dd of="${ZIMAGE_MOD}" bs=34463421 seek=1 conv=notrunc >"${LOG_FILE}" 2>&1 || dieLog
+  file_size_le "${VMLINUX_MOD}" | dd of="${ZIMAGE_MOD}" bs=34479132 seek=1 conv=notrunc >"${LOG_FILE}" 2>&1 || dieLog
+#  RUN_SIZE=`objdump -h ${VMLINUX_MOD} | sh "${SCRIPT_DIR}/calc_run_size.sh"`
+#  size_le ${RUN_SIZE} | dd of=${ZIMAGE_MOD} bs=34626904 seek=1 conv=notrunc >"${LOG_FILE}" 2>&1 || dieLog
+  size_le $(($((16#`crc32 "${ZIMAGE_MOD}" | awk '{print$1}'`)) ^ 0xFFFFFFFF)) | dd of="${ZIMAGE_MOD}" conv=notrunc oflag=append >"${LOG_FILE}" 2>&1 || dieLog
+fi

files/board/arpl/overlayfs/opt/arpl/zimage-patch.sh

@@ -2,8 +2,10 @@
 
 . /opt/arpl/include/functions.sh
 
+set -o pipefail # Get exit code from process piped
+
 # Sanity check
-[ -f "${ORI_ZIMAGE_FILE}" ] || die "${ORI_ZIMAGE_FILE} not found!"
+[ -f "${ORI_ZIMAGE_FILE}" ] || (die "${ORI_ZIMAGE_FILE} not found!" | tee -a "${LOG_FILE}")
 
 echo -n "Patching zImage"
 
@@ -17,7 +19,6 @@ echo -n "."
 echo -n "."
 # rebuild zImage
 /opt/arpl/vmlinux-to-bzImage.sh "${TMP_PATH}/vmlinux-mod" "${MOD_ZIMAGE_FILE}" >"${LOG_FILE}" 2>&1 || dieLog
-
 echo -n "."
 # Update HASH of new DSM zImage
 HASH="`sha256sum ${ORI_ZIMAGE_FILE} | awk '{print$1}'`"

files/board/arpl/overlayfs/root/.bashrc

@@ -18,6 +18,7 @@ export EDITOR="/bin/nano"
 export BOOTLOADER_PATH="/mnt/p1"
 export SLPART_PATH="/mnt/p2"  # Synologic partition
 export CACHE_PATH="/mnt/p3"
+export DSMROOT_PATH="/mnt/dsmroot"
 export PATH="${PATH}:/opt/arpl"
 
 if [ ! -f ${HOME}/.initialized ]; then