Merge pull request #536 from fbelavenuto/dev

Passing UNIQUE string to dtbpatch addon

.github/FUNDING.yml

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

.github/workflows/main.yml

@@ -1,28 +1,17 @@
 name: Build image
 
-# Controls when the workflow will run
 on:
-
-  # Push
   push:
     branches:
       - main
     tags:
       - v*
-
-  # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
 
-# A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
-  # This workflow contains a single job called "build"
   build:
-    # The type of runner that the job will run on
     runs-on: ubuntu-latest
-
-    # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
-      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
       - uses: actions/checkout@v3
 
       # Check cache
@@ -33,11 +22,44 @@ jobs:
           path: .buildroot
           key: ${{ runner.os }}-${{ hashFiles('files/configs/arpl_defconfig') }}
 
-      # Install  dependencies
+      # Install dependencies
       - name: Install dependencies
         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
+
+      # Get latests LKM, addons and modules
+      - name: Get latests LKM, addons and Modules
+        run: |
+          # Get 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)}'`
+          STATUS=`curl -w "%{http_code}" -L "https://github.com/fbelavenuto/redpill-lkm/releases/download/${TAG}/rp-lkms.zip" -o /tmp/rp-lkms.zip`
+          echo "Status=${STATUS}"
+          [ ${STATUS} -ne 200 ] && exit 1
+
+          # Get latest addons and install its
+          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)}'`
+          STATUS=`curl -w "%{http_code}" -L "https://github.com/fbelavenuto/arpl-addons/releases/download/${TAG}/addons.zip" -o /tmp/addons.zip`
+          echo "Status=${STATUS}"
+          [ ${STATUS} -ne 200 ] && exit 1
+
+          # 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}"
+            STATUS=`curl -w "%{http_code}" -L "https://github.com/fbelavenuto/arpl-modules/releases/download/${TAG}/${FILE}.tgz" -o "${MODULES_DIR}/${FILE}.tgz"`
+            echo "Status=${STATUS}"
+            [ ${STATUS} -ne 200 ] && exit 1
+          done < PLATFORMS
+          STATUS=`curl -w "%{http_code}" -L "https://github.com/fbelavenuto/arpl-modules/releases/download/${TAG}/firmware.tgz" -o "${MODULES_DIR}/firmware.tgz"`
+          echo "Status=${STATUS}"
+          [ ${STATUS} -ne 200 ] && exit 1
+          echo OK
 
       # Prepare buildroot for first make (for cache)
       - name: Prepare buildroot
@@ -49,7 +71,7 @@ jobs:
           cp -Ru files/* .buildroot
           cd .buildroot
           echo "Generating default config"
-          make arpl_defconfig
+          make BR2_EXTERNAL=../external arpl_defconfig
           echo "First make"
           make BR2_EXTERNAL=../external
 
@@ -58,22 +80,16 @@ 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
+          # Unzip 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)}'`
-          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/*
           unzip /tmp/rp-lkms.zip -d files/board/arpl/p3/lkms
-          # Get latest addons and install its
+          # Install 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)}'`
-          curl -L "https://github.com/fbelavenuto/arpl-addons/releases/download/${TAG}/addons.zip" -o /tmp/addons.zip
           mkdir -p /tmp/addons
           unzip /tmp/addons.zip -d /tmp/addons
           DEST_PATH="files/board/arpl/p3/addons"
@@ -87,23 +103,40 @@ jobs:
           # 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"
-          make arpl_defconfig
+          make BR2_EXTERNAL=../external arpl_defconfig
           echo "Version: ${VERSION}"
           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
+          zip -9j update.zip update-list.yml
+          while read F; do
+            if [ -d "${F}" ]; then
+              FTGZ="`basename "${F}"`.tgz"
+              tar czf "${FTGZ}" -C "${F}" .
+              sha256sum "${FTGZ}" >> sha256sum
+              zip -9j update.zip "${FTGZ}"
+              rm "${FTGZ}"
+            else
+              (cd `dirname ${F}` && sha256sum `basename ${F}`) >> sha256sum
+              zip -9j update.zip "${F}"
+            fi
+          done < <(yq '.replace | explode(.) | to_entries | map([.key])[] | .[]' update-list.yml)
+          zip -9j update.zip sha256sum 
       # Upload artifact
       - name: Upload
         uses: actions/upload-artifact@v3
@@ -111,8 +144,8 @@ jobs:
           name: Images
           path: |
             arpl.img
-            arpl.vmdk
+            arpl*.vmdk
-          retention-days: 1
+          retention-days: 5
 
       # Publish a release if is a tag
       - name: Release
@@ -121,6 +154,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

@@ -1,10 +1,15 @@
 !.gitkeep
 .vscode
-arpl.img
+arpl*.img
-arpl.vmdk
+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,27 +2,96 @@
 
 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.
+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.
 
-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.
+# Important considerations
 
-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, randomly type or create a serial number, add/remove addons with a hardware detection option, 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.
+ - 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;
 
-Addons and "synoinfo" entries require re-creating the loader, "cmdline" entries do not. You can view the "cmdline" and "synoinfo" entries defined for the chosen model, with user-defined entries having higher priority.
+ - You must have at least 4GB of RAM, both in baremetal and VMs;
 
-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).
+ - 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;
 
-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".
+ - It is possible to use HBA cards, however SMART and serial numbers are only functional on DS3615xs, DS3617xs and DS3622xs+ models.
 
-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.
+# Use
+
+## General
+
+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 loader will automatically increase the size of the last partition and use this space as cache if it is larger than 2GiB.
+
+## Acessing loader
+
+### Via terminal
+
+Call the "menu.sh" command from the computer itself.
+
+### 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.
 
-Addons can be downloaded and added to the loader.
+## 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.
 
 More information will be added in the future.
-

TODO

@@ -1,7 +1,10 @@
 A fazer
- - Descobrir como é o serial do DS2422+
+ - Checar NVME no modelo DS920+, DS918+
- - Mudar addons para colocar pacote completo na partição 3 e detectar dinâmicamente durante o boot do júnior
+ - Checar módulo tg3 no próprio loader (BCM57780 [14e4:1692]) (#31)
- - Estudar acrescentar modo simples e avançado do menu
+ - "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
@@ -24,5 +27,15 @@ Concluidos:
  - Arrumar detecção de discos/maxdisks. 918 tem só 4 discos e dá problema com proxmox
  - Melhorar opções de HD, talvez criar um menu a parte
  - Implementar update do bzimage e ramdisk online
-
+ - Mudar addons para colocar pacote completo na partição 3 e detectar dinâmicamente durante o boot do júnior
-https://kb.synology.com/en-me/DSM/tutorial/What_kind_of_CPU_does_my_NAS_have
+ - Acertar flag DIRTY ao atualizar módulos, etc
+ - Consertar MAC custom
+ - 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)

Taskfile.yaml

@@ -12,11 +12,8 @@ tasks:
     cmds:
       - ./build.sh
 
-  compile-lkms:
+  compile-kpatch:
+    dir: kpatch
     cmds:
-      - ./compile-lkm.sh
+      - make clean all
-
+      - mv kpatch ../files/board/arpl/overlayfs/opt/arpl/
-  compile-addons:
-    dir: addons
-    cmds:
-      - ./compile-addons.sh {{.CLI_ARGS}}

VERSION

@@ -1 +1 @@
-0.3-alpha2
+1.0-beta13a

docker/Dockerfile.template

@@ -1,41 +0,0 @@
-FROM alpine:3.14 AS stage
-ARG PLATFORMS="@@@PLATFORMS@@@"
-ARG TOOLKIT_VER="@@@TOOLKIT_VER@@@"
-
-# Copy downloaded toolkits
-ADD cache /cache
-# Extract toolkits
-RUN for V in ${PLATFORMS}; do \
-      echo "${V}" | while IFS=':' read PLATFORM KVER; do \
-        echo "Extracting ds.${PLATFORM}-${TOOLKIT_VER}.dev.txz" && \
-        mkdir "/opt/${PLATFORM}" && \
-        tar -xaf "/cache/ds.${PLATFORM}-${TOOLKIT_VER}.dev.txz" -C "/opt/${PLATFORM}" --strip-components=10 \
-          "usr/local/x86_64-pc-linux-gnu/x86_64-pc-linux-gnu/sys-root/usr/lib/modules/DSM-${TOOLKIT_VER}/build" && \
-        echo -e "${PLATFORM}\t${KVER}" >> /opt/platforms && \
-        if [ ! -d "/opt/linux-${KVER}" ]; then \
-          mkdir "/opt/linux-${KVER}" && \
-          echo "Extracting linux-${KVER}.tar.xz" && \
-          tar -xaf "/cache/linux-${KVER}.tar.xz" -C "/opt/linux-${KVER}" --strip-components=1; \
-        fi; \
-      done; \
-    done
-
-# Final image
-FROM debian:8-slim
-ENV SHELL=/bin/bash \
-    ARCH=x86_64
-
-RUN apt update --yes && \
-    apt install --yes --no-install-recommends --no-install-suggests \
-      ca-certificates nano curl bc kmod git \
-      build-essential make ncurses-dev libssl-dev autogen automake pkg-config libtool xsltproc gperf && \
-    apt-get clean && \
-    rm -rf /var/lib/apt/lists/*
-
-COPY --from=stage /opt /opt
-COPY files/ /
-
-WORKDIR /input
-VOLUME /input /output
-
-ENTRYPOINT ["/opt/do.sh"]

docker/build.sh

@@ -1,55 +0,0 @@
-#!/usr/bin/env bash
-
-###############################################################################
-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 <../PLATFORMS
-
-# Download toolkits
-mkdir -p cache
-TOOLKIT_VER="7.0"
-for PLATFORM in ${!PLATFORMS[@]}; do
-  KVER="${PLATFORMS[${PLATFORM}]}"
-  echo -n "Checking cache/ds.${PLATFORM}-${TOOLKIT_VER}.dev.txz... "
-  if [ ! -f "cache/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/ds.${PLATFORM}-${TOOLKIT_VER}.dev.txz"
-  else
-    echo "OK"
-  fi
-  # echo -n "Checking cache/linux-${KVER}.tar.xz... "
-  # if [ ! -f "cache/linux-${KVER}.tar.xz" ]; then
-  #   URL="https://cdn.kernel.org/pub/linux/kernel/v${KVER:0:1}.x/linux-${KVER}.tar.xz"
-  #   echo "Downloading ${URL}"
-  #   curl -L "${URL}" -o "cache/linux-${KVER}.tar.xz"
-  # else
-  #   echo "OK"
-  # fi
-done
-
-# Generate Dockerfile
-echo "Generating Dockerfile"
-cp Dockerfile.template Dockerfile
-VALUE=""
-for PLATFORM in ${!PLATFORMS[@]}; do
-  VALUE+="${PLATFORM}:${PLATFORMS[${PLATFORM}]} "
-done
-sed -i "s|@@@PLATFORMS@@@|${VALUE::-1}|g" Dockerfile
-sed -i "s|@@@TOOLKIT_VER@@@|${TOOLKIT_VER}|g" Dockerfile
-
-# Build
-echo "Building... Drink a coffee and wait!"
-docker image rm fbelavenuto/syno-compiler >/dev/null 2>&1
-docker buildx build . --load --tag fbelavenuto/syno-compiler

docker/files/opt/do.sh

@@ -1,80 +0,0 @@
-#!/usr/bin/env bash
-
-function compile-module {
-  # Validate
-  if [ -z "${1}" ]; then
-    echo "Use: compile-module <platform>"
-    exit 1
-  fi
-  VALID=0
-  while read PLATFORM KVER; do
-    if [ "${PLATFORM}" = "${1}" ]; then
-      VALID=1
-      break
-    fi
-  done </opt/platforms
-  if [ $VALID -eq 0 ]; then
-    echo "Platform ${PLATFORM} not found."
-    exit 1
-  fi
-  echo "Compiling module for ${PLATFORM}-${KVER}..."
-  cp -R /input /tmp
-  make -C "/opt/${PLATFORM}" M="/tmp/input" PLATFORM=${PLATFORM^^} modules
-  while read F; do
-    strip -g "${F}"
-    echo "Copying `basename ${F}`"
-    cp "${F}" "/output"
-  done < <(find /tmp/input -name \*.ko)
-}
-
-function compile-lkm {
-  PLATFORM=${1}
-  if [ -z "${PLATFORM}" ]; then
-    echo "Use: compile-lkm <platform>"
-    exit 1
-  fi
-  cp -R /input /tmp
-  make -C "/tmp/input" LINUX_SRC="/opt/${PLATFORM}" dev-v7
-  strip -g "/tmp/input/redpill.ko"
-  mv "/tmp/input/redpill.ko" "/output/redpill-dev.ko"
-  make -C "/tmp/input" LINUX_SRC="/opt/${PLATFORM}" clean
-  make -C "/tmp/input" LINUX_SRC="/opt/${PLATFORM}" prod-v7
-  strip -g "/tmp/input/redpill.ko"
-  mv "/tmp/input/redpill.ko" "/output/redpill-prod.ko"
-}
-
-# function compile-drivers {
-#   while read platform kver; do
-#     SRC_PATH="/opt/${platform}"
-#     echo "Compiling for ${platform}-${kver}"
-#     cd /opt/linux-${kver}/drivers
-#     while read dir; do
-#       if [ -f "${dir}/Makefile" ]; then
-#         echo "Driver `basename ${dir}`"
-#         grep "CONFIG_.*/.*"   "${dir}/Makefile" | sed 's/.*\(CONFIG_[^)]*\).*/\1=n/g' >  /tmp/env
-#         grep "CONFIG_.*\.o.*" "${dir}/Makefile" | sed 's/.*\(CONFIG_[^)]*\).*/\1=m/g' >> /tmp/env
-#         make -C "${SRC_PATH}" M=$(readlink -f "${dir}") clean
-#         cat /tmp/env | xargs -d '\n' make -C "${SRC_PATH}" M=$(readlink -f "${dir}") modules $@
-#       fi
-#     done < <(find -type d)
-#     DST_PATH="/output/compiled-mods/${platform}-${kver}"
-#     mkdir -p "${DST_PATH}"
-#     while read f; do
-#       strip -g "${f}"
-#       mv "${f}" "${DST_PATH}"
-#     done < <(find -name \*.ko)
-#   done </opt/platforms
-# }
-
-if [ $# -lt 1 ]; then
-  echo "Use: <command> (<params>)"
-  exit 1
-fi
-case $1 in
-  bash) shift; bash -l $@ ;;
-  compile-module) compile-module $2 ;;
-  compile-lkm) compile-lkm $2 ;;
-  # compile-drivers) compile-drivers ;;
-  *) echo "Command not recognized: $1" ;;
-esac
-

docker/syno-compiler/Dockerfile.template

@@ -0,0 +1,49 @@
+FROM alpine:3.14 AS stage
+ARG PLATFORMS="@@@PLATFORMS@@@"
+ARG TOOLKIT_VER="@@@TOOLKIT_VER@@@"
+
+# Copy downloaded toolkits
+ADD cache /cache
+# Extract toolkits
+RUN for V in ${PLATFORMS}; do \
+      echo "${V}" | while IFS=':' read PLATFORM KVER; do \
+        echo -e "${PLATFORM}\t${KVER}" >> /opt/platforms && \
+        echo "Extracting ds.${PLATFORM}-${TOOLKIT_VER}.dev.txz" && \
+        mkdir "/opt/${PLATFORM}" && \
+        tar -xaf "/cache/ds.${PLATFORM}-${TOOLKIT_VER}.dev.txz" -C "/opt/${PLATFORM}" --strip-components=9 \
+          "usr/local/x86_64-pc-linux-gnu/x86_64-pc-linux-gnu/sys-root/usr/lib/modules/DSM-${TOOLKIT_VER}" && \
+        echo "Extracting ${PLATFORM}-toolchain.txz" && \
+        tar -xaf "/cache/${PLATFORM}-toolchain.txz" -C "/opt/${PLATFORM}" --strip-components=1; \
+        KVER_MAJOR="`echo ${KVER} | rev | cut -d. -f2- | rev`"; \
+        if [ ! -d "/opt/linux-${KVER_MAJOR}.x" -a -f "/cache/linux-${KVER_MAJOR}.x.txz" ]; then \
+          echo "Extracting linux-${KVER_MAJOR}.x.txz" && \
+          tar -xaf "/cache/linux-${KVER_MAJOR}.x.txz" -C "/opt"; \
+          rm -rf /opt/${PLATFORM}/source && \
+          ln -s /opt/linux-${KVER_MAJOR}.x /opt/${PLATFORM}/source; \
+        fi; \
+      done; \
+    done
+
+# Final image
+FROM debian:8-slim
+ENV SHELL=/bin/bash \
+    ARCH=x86_64
+
+RUN apt update --yes && \
+    apt install --yes --no-install-recommends --no-install-suggests --allow-unauthenticated \
+      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/* && \
+    useradd --create-home --shell /bin/bash --uid 1000 --user-group arpl && \
+    echo "arpl ALL=(ALL) NOPASSWD:ALL" > /etc/sudoers.d/arpl && \
+    mkdir /output && chown 1000:1000 /output
+
+COPY --from=stage --chown=1000:1000 /opt /opt
+COPY files/ /
+
+USER arpl
+WORKDIR /input
+VOLUME /input /output
+
+ENTRYPOINT ["/opt/do.sh"]

docker/syno-compiler/PLATFORMS

@@ -0,0 +1,9 @@
+bromolow	3.10.108
+apollolake	4.4.180
+broadwell	4.4.180
+broadwellnk	4.4.180
+denverton	4.4.180
+geminilake	4.4.180
+v1000   4.4.180
+r1000   4.4.180
+epyc7002	5.10.55

docker/syno-compiler/build.sh

@@ -0,0 +1,98 @@
+#!/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)"
+    sleep 2 || exit 1
+}
+trap trap_cancel SIGINT SIGTERM
+cd `dirname $0`
+
+###############################################################################
+function prepare() {
+  declare -A URLS
+
+  URLS["apollolake"]="https://global.download.synology.com/download/ToolChain/toolchain/${TOOLCHAIN_VER}/Intel%20x86%20Linux%204.4.180%20%28Apollolake%29/apollolake-${GCCLIB_VER}_x86_64-GPL.txz"
+  URLS["broadwell"]="https://global.download.synology.com/download/ToolChain/toolchain/${TOOLCHAIN_VER}/Intel%20x86%20Linux%204.4.180%20%28Broadwell%29/broadwell-${GCCLIB_VER}_x86_64-GPL.txz"
+  URLS["broadwellnk"]="https://global.download.synology.com/download/ToolChain/toolchain/${TOOLCHAIN_VER}/Intel%20x86%20Linux%204.4.180%20%28Broadwellnk%29/broadwellnk-${GCCLIB_VER}_x86_64-GPL.txz"
+  URLS["bromolow"]="https://global.download.synology.com/download/ToolChain/toolchain/${TOOLCHAIN_VER}/Intel%20x86%20linux%203.10.108%20%28Bromolow%29/bromolow-${GCCLIB_VER}_x86_64-GPL.txz"
+  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 < ${PLATFORM_FILE}
+
+  # Download toolkits
+  mkdir -p ${CACHE_DIR}
+
+  for PLATFORM in ${!PLATFORMS[@]}; do
+    KVER="${PLATFORMS[${PLATFORM}]}"
+    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 -e "No\nDownloading ${URL}"
+      curl -L "${URL}" -o "${CACHE_DIR}/ds.${PLATFORM}-${TOOLKIT_VER}.dev.txz"
+    else
+      echo "OK"
+    fi
+    echo -n "Checking ${CACHE_DIR}/${PLATFORM}-toolchain.txz... "
+    if [ ! -f "${CACHE_DIR}/${PLATFORM}-toolchain.txz" ]; then
+      URL=${URLS["${PLATFORM}"]}
+      echo -e "No\nDownloading ${URL}"
+      curl -L "${URL}" -o "${CACHE_DIR}/${PLATFORM}-toolchain.txz"
+    else
+      echo "OK"
+    fi
+  done
+
+  for KERNEL in 3.10.x 4.4.x 5.10.x; do
+    URL=${URLS["${KERNEL}"]}
+    [ -z "${URL}" ] && continue
+    echo -n "Checking ${CACHE_DIR}/linux-${KERNEL}.txz... "
+    if [ ! -f "${CACHE_DIR}/linux-${KERNEL}.txz" ]; then
+      echo -e "No\nDownloading ${URL}"
+      curl -L "${URL}" -o "${CACHE_DIR}/linux-${KERNEL}.txz"
+    else
+      echo "OK"
+    fi
+  done
+
+  # Generate Dockerfile
+  echo "Generating Dockerfile"
+  cp Dockerfile.template Dockerfile
+  VALUE=""
+  for PLATFORM in ${!PLATFORMS[@]}; do
+    VALUE+="${PLATFORM}:${PLATFORMS[${PLATFORM}]} "
+  done
+  sed -i "s|@@@PLATFORMS@@@|${VALUE::-1}|g" Dockerfile
+  sed -i "s|@@@TOOLKIT_VER@@@|${TOOLKIT_VER}|g" Dockerfile
+}
+
+# 7.0
+#TOOLKIT_VER="7.0"
+#TOOLCHAIN_VER="7.0-41890"
+#GCCLIB_VER="gcc750_glibc226"
+#prepare
+#echo "Building ${TOOLKIT_VER}"
+#docker image rm fbelavenuto/syno-compiler:${TOOLKIT_VER} >/dev/null 2>&1
+#docker buildx build . --load --tag fbelavenuto/syno-compiler:${TOOLKIT_VER}
+
+# 7.1
+TOOLKIT_VER="7.1"
+TOOLCHAIN_VER="7.1-42661"
+GCCLIB_VER="gcc850_glibc226"
+prepare
+echo "Building ${TOOLKIT_VER}"
+docker image rm fbelavenuto/syno-compiler:${TOOLKIT_VER} >/dev/null 2>&1
+docker buildx build . --load --tag fbelavenuto/syno-compiler:${TOOLKIT_VER} --tag fbelavenuto/syno-compiler:latest

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

@@ -0,0 +1,128 @@
+#!/usr/bin/env bash
+
+set -eo pipefail
+
+###############################################################################
+function export-vars() {
+  # Validate
+  if [ -z "${1}" ]; then
+    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"
+  echo "export PATH=\"/opt/${1}/bin:${PATH}\"" | \
+    sudo tee /etc/profile.d/path.sh >/dev/null
+  sudo chmod +x /etc/profile.d/path.sh
+}
+
+###############################################################################
+function shell() {
+  cp -fv /opt/${2}/build/.config /opt/${2}/source/
+  cp -fv /opt/${2}/build/System.map /opt/${2}/source/
+  cp -fv /opt/${2}/build/Module.symvers /opt/${2}/source/
+  export-vars $2
+  shift 2
+  bash -l $@
+}
+
+###############################################################################
+function compile-module {
+  # Validate
+  if [ -z "${1}" ]; then
+    echo "Use: compile-module <platform>"
+    exit 1
+  fi
+  VALID=0
+  while read PLATFORM KVER; do
+    if [ "${PLATFORM}" = "${1}" ]; then
+      VALID=1
+      break
+    fi
+  done </opt/platforms
+  if [ $VALID -eq 0 ]; then
+    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}
+  PARMS="${PLATFORM^^}-Y=y ${PLATFORM^^}-M=m"
+  if [ -f "/tmp/input/defines.${1}" ]; then
+    PARMS+=" `cat "/tmp/input/defines.${1}" | xargs`"
+  fi
+  make -j`nproc` -C "/opt/${PLATFORM}/build" M="/tmp/input" ${PARMS} modules
+  while read F; do
+    strip -g "${F}"
+    echo "Copying `basename ${F}`"
+    cp "${F}" "/output"
+  done < <(find /tmp/input -name \*.ko)
+}
+
+###############################################################################
+function compile-lkm {
+  PLATFORM=${1}
+  if [ -z "${PLATFORM}" ]; then
+    echo "Use: compile-lkm <platform>"
+    exit 1
+  fi
+  cp -R /input /tmp
+  export-vars ${PLATFORM}
+  export LINUX_SRC="/opt/${PLATFORM}/build"
+  make -C "/tmp/input" dev-v7
+  strip -g "/tmp/input/redpill.ko"
+  mv "/tmp/input/redpill.ko" "/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"
+}
+
+###############################################################################
+# function compile-drivers {
+#   while read platform kver; do
+#     SRC_PATH="/opt/${platform}"
+#     echo "Compiling for ${platform}-${kver}"
+#     cd /opt/linux-${kver}/drivers
+#     while read dir; do
+#       if [ -f "${dir}/Makefile" ]; then
+#         echo "Driver `basename ${dir}`"
+#         grep "CONFIG_.*/.*"   "${dir}/Makefile" | sed 's/.*\(CONFIG_[^)]*\).*/\1=n/g' >  /tmp/env
+#         grep "CONFIG_.*\.o.*" "${dir}/Makefile" | sed 's/.*\(CONFIG_[^)]*\).*/\1=m/g' >> /tmp/env
+#         make -C "${SRC_PATH}" M=$(readlink -f "${dir}") clean
+#         cat /tmp/env | xargs -d '\n' make -C "${SRC_PATH}" M=$(readlink -f "${dir}") modules $@
+#       fi
+#     done < <(find -type d)
+#     DST_PATH="/output/compiled-mods/${platform}-${kver}"
+#     mkdir -p "${DST_PATH}"
+#     while read f; do
+#       strip -g "${f}"
+#       mv "${f}" "${DST_PATH}"
+#     done < <(find -name \*.ko)
+#   done </opt/platforms
+# }
+
+###############################################################################
+###############################################################################
+
+if [ $# -lt 1 ]; then
+  echo "Use: <command> (<params>)"
+  echo "Commands: bash | shell <platform> | compile-module <platform> | compile-lkm <platform>"
+  exit 1
+fi
+case $1 in
+  bash) shift && bash -l $@ ;;
+  shell) shell $@ ;;
+  compile-module) compile-module $2 ;;
+  compile-lkm) compile-lkm $2 ;;
+  # compile-drivers) compile-drivers ;;
+  *) echo "Command not recognized: $1" ;;
+esac

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/PLATFORMS

@@ -0,0 +1,9 @@
+bromolow	3.10.108
+apollolake	4.4.180
+broadwell	4.4.180
+broadwellnk	4.4.180
+denverton	4.4.180
+geminilake	4.4.180
+v1000   4.4.180
+r1000   4.4.180
+epyc7002	5.10.55

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,56 @@
+#!/usr/bin/env bash
+
+set -e
+
+###############################################################################
+function compile-module {
+  echo -e "Compiling module for \033[7m${PLATFORM}\033[0m..."
+  cp -R /input /tmp
+  PARMS="${PLATFORM^^}-Y=y ${PLATFORM^^}-M=m"
+  if [ -f "/tmp/input/defines.${PLATFORM}" ]; then
+    PARMS+=" `cat "/tmp/input/defines.${PLATFORM}" | xargs`"
+  fi
+  make -j`nproc` -C ${KSRC} M=/tmp/input ${PARMS} 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,18 @@ CONFIG_CGROUP_SCHED=y
 CONFIG_CGROUP_FREEZER=y
 CONFIG_CPUSETS=y
 CONFIG_CGROUP_CPUACCT=y
+CONFIG_NAMESPACES=y
+CONFIG_SYSFS_DEPRECATED=y
 CONFIG_BLK_DEV_INITRD=y
+# CONFIG_RD_GZIP is not set
+# CONFIG_RD_BZIP2 is not set
+# CONFIG_RD_LZMA is not set
+# CONFIG_RD_LZO is not set
+# CONFIG_RD_LZ4 is not set
+# CONFIG_RD_ZSTD is not set
 CONFIG_KALLSYMS_ALL=y
+CONFIG_KCMP=y
+CONFIG_EMBEDDED=y
 # CONFIG_COMPAT_BRK is not set
 CONFIG_PROFILING=y
 CONFIG_SMP=y
@@ -31,8 +41,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
@@ -42,17 +50,19 @@ CONFIG_PM_TRACE_RTC=y
 CONFIG_ACPI_VIDEO=y
 CONFIG_ACPI_DOCK=y
 CONFIG_ACPI_BGRT=y
-CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y
+CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
-CONFIG_CPU_FREQ_GOV_ONDEMAND=y
+CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
 CONFIG_X86_ACPI_CPUFREQ=y
+CONFIG_X86_POWERNOW_K8=y
+CONFIG_INTEL_IDLE=y
 CONFIG_IA32_EMULATION=y
-# CONFIG_VIRTUALIZATION is not set
 CONFIG_KPROBES=y
 CONFIG_JUMP_LABEL=y
 # CONFIG_GCC_PLUGINS is not set
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 CONFIG_MODULE_FORCE_UNLOAD=y
+# CONFIG_BLK_DEBUG_FS is not set
 CONFIG_PARTITION_ADVANCED=y
 CONFIG_BINFMT_MISC=y
 CONFIG_NET=y
@@ -79,7 +89,8 @@ CONFIG_TCP_CONG_ADVANCED=y
 # CONFIG_TCP_CONG_WESTWOOD is not set
 # CONFIG_TCP_CONG_HTCP is not set
 CONFIG_TCP_MD5SIG=y
-# CONFIG_IPV6 is not set
+CONFIG_IPV6=m
+# CONFIG_IPV6_SIT is not set
 CONFIG_NETLABEL=y
 CONFIG_NETFILTER=y
 # CONFIG_NETFILTER_ADVANCED is not set
@@ -92,7 +103,6 @@ CONFIG_NF_NAT=y
 CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=y
 CONFIG_NETFILTER_XT_TARGET_NFLOG=y
 CONFIG_NETFILTER_XT_TARGET_SECMARK=y
-CONFIG_NETFILTER_XT_TARGET_TCPMSS=y
 CONFIG_NETFILTER_XT_MATCH_CONNTRACK=y
 CONFIG_NETFILTER_XT_MATCH_POLICY=y
 CONFIG_NETFILTER_XT_MATCH_STATE=y
@@ -101,6 +111,8 @@ CONFIG_IP_NF_FILTER=y
 CONFIG_IP_NF_TARGET_REJECT=y
 CONFIG_IP_NF_TARGET_MASQUERADE=m
 CONFIG_IP_NF_MANGLE=y
+CONFIG_BRIDGE=m
+CONFIG_VLAN_8021Q=m
 CONFIG_NET_SCHED=y
 CONFIG_NET_EMATCH=y
 CONFIG_NET_CLS_ACT=y
@@ -110,9 +122,12 @@ 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
+# CONFIG_EFI_CUSTOM_SSDT_OVERLAYS is not set
 CONFIG_BLK_DEV_LOOP=y
 CONFIG_VIRTIO_BLK=m
 CONFIG_BLK_DEV_NVME=y
@@ -121,6 +136,7 @@ CONFIG_BLK_DEV_SD=y
 CONFIG_CHR_DEV_SG=y
 CONFIG_SCSI_CONSTANTS=y
 CONFIG_SCSI_SPI_ATTRS=y
+CONFIG_SCSI_SAS_ATA=y
 CONFIG_BLK_DEV_3W_XXXX_RAID=m
 CONFIG_SCSI_HPSA=m
 CONFIG_SCSI_3W_9XXX=m
@@ -142,7 +158,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
@@ -177,26 +193,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_AMD=y
+CONFIG_SATA_VITESSE=m
-CONFIG_PATA_OLDPIIX=y
-CONFIG_PATA_SCH=y
 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
@@ -274,6 +299,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
@@ -340,21 +366,36 @@ CONFIG_HW_RANDOM=y
 CONFIG_NVRAM=y
 CONFIG_HPET=y
 # CONFIG_HPET_MMAP is not set
+CONFIG_I2C=y
 CONFIG_I2C_I801=y
 CONFIG_WATCHDOG=y
 CONFIG_REGULATOR=y
 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
@@ -394,6 +435,7 @@ CONFIG_LEDS_TRIGGERS=y
 CONFIG_RTC_CLASS=y
 # CONFIG_RTC_HCTOSYS is not set
 CONFIG_DMADEVICES=y
+CONFIG_SYNC_FILE=y
 CONFIG_VIRT_DRIVERS=y
 CONFIG_VBOXGUEST=m
 CONFIG_VIRTIO_PCI=m
@@ -425,9 +467,8 @@ 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_EFIVAR_FS=y
 CONFIG_NFS_FS=y
 CONFIG_NFS_V3_ACL=y
 CONFIG_NFS_V4=y
@@ -460,7 +501,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,11 +15,11 @@ BOARD_PATH="${CONFIG_DIR}/board/arpl"
 
 echo "Creating image file"
 # Create image zeroed
-dd if="/dev/zero" of="${IMAGE_FILE}" bs=1M count=300 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
-echo -e "n\np\n\n\n+150M\na\nt\n\n0b\nn\np\n\n\n+50M\nn\np\n\n\n\nw" | fdisk "${IMAGE_FILE}" >/dev/null
+echo -e "n\np\n\n\n+50M\na\nt\n\n0b\nn\np\n\n\n+50M\nn\np\n\n\n\nw" | fdisk "${IMAGE_FILE}" >/dev/null
 
 # Force umount, ignore errors
 sudo umount "${BINARIES_DIR}/p1" 2>/dev/null || true
@@ -40,8 +40,8 @@ sudo mount /dev/loop8p1 "${BINARIES_DIR}/p1"
 sudo mount /dev/loop8p3 "${BINARIES_DIR}/p3"
 
 echo "Copying files"
-sudo cp "${BINARIES_DIR}/bzImage"            "${BINARIES_DIR}/p1/bzImage-arpl"
+sudo cp "${BINARIES_DIR}/bzImage"            "${BINARIES_DIR}/p3/bzImage-arpl"
-sudo cp "${BINARIES_DIR}/rootfs.cpio.xz"     "${BINARIES_DIR}/p1/initrd-arpl"
+sudo cp "${BINARIES_DIR}/rootfs.cpio.xz"     "${BINARIES_DIR}/p3/initrd-arpl"
 sudo cp -R "${BOARD_PATH}/p1/"*              "${BINARIES_DIR}/p1"
 sudo cp -R "${BOARD_PATH}/p3/"*              "${BINARIES_DIR}/p3"
 sync

files/board/arpl/overlayfs/etc/init.d/S41dhcpcd

@@ -0,0 +1,33 @@
+#!/bin/sh
+#
+# Start/stop dhcpcd
+#
+
+DAEMON=/usr/sbin/dhcpcd
+CONFIG=/etc/dhcpcd.conf
+PIDFILE=/var/run/dhcpcd/pid
+
+[ -f $CONFIG ] || exit 0
+
+case "$1" in
+  start)
+	echo "Starting dhcpcd..."
+	start-stop-daemon -S -x "$DAEMON" -p "$PIDFILE" -- -f "$CONFIG"
+	;;
+  stop)
+	echo "Stopping dhcpcd..."
+	start-stop-daemon -K -x "$DAEMON" -p "$PIDFILE" -o
+	;;
+  reload|force-reload)
+	echo "Reloading dhcpcd configuration..."
+	"$DAEMON" -s reload
+	;;
+  restart)
+	"$0" stop
+	sleep 1 # Prevent race condition: ensure dhcpcd stops before start.
+	"$0" start
+	;;
+  *)
+	echo "Usage: $0 {start|stop|restart|reload|force-reload}"
+	exit 1
+esac

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

@@ -0,0 +1,20 @@
+[global]
+  workgroup = WORKGROUP
+  server role = standalone server
+  obey pam restrictions = yes
+  map to guest = Bad User
+  usershare allow guests = yes
+  dfree command = /usr/bin/df
+
+[arpl]
+  browseable = yes
+  public = yes
+  path = /mnt
+  guest ok = yes
+  printable = no
+  read only = no
+  writable = yes
+  create mask = 0600
+  directory mask = 0700
+  force user = root
+  force group = root

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

@@ -7,14 +7,16 @@ 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\033[A\n" ${COLUMNS} ""
+printf "\033[1;32m%*s\033[0m\n" $(((${#TITLE}+${COLUMNS})/2)) "${TITLE}"
+printf "\033[1;44m%*s\033[0m\n" ${COLUMNS} ""
 TITLE="BOOTING..."
-if [ -z "${COLUMNS}" ]; then
+printf "\033[1;33m%*s\033[0m\n" $(((${#TITLE}+${COLUMNS})/2)) "${TITLE}"
-  echo -e "\033[1;33m${TITLE}\033[0m"
-else
-  printf "\033[1;33m%*s\033[0m\n" $(((${#TITLE}+${COLUMNS})/2)) "${TITLE}"
-fi
 
 # Check if DSM zImage changed, patch it if necessary
 ZIMAGE_HASH="`readConfigKey "zimage-hash" "${USER_CONFIG_FILE}"`"
@@ -24,7 +26,7 @@ if [ "`sha256sum "${ORI_ZIMAGE_FILE}" | awk '{print$1}'`" != "${ZIMAGE_HASH}" ];
   if [ $? -ne 0 ]; then
     dialog --backtitle "`backtitle`" --title "Error" \
       --msgbox "zImage not patched:\n`<"${LOG_FILE}"`" 12 70
-    return 1
+    exit 1
   fi
 fi
 
@@ -36,7 +38,7 @@ if [ "`sha256sum "${ORI_RDGZ_FILE}" | awk '{print$1}'`" != "${RAMDISK_HASH}" ];
   if [ $? -ne 0 ]; then
     dialog --backtitle "`backtitle`" --title "Error" \
       --msgbox "Ramdisk not patched:\n`<"${LOG_FILE}"`" 12 70
-    return 1
+    exit 1
   fi
 fi
 
@@ -47,6 +49,9 @@ MODEL="`readConfigKey "model" "${USER_CONFIG_FILE}"`"
 BUILD="`readConfigKey "build" "${USER_CONFIG_FILE}"`"
 SN="`readConfigKey "sn" "${USER_CONFIG_FILE}"`"
 
+echo -e "Model: \033[1;36m${MODEL}\033[0m"
+echo -e "Build: \033[1;36m${BUILD}\033[0m"
+
 declare -A CMDLINE
 
 # Fixed values
@@ -70,62 +75,81 @@ 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`
 if [ "${BUS}" = "ata" ]; then
-  SIZE=$((`df -BM | awk '/\/mnt\/p3/{print$2}' | tr 'M' ' '`+300))
+  LOADER_DEVICE_NAME=`echo ${LOADER_DISK} | sed 's|/dev/||'`
+  SIZE=$((`cat /sys/block/${LOADER_DEVICE_NAME}/size`/2048+10))
   # Read SATADoM type
   DOM="`readModelKey "${MODEL}" "dom"`"
 fi
 
+# Validate netif_num
+NETIF_NUM=${CMDLINE["netif_num"]}
+MACS=0
+for N in `seq 1 9`; do
+  [ -n "${CMDLINE["mac${N}"]}" ] && MACS=$((${MACS}+1))
+done
+if [ ${NETIF_NUM} -ne ${MACS} ]; then
+  echo -e "\033[1;33m*** netif_num is not equal to macX amount, set netif_num to ${MACS} ***\033[0m"
+  CMDLINE["netif_num"]=${MACS}
+fi
+
 # Prepare command line
 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'`
-# Inform user
-echo -e "Model: \033[1;36m${MODEL}\033[0m"
-echo -e "Build: \033[1;36m${BUILD}\033[0m"
 echo -e "Cmdline:\n\033[1;36m${CMDLINE_LINE}\033[0m"
 
 # Wait for an IP
 COUNT=0
-echo -n "IP: "
+echo -n "IP"
 while true; do
   IP=`ip route get 1.1.1.1 2>/dev/null | awk '{print$7}'`
   if [ -n "${IP}" ]; then
-    echo -e "\033[1;32m${IP}\033[0m"
+    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"
+    echo -e ": \033[1;31mERROR\033[0m"
     break
   fi
   COUNT=$((${COUNT}+1))
   sleep 1
+  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
+  exit 0
+fi
 echo -e "\033[1;37mLoading DSM kernel...\033[0m"
 
 # Executes DSM kernel via KEXEC
-history -a
-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
+exit 0

files/board/arpl/overlayfs/opt/arpl/common.php

@@ -1,245 +0,0 @@
-#!/usr/bin/env php
-<?php
-declare(strict_types=1);
-
-/**
- * This file contains usual common functions used by patchers
- *
- * Most of the functions here are written to be C-like without utilizing any of the PHP's magic. This functionality is
- * ultimately intended to be rewritten into a dynamic patcher in C. Making this code compatible wtih simple C (e.g.
- * by not using fancy regexes) will make it slower in PHP but MUCH easier to rewrite into C later on.
- */
-
-function perr(string $txt, $die = false)
-{
-    fwrite(STDERR, $txt);
-    if ($die) {
-        die();
-    }
-}
-
-/**
- * @return int
- */
-function getELFSectionAddr(string $elf, string $section, int $pos)
-{
-    $secAddr = exec(
-        sprintf('readelf -S \'%1$s\' | grep -E \'\s%2$s\s\' | awk -F\'%2$s\' \'{ print $2 }\' | awk \'{ print $%3$d }\'', $elf, str_replace('.', '\.', $section), $pos)
-    );
-    if (!$secAddr) {
-        perr("$section section not found in $elf file\n", true);
-    }
-
-    $secAddr = hexdec(substr($secAddr, -8));
-    perr("Found $section at " . decTo32bUFhex($secAddr) . " in $elf\n");
-
-    return $secAddr;
-}
-
-function getELFStringLoc(string $elf, string $text)
-{
-    $strAddr = exec(
-        sprintf(
-            'readelf -p \'.rodata\' \'%s\' | grep \'%s\' | grep -oE \'\[(\s+)?.+\]\' | grep -oE \'[a-f0-9]+\'',
-            $elf, $text
-        )
-    );
-
-    if (!$strAddr) {
-        perr("$text string not found in $elf file's .rodata section\n", true);
-    }
-
-    $secAddr = hexdec(substr($strAddr, -8));
-    perr("Found \"$text\" at " . decTo32bUFhex($secAddr) . " in $elf\n");
-
-    return $secAddr;
-}
-
-function getArgFilePath(int $argn)
-{
-    global $argv;
-
-    $file = realpath($argv[$argn]);
-    if (!is_file($file) || !$file) {
-        perr("Expected a readable file in argument $argn - found none\n", true);
-    }
-
-    return $file;
-}
-
-/**
- * Converts decimal value to 32-bit little-endian hex value
- */
-function decTo32bLEhex(int $dec)
-{
-    $hex = str_pad(dechex($dec), 32 / 8 * 2, 'f', STR_PAD_LEFT); //32-bit hex
-
-    return implode('', array_reverse(str_split($hex, 2))); //make it little-endian
-}
-
-/**
- * Converts decimal value to 32-bit user-friendly (and big-endian) hex value
- *
- * This function should really be used for printing
- */
-function decTo32bUFhex(int $dec)
-{
-    return implode(' ', str_split(str_pad(dechex($dec), 32 / 8 * 2, 'f', STR_PAD_LEFT), 2));
-}
-
-function rawToUFhex(string $raw)
-{
-    $out = '';
-    for($i=0, $iMax = strlen($raw); $i < $iMax; $i++) {
-        $out .=  sprintf('%02x', ord($raw[$i]));
-
-        if ($i+1 !== $iMax) {
-            $out .= ' ';
-        }
-    }
-
-    return $out;
-}
-
-/**
- * Convert hex values to their binary/raw counterparts as-is
- */
-function hex2raw(string $hex)
-{
-    $bin = '';
-    for ($i = 0, $iMax = strlen($hex); $i < $iMax; $i += 2) {
-        $bin .= chr(hexdec($hex[$i] . $hex[$i + 1]));
-    }
-
-    return $bin;
-}
-
-const DIR_FWD = 1;
-const DIR_RWD = -1;
-function findSequence($fp, string $bin, int $pos, int $dir, int $maxToCheck)
-{
-    if ($maxToCheck === -1) {
-        $maxToCheck = PHP_INT_MAX;
-    }
-
-    $len = strlen($bin);
-    do {
-        fseek($fp, $pos);
-        if (strcmp(fread($fp, $len), $bin) === 0) {
-            return $pos;
-        }
-
-        $pos = $pos + $dir;
-        $maxToCheck--;
-    } while (!feof($fp) && $pos != -1 && $maxToCheck != 0);
-
-    return -1;
-}
-
-/**
- * Locates a pattern of bytes $searchSeqNum in a $fp stream starting from $pos seeking up to $maxToCheck
- *
- * @param array $searchSeqNum An array containing n elements (where n=length of the searched sequence). Each element can
- *                            be a null (denoting "any byte"), singular hex/int value (e.g. 0xF5), or a range in a form
- *                            of a two-element array (e.g. [0xF0, 0xF7])
- */
-function findSequenceWithWildcard($fp, array $searchSeqNum, int $pos, int $maxToCheck)
-{
-    if ($maxToCheck === -1) {
-        $maxToCheck = PHP_INT_MAX;
-    }
-
-    $bufLen = count($searchSeqNum);
-    if ($maxToCheck < $bufLen) {
-        perr("maxToCheck cannot be smaller than search sequence!", true);
-    }
-
-    //Convert all singular value to raw bytes while leaving arrays as numeric (performance reasons). As this loop is
-    //executed once per pattern it can be sub-optimal but more careful with data validation
-    $searchSeq = [];
-    foreach ($searchSeqNum as $idx => $num) {
-        if ($num === null) {
-            $searchSeq[] = null;
-        } elseif (is_array($num) && count($num) == 2 && is_int($num[0]) && is_int($num[1]) && $num[0] >= 0 &&
-                  $num[0] <= 255 && $num[1] >= 0 && $num[1] <= 255 && $num[0] < $num[1]) {
-            $searchSeq[] = $num; //Leave them as numeric
-        } elseif (is_int($num) && $num >= 0 && $num <= 255) {
-            $searchSeq[] = chr($num);
-        } else {
-            perr("Found invalid search sequence at index $idx", true);
-        }
-    }
-
-    //$pos denotes start position but it's also used to mark where start of a potential pattern match was found
-    fseek($fp, $pos);
-    do { //This loop is optimized for speed
-        $buf = fread($fp, $bufLen);
-        if (!isset($buf[$bufLen-1])) {
-            break; //Not enough data = no match
-        }
-
-        $successfulLoops = 0;
-        foreach ($searchSeq as $byteIdx => $seekByte) {
-            if ($seekByte === null) { //any character
-                ++$successfulLoops;
-                continue;
-            }
-
-            //element in the array can be a range [(int)from,(int)to] or a literal SINGLE byte
-            //if isset finds a second element it will mean for us that it's an array of 2 elements (as we don't expect
-            //a string longer than a single byte)
-            if (isset($seekByte[1])) {
-                $curByteNum = ord($buf[$byteIdx]);
-                if ($curByteNum < $seekByte[0] || $curByteNum > $seekByte[1]) {
-                    break;
-                }
-            } elseif($buf[$byteIdx] !== $seekByte) { //If the byte doesn't match literally we know it's not a match
-                break;
-            }
-
-            ++$successfulLoops;
-        }
-        if ($successfulLoops === $bufLen) {
-            return $pos;
-        }
-
-        fseek($fp, ++$pos);
-        $maxToCheck--;
-    } while (!feof($fp) && $maxToCheck != 0);
-
-    return -1;
-}
-
-/**
- * @return resource
- */
-function getFileMemMapped(string $path)
-{
-    $fp = fopen('php://memory', 'r+');
-    fwrite($fp, file_get_contents($path)); //poor man's mmap :D
-
-    return $fp;
-}
-
-function saveStreamToFile($fp, string $path)
-{
-    perr("Saving stream to $path ...\n");
-
-    $fp2 = fopen($path, 'w');
-    fseek($fp, 0);
-    while (!feof($fp)) {
-        fwrite($fp2, fread($fp, 8192));
-    }
-    fclose($fp2);
-
-    perr("DONE!\n");
-}
-
-/**
- * Do not call this in time-sensitive code...
- */
-function readAt($fp, int $pos, int $len)
-{
-    fseek($fp, $pos);
-    return fread($fp, $len);
-}

files/board/arpl/overlayfs/opt/arpl/crc32.php

@@ -1,8 +0,0 @@
-#!/usr/bin/env php
-<?php
-if ($argc < 2 || $argc > 2) {
-    fwrite(STDERR, "Usage: " . $argv[0] . " <file>\n");
-    die();
-}
-echo hash_file('crc32b', $argv[1]);
-?>

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

@@ -1,5 +1,5 @@
 
-ARPL_VERSION="0.3-alpha2"
+ARPL_VERSION="1.0-beta13a"
 
 # Define paths
 TMP_PATH="/tmp"
@@ -8,12 +8,15 @@ RAMDISK_PATH="${TMP_PATH}/ramdisk"
 LOG_FILE="${TMP_PATH}/log.txt"
 
 USER_CONFIG_FILE="${BOOTLOADER_PATH}/user-config.yml"
-MOD_ZIMAGE_FILE="${BOOTLOADER_PATH}/zImage"
+GRUB_PATH="${BOOTLOADER_PATH}/grub"
-MOD_RDGZ_FILE="${BOOTLOADER_PATH}/rd.gz"
 
 ORI_ZIMAGE_FILE="${SLPART_PATH}/zImage"
 ORI_RDGZ_FILE="${SLPART_PATH}/rd.gz"
 
+ARPL_BZIMAGE_FILE="${CACHE_PATH}/bzImage-arpl"
+ARPL_RAMDISK_FILE="${CACHE_PATH}/initrd-arpl"
+MOD_ZIMAGE_FILE="${CACHE_PATH}/zImage-dsm"
+MOD_RDGZ_FILE="${CACHE_PATH}/initrd-dsm"
 ADDONS_PATH="${CACHE_PATH}/addons"
 LKM_PATH="${CACHE_PATH}/lkms"
 MODULES_PATH="${CACHE_PATH}/modules"

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

@@ -21,6 +21,14 @@ if [ $NUM_PARTITIONS -ne 3 ]; then
   die "Loader disk not found!"
 fi
 
+# Shows title
+clear
+TITLE="Welcome to Automated Redpill Loader v${ARPL_VERSION}"
+printf "\033[1;44m%*s\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;44m%*s\033[0m\n" $COLUMNS ""
+
 # Check partitions and ignore errors
 fsck.vfat -aw ${LOADER_DISK}1 >/dev/null 2>&1 || true
 fsck.ext2 -p ${LOADER_DISK}2 >/dev/null 2>&1 || true
@@ -29,12 +37,12 @@ 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}"
 mount ${LOADER_DISK}3 ${CACHE_PATH}      || die "Can't mount ${CACHE_PATH}"
 
-mkdir -p "${ADDONS_PATH}"
 # Move/link SSH machine keys to/from cache volume
 [ ! -d "${CACHE_PATH}/ssh" ] && cp -R "/etc/ssh" "${CACHE_PATH}/ssh"
 rm -rf "/etc/ssh"
@@ -42,21 +50,57 @@ ln -s "${CACHE_PATH}/ssh" "/etc/ssh"
 # Link bash history to cache volume
 rm -rf ~/.bash_history
 ln -s ${CACHE_PATH}/.bash_history ~/.bash_history
+touch ~/.bash_history
+if ! grep -q "menu.sh" ~/.bash_history; then
+  echo "menu.sh " >> ~/.bash_history
+fi
+# 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'`
 
 # If user config file not exists, initialize it
 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}"
   writeConfigKey "maxdisks" "" "${USER_CONFIG_FILE}"
+  writeConfigKey "layout" "qwerty" "${USER_CONFIG_FILE}"
   writeConfigKey "keymap" "" "${USER_CONFIG_FILE}"
   writeConfigKey "zimage-hash" "" "${USER_CONFIG_FILE}"
   writeConfigKey "ramdisk-hash" "" "${USER_CONFIG_FILE}"
   writeConfigKey "cmdline" "{}" "${USER_CONFIG_FILE}"
   writeConfigKey "synoinfo" "{}" "${USER_CONFIG_FILE}"
   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}"
+fi
+writeConfigKey "original-mac" "${MACF}" "${USER_CONFIG_FILE}"
+
+# Set custom MAC if defined
+MAC1=`readConfigKey "cmdline.mac1" "${USER_CONFIG_FILE}"`
+if [ -n "${MAC1}" -a "${MAC1}" != "${MACF}" ]; then
+  MAC="${MAC1:0:2}:${MAC1:2:2}:${MAC1:4:2}:${MAC1:6:2}:${MAC1:8:2}:${MAC1:10:2}"
+  echo "Setting MAC to ${MAC}"
+  ip link set dev eth0 address ${MAC} >/dev/null 2>&1 && \
+    (/etc/init.d/S41dhcpcd restart >/dev/null 2>&1 &) || true
 fi
 
 # Get the VID/PID if we are in USB
@@ -74,14 +118,6 @@ fi
 writeConfigKey "vid" ${VID} "${USER_CONFIG_FILE}"
 writeConfigKey "pid" ${PID} "${USER_CONFIG_FILE}"
 
-# Shows title
-clear
-TITLE="Welcome to Automated Redpill Loader v${ARPL_VERSION}"
-printf "\033[1;44m%*s\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;44m%*s\033[0m\n" $COLUMNS ""
-
 # Inform user
 echo -en "Loader disk: \033[1;32m${LOADER_DISK}\033[0m ("
 if [ "${BUS}" = "usb" ]; then
@@ -102,14 +138,18 @@ if [ ${SIZEOFDISK} -ne ${ENDSECTOR} ]; then
 fi
 
 # Load keymap name
+LAYOUT="`readConfigKey "layout" "${USER_CONFIG_FILE}"`"
 KEYMAP="`readConfigKey "keymap" "${USER_CONFIG_FILE}"`"
 
 # Loads a keymap if is valid
-if [ -f /usr/share/keymaps/i386/qwerty/${KEYMAP}.map.gz ]; then
+if [ -f /usr/share/keymaps/i386/${LAYOUT}/${KEYMAP}.map.gz ]; then
-  echo -e "Loading keymap \033[1;32m${KEYMAP}\033[0m"
+  echo -e "Loading keymap \033[1;32m${LAYOUT}/${KEYMAP}\033[0m"
-  zcat /usr/share/keymaps/i386/qwerty/${KEYMAP}.map.gz | loadkeys
+  zcat /usr/share/keymaps/i386/${LAYOUT}/${KEYMAP}.map.gz | loadkeys
 fi
 
+# Enable Wake on Lan, ignore errors
+ethtool -s eth0 wol g 2>/dev/null
+
 # Decide if boot automatically
 BOOT=1
 if ! loaderIsConfigured; then
@@ -121,13 +161,15 @@ elif grep -q "IWANTTOCHANGETHECONFIG" /proc/cmdline; then
 fi
 
 # If is to boot automatically, do it
-[ ${BOOT} -eq 1 ] && boot.sh
+if [ ${BOOT} -eq 1 ]; then 
+  boot.sh && exit 0
+fi
 
 # Wait for an IP
 COUNT=0
 echo -n "Waiting IP."
 while true; do
-  if [ ${COUNT} -eq 15 ]; then
+  if [ ${COUNT} -eq 30 ]; then
     echo "ERROR"
     break
   fi
@@ -148,3 +190,15 @@ echo
 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}"
+
+install-addons.sh

files/board/arpl/overlayfs/opt/arpl/install-addons.sh

@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+
+. /opt/arpl/include/functions.sh
+
+set -e
+
+# Detect if has new local plugins to install/reinstall
+for F in `ls ${CACHE_PATH}/*.addon 2>/dev/null`; do
+  ADDON=`basename "${F}" | sed 's|.addon||'`
+  rm -rf "${ADDONS_PATH}/${ADDON}"
+  mkdir -p "${ADDONS_PATH}/${ADDON}"
+  echo "Installing ${F} to ${ADDONS_PATH}/${ADDON}"
+  tar xaf "${F}" -C "${ADDONS_PATH}/${ADDON}"
+  rm -f "${F}"
+done

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
@@ -19,8 +20,10 @@ DIRTY=0
 
 MODEL="`readConfigKey "model" "${USER_CONFIG_FILE}"`"
 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}"`"
 
 ###############################################################################
@@ -48,9 +51,9 @@ function backtitle() {
     BACKTITLE+=" (no IP)"
   fi
   if [ -n "${KEYMAP}" ]; then
-    BACKTITLE+=" (${KEYMAP})"
+    BACKTITLE+=" (${LAYOUT}/${KEYMAP})"
   else
-    BACKTITLE+=" (us)"
+    BACKTITLE+=" (qwerty/us)"
   fi
   echo ${BACKTITLE}
 }
@@ -58,26 +61,55 @@ function backtitle() {
 ###############################################################################
 # Shows available models to user choose one
 function modelMenu() {
-  ITEMS=""
+  if [ -z "${1}" ]; then
-  while read M; do
+    RESTRICT=1
-    M="`basename ${M}`"
+    FLGBETA=0
-    M="${M::-4}"
+    dialog --backtitle "`backtitle`" --title "Model" --aspect 18 \
-    PLATFORM=`readModelKey "${M}" "platform"`
+      --infobox "Reading models" 0 0
-    # Check id model is compatible with CPU
+    while true; do
-    COMPATIBLE=1
+      echo "" > "${TMP_PATH}/menu"
-    for F in `readModelArray "${M}" "flags"`; do
+      FLGNEX=0
-      if ! grep -q "^flags.*${F}.*" /proc/cpuinfo; then
+      while read M; do
-        COMPATIBLE=0
+        M="`basename ${M}`"
-        break
+        M="${M::-4}"
+        PLATFORM=`readModelKey "${M}" "platform"`
+        DT="`readModelKey "${M}" "dt"`"
+        BETA="`readModelKey "${M}" "beta"`"
+        [ "${BETA}" = "true" -a ${FLGBETA} -eq 0 ] && continue
+        # Check id model is compatible with CPU
+        COMPATIBLE=1
+        if [ ${RESTRICT} -eq 1 ]; then
+          for F in `readModelArray "${M}" "flags"`; do
+            if ! grep -q "^flags.*${F}.*" /proc/cpuinfo; then
+              COMPATIBLE=0
+              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
+      if [ "${resp}" = "b" ]; then
+        FLGBETA=1
+        continue
+      fi
+      break
     done
-    [ ${COMPATIBLE} -eq 1 ] && ITEMS+="${M} ${PLATFORM} "
+  else
-  done < <(find "${MODEL_CONFIG_PATH}" -maxdepth 1 -name \*.yml | sort)
+    resp="${1}"
-  dialog --backtitle "`backtitle`" --menu "Choose the model" 0 0 0 \
+  fi
-    ${ITEMS} 2>${TMP_PATH}/resp
-  [ $? -ne 0 ] && return
-  resp=$(<${TMP_PATH}/resp)
-  [ -z "${resp}" ] && return
   # If user change model, clean buildnumber and S/N
   if [ "${MODEL}" != "${resp}" ]; then
     MODEL=${resp}
@@ -95,18 +127,44 @@ function modelMenu() {
 ###############################################################################
 # Shows available buildnumbers from a model to user choose one
 function buildMenu() {
-  ITEMS="`readConfigEntriesArray "builds" "${MODEL_CONFIG_PATH}/${MODEL}.yml"`"
+  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}"
-    DIRTY=1
+    # Delete synoinfo and reload model/build synoinfo
+    writeConfigKey "synoinfo" "{}" "${USER_CONFIG_FILE}"
+    while IFS="=" read KEY VALUE; do
+      writeConfigKey "synoinfo.${KEY}" "${VALUE}" "${USER_CONFIG_FILE}"
+    done < <(readModelMap "${MODEL}" "builds.${BUILD}.synoinfo")
+    # Check addons
+    PLATFORM="`readModelKey "${MODEL}" "platform"`"
+    KVER="`readModelKey "${MODEL}" "builds.${BUILD}.kver"`"
+    while IFS="=" read ADDON PARAM; do
+      [ -z "${ADDON}" ] && continue
+      if ! checkAddonExist "${ADDON}" "${PLATFORM}" "${KVER}"; then
+        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
   fi
 }
 
@@ -134,8 +192,9 @@ function serialMenu() {
         elif [ `validateSerial ${MODEL} ${SERIAL}` -eq 1 ]; then
           break
         fi
-        dialog --backtitle "`backtitle`" \
+        dialog --backtitle "`backtitle`" --title "Alert" \
-          --msgbox "Invalid serial, please type a right one" 0 0
+          --yesno "Invalid serial, continue?" 0 0
+        [ $? -eq 0 ] && break
       done
       break
     elif [ "${resp}" = "a" ]; then
@@ -168,6 +227,7 @@ function addonMenu() {
       d "Delete addon(s)" \
       s "Show user addons" \
       m "Show all available addons" \
+      o "Download a external addon" \
       e "Exit" \
       2>${TMP_PATH}/resp
     [ $? -ne 0 ] && return
@@ -180,6 +240,7 @@ function addonMenu() {
         done < <(availableAddons "${PLATFORM}" "${KVER}")
         if [ ! -f "${TMP_PATH}/menu" ] ; then 
           dialog --backtitle "`backtitle`" --msgbox "No available addons to add" 0 0 
+          NEXT="e"
           continue
         fi
         dialog --backtitle "`backtitle`" --menu "Select an addon" 0 0 0 \
@@ -237,6 +298,30 @@ function addonMenu() {
         dialog --backtitle "`backtitle`" --title "Available addons" \
           --colors --msgbox "${MSG}" 0 0
         ;;
+      o)
+        TEXT="please enter the complete URL to download.\n"
+        dialog --backtitle "`backtitle`" --aspect 18 --colors --inputbox "${TEXT}" 0 0 \
+          2>${TMP_PATH}/resp
+        [ $? -ne 0 ] && continue
+        URL="`<"${TMP_PATH}/resp"`"
+        [ -z "${URL}" ] && continue
+        clear
+        echo "Downloading ${URL}"
+        STATUS=`curl --insecure -w "%{http_code}" -L "${URL}" -o "${TMP_PATH}/addon.tgz" --progress-bar`
+        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
+        fi
+        ADDON="`untarAddon "${TMP_PATH}/addon.tgz"`"
+        if [ -n "${ADDON}" ]; then
+          dialog --backtitle "`backtitle`" --title "Success" --aspect 18 \
+            --msgbox "Addon '${ADDON}' added to loader" 0 0
+        else
+          dialog --backtitle "`backtitle`" --title "Invalid addon" --aspect 18 \
+            --msgbox "File format not recognized!" 0 0
+        fi
+        ;;
       e) return ;;
     esac
   done
@@ -249,12 +334,13 @@ 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 "d \"Delete cmdline item(s)\""                           >> "${TMP_PATH}/menu"
-  echo "s \"Show user cmdline\""                               >> "${TMP_PATH}/menu"
+  echo "c \"Define a custom MAC\""                              >> "${TMP_PATH}/menu"
-  echo "m \"Show model/build cmdline\""                        >> "${TMP_PATH}/menu"
+  echo "s \"Show user cmdline\""                                >> "${TMP_PATH}/menu"
-  echo "u \"Show SATA(s) # ports and drives\""                 >> "${TMP_PATH}/menu"
+  echo "m \"Show model/build cmdline\""                         >> "${TMP_PATH}/menu"
-  echo "e \"Exit\""                                            >> "${TMP_PATH}/menu"
+  echo "u \"Show SATA(s) # ports and drives\""                  >> "${TMP_PATH}/menu"
+  echo "e \"Exit\""                                             >> "${TMP_PATH}/menu"
   # Loop menu
   while true; do
     dialog --backtitle "`backtitle`" --menu "Choose a option" 0 0 0 \
@@ -283,7 +369,7 @@ function cmdlineMenu() {
         fi
         ITEMS=""
         for I in "${!CMDLINE[@]}"; do
-          ITEMS+="${I} ${CMDLINE[${I}]} off "
+          [ -z "${CMDLINE[${I}]}" ] && ITEMS+="${I} \"\" off " || ITEMS+="${I} ${CMDLINE[${I}]} off "
         done
         dialog --backtitle "`backtitle`" \
           --checklist "Select cmdline to remove" 0 0 0 ${ITEMS} \
@@ -296,6 +382,29 @@ function cmdlineMenu() {
           deleteConfigKey "cmdline.${I}" "${USER_CONFIG_FILE}"
         done
         ;;
+      c)
+        while true; do
+          dialog --backtitle "`backtitle`" --title "User cmdline" \
+            --inputbox "Type a custom MAC address" 0 0 "${CMDLINE['mac1']}"\
+            2>${TMP_PATH}/resp
+          [ $? -ne 0 ] && break
+          MAC="`<"${TMP_PATH}/resp"`"
+          [ -z "${MAC}" ] && MAC="`readConfigKey "original-mac" "${USER_CONFIG_FILE}"`"
+          MAC1="`echo "${MAC}" | sed 's/://g'`"
+          [ ${#MAC1} -eq 12 ] && break
+          dialog --backtitle "`backtitle`" --title "User cmdline" --msgbox "Invalid MAC" 0 0
+        done
+        CMDLINE["mac1"]="${MAC1}"
+        CMDLINE["netif_num"]=1
+        writeConfigKey "cmdline.mac1"      "${MAC1}" "${USER_CONFIG_FILE}"
+        writeConfigKey "cmdline.netif_num" "1"       "${USER_CONFIG_FILE}"
+        MAC="${MAC1:0:2}:${MAC1:2:2}:${MAC1:4:2}:${MAC1:6:2}:${MAC1:8:2}:${MAC1:10:2}"
+        ip link set dev eth0 address ${MAC} 2>&1 | dialog --backtitle "`backtitle`" \
+          --title "User cmdline" --progressbox "Changing mac" 20 70
+        /etc/init.d/S41dhcpcd restart 2>&1 | dialog --backtitle "`backtitle`" \
+          --title "User cmdline" --progressbox "Renewing IP" 20 70
+        IP=`ip route get 1.1.1.1 2>/dev/null | awk '{print$7}'`
+        ;;
       s)
         ITEMS=""
         for KEY in ${!CMDLINE[@]}; do
@@ -356,13 +465,12 @@ 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"
   fi
-  echo "s \"Show user synoinfo\""         >> "${TMP_PATH}/menu"
+  echo "s \"Show synoinfo entries\""      >> "${TMP_PATH}/menu"
-  echo "m \"Show model/build synoinfo\""  >> "${TMP_PATH}/menu"
   echo "e \"Exit\""                       >> "${TMP_PATH}/menu"
 
   # menu loop
@@ -372,13 +480,14 @@ function synoinfoMenu() {
     [ $? -ne 0 ] && return
     case "`<${TMP_PATH}/resp`" in
       a)
-        dialog --backtitle "`backtitle`" --title "User synoinfo" \
+        dialog --backtitle "`backtitle`" --title "Synoinfo entries" \
-          --inputbox "Type a name of synoinfo variable" 0 0 \
+          --inputbox "Type a name of synoinfo entry" 0 0 \
           2>${TMP_PATH}/resp
         [ $? -ne 0 ] && continue
-        NAME="`sed 's/://g' <"${TMP_PATH}/resp"`"
+        NAME="`<"${TMP_PATH}/resp"`"
-        dialog --backtitle "`backtitle`" --title "User synoinfo" \
+        [ -z "${NAME}" ] && continue
-          --inputbox "Type a value of '${NAME}' variable" 0 0 "${SYNOINFO[${NAME}]}" \
+        dialog --backtitle "`backtitle`" --title "Synoinfo entries" \
+          --inputbox "Type a value of '${NAME}' entry" 0 0 "${SYNOINFO[${NAME}]}" \
           2>${TMP_PATH}/resp
         [ $? -ne 0 ] && continue
         VALUE="`<"${TMP_PATH}/resp"`"
@@ -388,15 +497,15 @@ function synoinfoMenu() {
         ;;
       d)
         if [ ${#SYNOINFO[@]} -eq 0 ]; then
-          dialog --backtitle "`backtitle`" --msgbox "No user synoinfo to remove" 0 0 
+          dialog --backtitle "`backtitle`" --msgbox "No synoinfo entries to remove" 0 0 
           continue
         fi
         ITEMS=""
         for I in "${!SYNOINFO[@]}"; do
-          ITEMS+="${I} ${SYNOINFO[${I}]} off "
+          [ -z "${SYNOINFO[${I}]}" ] && ITEMS+="${I} \"\" off " || ITEMS+="${I} ${SYNOINFO[${I}]} off "
         done
         dialog --backtitle "`backtitle`" \
-          --checklist "Select synoinfo to remove" 0 0 0 ${ITEMS} \
+          --checklist "Select synoinfo entry to remove" 0 0 0 ${ITEMS} \
           2>"${TMP_PATH}/resp"
         [ $? -ne 0 ] && continue
         RESP=`<"${TMP_PATH}/resp"`
@@ -421,15 +530,7 @@ function synoinfoMenu() {
         for KEY in ${!SYNOINFO[@]}; do
           ITEMS+="${KEY}: ${SYNOINFO[$KEY]}\n"
         done
-        dialog --backtitle "`backtitle`" --title "User synoinfo" \
+        dialog --backtitle "`backtitle`" --title "Synoinfo entries" \
-          --aspect 18 --msgbox "${ITEMS}" 0 0
-        ;;
-      m)
-        ITEMS=""
-        while IFS="=" read KEY VALUE; do
-          ITEMS+="${KEY}: ${VALUE}\n"
-        done < <(readModelMap "${MODEL}" "builds.${BUILD}.synoinfo")
-        dialog --backtitle "`backtitle`" --title "Model/build synoinfo" \
           --aspect 18 --msgbox "${ITEMS}" 0 0
         ;;
       e) return ;;
@@ -445,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
@@ -508,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
@@ -516,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
@@ -583,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"`"
@@ -627,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
 }
 
 ###############################################################################
@@ -663,26 +935,46 @@ 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() {
+  dialog --backtitle "`backtitle`" --default-item "${LAYOUT}" --no-items \
+    --menu "Choose a layout" 0 0 0 "azerty" "bepo" "carpalx" "colemak" \
+    "dvorak" "fgGIod" "neo" "olpc" "qwerty" "qwertz" \
+    2>${TMP_PATH}/resp
+  [ $? -ne 0 ] && return
+  LAYOUT="`<${TMP_PATH}/resp`"
   OPTIONS=""
   while read KM; do
     OPTIONS+="${KM::-7} "
-  done < <(cd /usr/share/keymaps/i386/qwerty; ls *.map.gz)
+  done < <(cd /usr/share/keymaps/i386/${LAYOUT}; ls *.map.gz)
-  dialog --backtitle "`backtitle`" --no-items \
+  dialog --backtitle "`backtitle`" --no-items --default-item "${KEYMAP}" \
     --menu "Choice a keymap" 0 0 0 ${OPTIONS} \
     2>/tmp/resp
   [ $? -ne 0 ] && return
   resp=`cat /tmp/resp 2>/dev/null`
   [ -z "${resp}" ] && return
   KEYMAP=${resp}
+  writeConfigKey "layout" "${LAYOUT}" "${USER_CONFIG_FILE}"
   writeConfigKey "keymap" "${KEYMAP}" "${USER_CONFIG_FILE}"
-  zcat /usr/share/keymaps/i386/qwerty/${KEYMAP}.map.gz | loadkeys
+  loadkeys /usr/share/keymaps/i386/${LAYOUT}/${KEYMAP}.map.gz
 }
 
 ###############################################################################
 function updateMenu() {
+  PLATFORM="`readModelKey "${MODEL}" "platform"`"
+  KVER="`readModelKey "${MODEL}" "builds.${BUILD}.kver"`"
   while true; do
     dialog --backtitle "`backtitle`" --menu "Choose a option" 0 0 0 \
       a "Update arpl" \
@@ -710,26 +1002,48 @@ 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 /mnt/p1/bzImage-arpl
+        # Process update-list.yml
-        mv /tmp/rootfs.cpio.xz /mnt/p1/initrd-arpl
+        while read F; do
+          [ -f "${F}" ] && rm -f "${F}"
+          [ -d "${F}" ] && rm -Rf "${F}"
+        done < <(readConfigArray "remove" "/tmp/update-list.yml")
+        while IFS="=" read KEY VALUE; do
+          if [ "${KEY: -1}" = "/" ]; then
+            rm -Rf "${VALUE}"
+            mkdir -p "${VALUE}"
+            gzip -dc "/tmp/`basename "${KEY}"`.tgz" | tar xf - -C "${VALUE}"
+          else
+            mkdir -p "`dirname "${VALUE}"`"
+            mv "/tmp/`basename "${KEY}"`" "${VALUE}"
+          fi
+        done < <(readConfigMap "replace" "/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
         ;;
 
@@ -744,8 +1058,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
@@ -757,13 +1071,14 @@ 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
-        DEST_PATH="/mnt/p3/addons"
+        rm -Rf "${ADDONS_PATH}/"*
         for PKG in `ls /tmp/addons/*.addon`; do
           ADDON=`basename ${PKG} | sed 's|.addon||'`
-          rm -rf "${DEST_PATH}/${ADDON}"
+          rm -rf "${ADDONS_PATH}/${ADDON}"
-          mkdir -p "${DEST_PATH}/${ADDON}"
+          mkdir -p "${ADDONS_PATH}/${ADDON}"
-          tar xaf "${PKG}" -C "${DEST_PATH}/${ADDON}" >/dev/null 2>&1
+          tar xaf "${PKG}" -C "${ADDONS_PATH}/${ADDON}" >/dev/null 2>&1
         done
+        DIRTY=1
         dialog --backtitle "`backtitle`" --title "Update addons" --aspect 18 \
           --msgbox "Addons updated with success!" 0 0
         ;;
@@ -779,8 +1094,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
@@ -789,6 +1104,7 @@ function updateMenu() {
           --infobox "Extracting last version" 0 0
         rm -rf "${LKM_PATH}/"*
         unzip /tmp/rp-lkms.zip -d "${LKM_PATH}" >/dev/null 2>&1
+        DIRTY=1
         dialog --backtitle "`backtitle`" --title "Update LKMs" --aspect 18 \
           --msgbox "LKMs updated with success!" 0 0
         ;;
@@ -816,8 +1132,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
@@ -825,6 +1141,14 @@ function updateMenu() {
           rm "${MODULES_PATH}/${P}.tgz"
           mv "/tmp/${P}.tgz" "${MODULES_PATH}/${P}.tgz"
         done
+        # Rebuild modules if model/buildnumber is selected
+        if [ -n "${PLATFORM}" -a -n "${KVER}" ]; then
+          writeConfigKey "modules" "{}" "${USER_CONFIG_FILE}"
+          while read ID DESC; do
+            writeConfigKey "modules.${ID}" "" "${USER_CONFIG_FILE}"
+          done < <(getAllModules "${PLATFORM}" "${KVER}")
+        fi
+        DIRTY=1
         dialog --backtitle "`backtitle`" --title "Update Modules" --aspect 18 \
           --msgbox "Modules updated with success!" 0 0
         ;;
@@ -836,6 +1160,10 @@ function updateMenu() {
 ###############################################################################
 ###############################################################################
 
+if [ "x$1" = "xb" -a -n "${MODEL}" -a -n "${BUILD}" -a loaderIsConfigured ]; then
+  make
+  boot && exit 0 || sleep 5
+fi
 # Main loop
 NEXT="m"
 while true; do
@@ -847,17 +1175,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
@@ -867,14 +1203,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 ;;
+    b) boot && exit 0 || sleep 5 ;;
-    u) editUserConfig; NEXT="u" ;;
     k) keymapMenu ;;
     c) dialog --backtitle "`backtitle`" --title "Cleaning" --aspect 18 \
       --prgbox "rm -rfv \"${CACHE_PATH}/dl\"" 0 0 ;;
@@ -884,4 +1216,3 @@ while true; do
 done
 clear
 echo -e "Call \033[1;32mmenu.sh\033[0m to return to menu"
-

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

@@ -0,0 +1,88 @@
+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"
+  #supportraidgroup: "no"
+cmdline: &cmdline
+  intel_iommu: igfx_off
+  HddEnableDynamicPower: 1
+  vender_format_version: 2
+  synoboot2:
+  syno_ttyS0: "serial,0x3f8"
+  syno_ttyS1: "serial,0x2f8"
+  elevator: elevator
+platform: "geminilake"
+unique: "synology_geminilake_1520+"
+beta: true
+dom: 2
+serial:
+  prefix:
+    - "2060"
+  middle: "RYR"
+  suffix: "alpha"
+disks: 6
+dt: true
+builds:
+  42218:
+    ver: "7.0.1"
+    kver: "4.4.180"
+    rd-compressed: false
+    cmdline:
+      <<: *cmdline
+    synoinfo:
+      <<: *synoinfo
+    pat:
+      url: "https://global.download.synology.com/download/DSM/release/7.0.1/42218/DSM_DS1520%2B_42218.pat"
+      hash: "06947c58f25bd591f7fa3c58ad9473777481bdd7a049b42d1cb585ca01b053ee"
+      ramdisk-hash: "f0a275587c51acdb4d58a7f0d82d70f31e54228d0fbf7575d5d425dae75d1969"
+      zimage-hash: "74d513aaa3e30d8aa4f80e202d94a68a552e9c0472f8470e133ad29080556f55"
+      md5-hash: "f56200a8be1aed4eb287a51b373adb1f"
+    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
+    cmdline:
+      <<: *cmdline
+    synoinfo:
+      <<: *synoinfo
+    pat:
+      url: "https://global.download.synology.com/download/DSM/release/7.1/42661-1/DSM_DS1520%2B_42661.pat"
+      hash: "3a8499c5f72d7241b81781ec741d4019eaa506e6e7a4fd17ce54fb149f6ffae6"
+      ramdisk-hash: "b18f14b8420a217d7b6dd3696786ecccfbe7c325d342475531a68a7df831cffc"
+      zimage-hash: "1d0e5b76e08e3483f6bf06d23b5978ec498b855bde23db1f96f343db4c43337d"
+      md5-hash: "1d8ecfcb2a956488ae355c79a72bb9ec"
+    patch:
+      - "ramdisk-common-disable-root-pwd.patch"
+      - "ramdisk-common-init-script.patch"
+      - "ramdisk-common-etc-rc.patch"
+      - "ramdisk-42661-post-init-script.patch"
+
+  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_DS1520%2B_42962.pat"
+      hash: "f19d2ac39fae564797c148929b8fe7c9740ac3a74099bf573b68df8fe0228cb3"
+      ramdisk-hash: "aad75938d165ef5efdbfc4c570c4cd1cc252344d0756dd3d89a44f581aa6be6f"
+      zimage-hash: "89ee173272101e6714728e73930d8b31a414f9f1eca8ab78f45c12fc721138ab"
+      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,15 +2,11 @@ id: "DS1621+"
 synoinfo: &synoinfo
   support_disk_compatibility: "no"
   support_memory_compatibility: "no"
-  rss_server: "http://example.com/null.xml"
+  support_led_brightness_adjustment: "no"
-  rss_server_ssl: "https://example.com/null.xml"
+  rss_server: "https://raw.githubusercontent.com/fbelavenuto/arpl/main/rss.xml"
-  rss_server_v2: "https://example.com/autoupdate/v2/getList"
+  rss_server_ssl: "https://raw.githubusercontent.com/fbelavenuto/arpl/main/rss.xml"
-  update_server: "http://example.com/"
+  rss_server_v2: "https://raw.githubusercontent.com/fbelavenuto/arpl/main/rss.json"
-  update_server_ssl: "https://example.com/"
+  #supportraidgroup: "no"
-  small_info_path: "https://example.com/null"
-  updateurl: "http://example.com/"
-  myds_region_api_base_url: "https://example.com"
-  security_version_server: "https://example.com/smallupdate"
 cmdline: &cmdline
   SMBusHddDynamicPower: 1
   syno_hdd_powerup_seq: 0
@@ -21,7 +17,9 @@ cmdline: &cmdline
   synoboot2:
   syno_ttyS0: "serial,0x3f8"
   syno_ttyS1: "serial,0x2f8"
+  elevator: elevator
 platform: "v1000"
+unique: "synology_v1000_1621+"
 dom: 2
 serial:
   prefix:
@@ -35,7 +33,6 @@ builds:
     ver: "7.0.1"
     kver: "4.4.180"
     rd-compressed: false
-    efi-bug: no
     cmdline:
       <<: *cmdline
     synoinfo:
@@ -45,16 +42,17 @@ builds:
       hash: "19f56827ba8bf0397d42cd1d6f83c447f092c2c1bbb70d8a2ad3fbd427e866df"
       ramdisk-hash: "73512c7bceb34cf7f7f93c2703db60496da0e27274fc45e5aefa0366c9734d6e"
       zimage-hash: "f4648d0dd6b29ef6149b0ff46afe1fe32f81730aa79af72f37ffd3647c76f586"
+      md5-hash: "f82cbabbfef3fdf2cba45da77d14959b"
     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,7 +62,29 @@ builds:
       hash: "381077302a89398a9fb5ec516217578d6f33b0219fe95135e80fd93cddbf88c4"
       ramdisk-hash: "8fd5eb40fb088af97d3beee85b6275c2ceb368b08453eb5a5d00d42cc7d578d1"
       zimage-hash: "d939b5937be00a644aae64c33633619a7c310433e60a515c77bbef00b0a7e6b6"
+      md5-hash: "b4b72eb8d4e84b2e2a8c29fc0a1ac6aa"
     patch:
       - "ramdisk-common-disable-root-pwd.patch"
       - "ramdisk-common-init-script.patch"
+      - "ramdisk-common-etc-rc.patch"
       - "ramdisk-42661-post-init-script.patch"
+
+  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_DS1621%2B_42962.pat"
+      hash: "bd88dfdf1eccdf7fefcdac67e11929818ae3aea938fd13286c1ac7b5aaa3964f"
+      ramdisk-hash: "7a900e3017b4ee09b792d2ed291b7229476ae3e583fe559bbd9baaa812705aa0"
+      zimage-hash: "b0f296aad0cc3b8adba13483f89770d0a4daf9b9cab335910717448b1eaa8254"
+      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

@@ -2,15 +2,12 @@ id: "DS2422+"
 synoinfo: &synoinfo
   support_disk_compatibility: "no"
   support_memory_compatibility: "no"
-  rss_server: "http://example.com/null.xml"
+  supportssdcache: "no"
-  rss_server_ssl: "https://example.com/null.xml"
+  support_led_brightness_adjustment: "no"
-  rss_server_v2: "https://example.com/autoupdate/v2/getList"
+  rss_server: "https://raw.githubusercontent.com/fbelavenuto/arpl/main/rss.xml"
-  update_server: "http://example.com/"
+  rss_server_ssl: "https://raw.githubusercontent.com/fbelavenuto/arpl/main/rss.xml"
-  update_server_ssl: "https://example.com/"
+  rss_server_v2: "https://raw.githubusercontent.com/fbelavenuto/arpl/main/rss.json"
-  small_info_path: "https://example.com/null"
+  #supportraidgroup: "no"
-  updateurl: "http://example.com/"
-  myds_region_api_base_url: "https://example.com"
-  security_version_server: "https://example.com/smallupdate"
 cmdline: &cmdline
   SMBusHddDynamicPower: 1
   vender_format_version: 2
@@ -19,12 +16,15 @@ cmdline: &cmdline
   synoboot2:
   syno_ttyS0: "serial,0x3f8"
   syno_ttyS1: "serial,0x2f8"
+  elevator: elevator
 platform: "v1000"
+unique: "synology_v1000_2422+"
 dom: 2
 serial:
   prefix:
-    - "0000"
+    - "2140"
-  middle: "XXX"
+    - "2180"
+  middle: "SLR"
   suffix: "numeric"
 disks: 12
 dt: true
@@ -33,7 +33,6 @@ builds:
     ver: "7.0.1"
     kver: "4.4.180"
     rd-compressed: false
-    efi-bug: no
     cmdline:
       <<: *cmdline
     synoinfo:
@@ -43,7 +42,48 @@ builds:
       hash: "415c54934d483a2557500bc3a2e74588a0cec1266e1f0d9a82a7d3aace002471"
       ramdisk-hash: "2b5b8dd90b2e6020ffccc2719d8bc16d9935421754a8c088d6b31dbca4e4ff7b"
       zimage-hash: "38281a90036fffcb41cd17f05a6c7e9a1d5740a78c135980fb0c3a6d0ca1485f"
+      md5-hash: "9293156f98e642c181aed63b0b3df4c8"
     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
+    cmdline:
+      <<: *cmdline
+    synoinfo:
+      <<: *synoinfo
+    pat:
+      url: "https://global.download.synology.com/download/DSM/release/7.1/42661-1/DSM_DS2422%2B_42661.pat"
+      hash: "c38fee0470c592b679ab52a64eac76b2a3912fb2e6aba65a65abb5aa05a98d4c"
+      ramdisk-hash: "bb109132e96b1e26d5e3d44557944f7518168d8cb18e35d6254c0dfe7fb19382"
+      zimage-hash: "d939b5937be00a644aae64c33633619a7c310433e60a515c77bbef00b0a7e6b6"
+      md5-hash: "9ea5e0fe94c01072da36e2f69172abb3"
+    patch:
+      - "ramdisk-common-disable-root-pwd.patch"
+      - "ramdisk-common-init-script.patch"
+      - "ramdisk-common-etc-rc.patch"
+      - "ramdisk-42661-post-init-script.patch"
+
+  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_DS2422%2B_42962.pat"
+      hash: "a887cc3f06e2b51d34f682a1a812637486aeefbef57c309414f69c3e5514edef"
+      ramdisk-hash: "edcf0e07e2773326d7f6c2f17a0c2d18e8ef4600a720bbdd4965fc1f11eb21e9"
+      zimage-hash: "b0f296aad0cc3b8adba13483f89770d0a4daf9b9cab335910717448b1eaa8254"
+      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

@@ -1,19 +1,23 @@
 id: "DS3615xs"
 synoinfo: &synoinfo
+  support_disk_compatibility: "no"
+  support_memory_compatibility: "no"
+  supportssdcache: "no"
   esataportcfg: "0x0"
   usbportcfg: "0x8700"
-  rss_server: "http://example.com/null.xml"
+  support_led_brightness_adjustment: "no"
-  rss_server_ssl: "https://example.com/null.xml"
+  rss_server: "https://raw.githubusercontent.com/fbelavenuto/arpl/main/rss.xml"
-  small_info_path: "https://example.com/null"
+  rss_server_ssl: "https://raw.githubusercontent.com/fbelavenuto/arpl/main/rss.xml"
-  updateurl: "http://example.com/"
+  #supportraidgroup: "no"
-  myds_region_api_base_url: "https://example.com"
 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:
   prefix:
     - "1130"
@@ -29,7 +33,6 @@ builds:
     ver: "7.0.1"
     kver: "3.10.108"
     rd-compressed: false
-    efi-bug: yes
     cmdline:
       <<: *cmdline
     synoinfo:
@@ -39,9 +42,11 @@ builds:
       hash: "dddd26891815ddca02d0d53c1d42e8b39058b398a4cc7b49b80c99f851cf0ef7"
       ramdisk-hash: "4c90c3c7ee25b5fcc651552e80a9364d22823c863c834c5f43e3344a3a68af78"
       zimage-hash: "d29b695612710376734cb5c5b5ae4f2d8afc49ffd640387e1c86010f6c7d2c8a"
+      md5-hash: "ea1c30f644bacae2e0b1ef914bc663db"
     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"
 
@@ -49,7 +54,6 @@ builds:
     ver: "7.1.0"
     kver: "3.10.108"
     rd-compressed: false
-    efi-bug: yes
     cmdline:
       <<: *cmdline
     synoinfo:
@@ -59,8 +63,31 @@ builds:
       hash: "1e95d8c63981bcf42ea2eaedfbc7acc4248ff16d129344453b7479953f9ad145"
       ramdisk-hash: "8ee5df65bcfd25c3d1999262153dcff625714d98789bc8065e217773f8d070d8"
       zimage-hash: "3017542c92232cb5477b0e11d82d708a9909320350b1740aab58359e85f82351"
+      md5-hash: "271b34cb2a0c23d63178aef3bf45a6ae"
     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"
+
+  42962:
+    ver: "7.1.1"
+    kver: "3.10.108"
+    rd-compressed: false
+    cmdline:
+      <<: *cmdline
+    synoinfo:
+      <<: *synoinfo
+    pat:
+      url: "https://global.download.synology.com/download/DSM/release/7.1.1/42962/DSM_DS3615xs_42962.pat"
+      hash: "b79c129354c203b7340010573d16b2d6ebc6a676c946579a959c891a70b8bcfc"
+      ramdisk-hash: "e4bdca874027b603a18d7b44cc312f3eb6d6cbf2e49329ef51753fc322d880c0"
+      zimage-hash: "b7d2ca699195a1990f838690be32a65158d4ed01e8126af2ddb27a0f08e177ca"
+      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

@@ -1,23 +1,23 @@
 id: "DS3617xs"
 synoinfo: &synoinfo
+  support_disk_compatibility: "no"
+  support_memory_compatibility: "no"
+  supportssdcache: "no"
   esataportcfg: "0x00"
   usbportcfg: "0x8700"
-  rss_server: "http://example.com/null.xml"
+  support_led_brightness_adjustment: "no"
-  rss_server_v2: "https://example.com/autoupdate/v2/getList"
+  rss_server: "https://raw.githubusercontent.com/fbelavenuto/arpl/main/rss.xml"
-  rss_server_ssl: "https://example.com/null.xml"
+  rss_server_ssl: "https://raw.githubusercontent.com/fbelavenuto/arpl/main/rss.xml"
-  update_server: "http://example.com/"
+  #supportraidgroup: "no"
-  update_server_ssl: "https://example.com/"
-  small_info_path: "https://example.com/null"
-  updateurl: "http://example.com/"
-  myds_region_api_base_url: "https://example.com"
-  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
 serial:
   prefix:
@@ -33,7 +33,6 @@ builds:
     ver: "7.0.1"
     kver: "4.4.180"
     rd-compressed: false
-    efi-bug: no
     cmdline:
       <<: *cmdline
     synoinfo:
@@ -43,9 +42,11 @@ builds:
       hash: "d65ee4ed5971e38f6cdab00e1548183435b53ba49a5dca7eaed6f56be939dcd2"
       ramdisk-hash: "1b2e86fbf4006f6aa40dcd674ad449feed8b0b8317a71e2bb8bb986a74e08c57"
       zimage-hash: "28a75e0b680517d39374260eb981b8ca9ace8810b121a30b8036fa09cfcb77fc"
+      md5-hash: "8972088c38acd07aa92a8b573a1b7bc3"
     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: "4.4.180"
     rd-compressed: false
-    efi-bug: no
     cmdline:
       <<: *cmdline
     synoinfo:
@@ -63,8 +63,31 @@ builds:
       hash: "0a5a243109098587569ab4153923f30025419740fb07d0ea856b06917247ab5c"
       ramdisk-hash: "da3c2a170fea24052d817cbc4bb5b610a5b05288758d746b60a294ed614239fb"
       zimage-hash: "9598f66b75e5b303e571241696e02fe7c0add80f13564f8c6b8c0daaf3cb3018"
+      md5-hash: "94e6263912bc758ee3db81c62a94a8f6"
     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"
+
+  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_DS3617xs_42962.pat"
+      hash: "2a556206201df10245dbcf4cf0366b2f32cb318cd705fbdd74412303d85e7267"
+      ramdisk-hash: "c8d067a9737d67453e0b476d7115c3e12b2daf2450c371c19e44e480a1076a94"
+      zimage-hash: "8e6da6c3c9259d23ee5cae3c71691a75b0a281551d19cb75041df469c7524e72"
+      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

@@ -1,27 +1,24 @@
 id: "DS3622xs+"
 synoinfo: &synoinfo
-  esataportcfg: "0x00"
-  support_bde_internal_10g: "no"
   support_disk_compatibility: "no"
   support_memory_compatibility: "no"
-  supportraidgroup: "no"
+  esataportcfg: "0x00"
-  supportssdcache: "no"
+  support_bde_internal_10g: "no"
-  rss_server: "http://example.com/null.xml"
+  support_oob_ctl: "no"
-  rss_server_ssl: "https://example.com/null.xml"
+  support_led_brightness_adjustment: "no"
-  rss_server_v2: "https://example.com/autoupdate/v2/getList"
+  rss_server: "https://raw.githubusercontent.com/fbelavenuto/arpl/main/rss.xml"     # http://update7.synology.com/autoupdate/genRSS.php
-  update_server: "http://example.com/"
+  rss_server_ssl: "https://raw.githubusercontent.com/fbelavenuto/arpl/main/rss.xml" # https://update7.synology.com/autoupdate/genRSS.php
-  update_server_ssl: "https://example.com/"
+  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"
+  #supportraidgroup: "no"
-  updateurl: "http://example.com/"
-  myds_region_api_base_url: "https://example.com"
-  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: "broadwellnk"
+unique: "synology_broadwellnk_3622xs+"
 dom: 1
 serial:
   prefix:
@@ -37,7 +34,6 @@ builds:
     ver: "7.0.1"
     kver: "4.4.180"
     rd-compressed: false
-    efi-bug: no
     cmdline:
       <<: *cmdline
     synoinfo:
@@ -47,9 +43,11 @@ builds:
       hash: "f38329b8cdc5824a8f01fb1e377d3b1b6bd23da365142a01e2158beff5b8a424"
       ramdisk-hash: "a95d4ab06189460f3b3d13a33e421887b5f3ea09a10535ae0d4c92beb7ff631d"
       zimage-hash: "06964b68e5ccdedd4363dff3986f99686d3c9cb5225e8e4c3d840a1d9cd1330b"
+      md5-hash: "bc0235e45a8423f4c46dc0d9699759b5"
     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 +55,6 @@ builds:
     ver: "7.1.0"
     kver: "4.4.180"
     rd-compressed: false
-    efi-bug: no
     cmdline:
       <<: *cmdline
     synoinfo:
@@ -67,8 +64,31 @@ builds:
       hash: "53d0a4f1667288b6e890c4fdc48422557ff26ea8a2caede0955c5f45b560cccd"
       ramdisk-hash: "df8a055d6bc901229f0ba53ed5b4fe024bdf9a1b42f0c32483adefcdac14db4d"
       zimage-hash: "e073dd84054f652811e0ae1932af2c7cdbd5fb6e5f18f265097072b8af4605e8"
+      md5-hash: "7af76cca8226ecf95b25630bffa76b3d"
     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"
+
+  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_DS3622xs%2B_42962.pat"
+      hash: "b48aadaba7ff561b7d55aa9ed75f1f2f4c49c0c2f73ece4020f3ffd08f6bbfd0"
+      ramdisk-hash: "432f315818adad4e1ca54040557e164caf2937004e2d009aac8865391353e2f6"
+      zimage-hash: "8903dc99f7201c8656de618d767c05f91bfd32edd9a3706a50fd223237842bf2"
+      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

@@ -1,25 +1,25 @@
 id: "DS918+"
 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: "http://example.com/null.xml"
+  rss_server: "https://raw.githubusercontent.com/fbelavenuto/arpl/main/rss.xml"
-  rss_server_ssl: "https://example.com/null.xml"
+  rss_server_ssl: "https://raw.githubusercontent.com/fbelavenuto/arpl/main/rss.xml"
-  rss_server_v2: "https://example.com/autoupdate/v2/getList"
+  rss_server_v2: "https://raw.githubusercontent.com/fbelavenuto/arpl/main/rss.json"
-  update_server: "http://example.com/"
+  #support_ssd_cache: "yes"
-  update_server_ssl: "https://example.com/"
+  #supportraidgroup: "no"
-  small_info_path: "https://example.com/null"
-  updateurl: "http://example.com/"
-  myds_region_api_base_url: "https://example.com"
-  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
 serial:
   prefix:
@@ -37,7 +37,6 @@ builds:
     ver: "7.0.1"
     kver: "4.4.180"
     rd-compressed: false
-    efi-bug: no
     cmdline:
       <<: *cmdline
     synoinfo:
@@ -47,9 +46,11 @@ builds:
       hash: "a403809ab2cd476c944fdfa18cae2c2833e4af36230fa63f0cdee31a92bebba2"
       ramdisk-hash: "4b7a7a271a3b2158d9193a4f0e75c59590949ad7b4e26d546f46cc2ee8504d51"
       zimage-hash: "338ba514066da01d0c1f770418916b9b96f5355d88a7b55b398d2726db591fdb"
+      md5-hash: "71c028f92497e4722998e4208fe75774"
     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 +58,6 @@ builds:
     ver: "7.1.0"
     kver: "4.4.180"
     rd-compressed: false
-    efi-bug: no
     cmdline:
       <<: *cmdline
     synoinfo:
@@ -67,8 +67,31 @@ builds:
       hash: "4e8a9d82a8a1fde5af9a934391080b7bf6b91811d9583acb73b90fb6577e22d7"
       ramdisk-hash: "ef8c87b6e68226339e5623d048252f5be3089c0831e41298a4695f2bfa65f00e"
       zimage-hash: "9ce0d3452f08afaf95d52292ff20cbac6d69e17d5b9953377e4ac90c9ac7397d"
+      md5-hash: "2c49260d2646a0944b56933f7d4029fb"
     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"
+
+  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_DS918%2B_42962.pat"
+      hash: "c1ffb1b48301fbcf1ccffae00062e95c8b5b18d50a70c3fbb79ea12a38a39bb7"
+      ramdisk-hash: "6ac446bddba53b1c215e0abbf05236371e5e3b91ab0c4c193a0999cc8b8a857b"
+      zimage-hash: "12afcd27e15ba5e4596e1af7275d9462d31c7d8afb32aa723f7b8b7cfa5a19a2"
+      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

@@ -1,14 +1,12 @@
 id: "DS920+"
 synoinfo: &synoinfo
-  rss_server: "http://example.com/null.xml"
+  support_disk_compatibility: "no"
-  rss_server_ssl: "https://example.com/null.xml"
+  support_memory_compatibility: "no"
-  rss_server_v2: "https://example.com/autoupdate/v2/getList"
+  support_led_brightness_adjustment: "no"
-  update_server: "http://example.com/"
+  rss_server: "https://raw.githubusercontent.com/fbelavenuto/arpl/main/rss.xml"
-  update_server_ssl: "https://example.com/"
+  rss_server_ssl: "https://raw.githubusercontent.com/fbelavenuto/arpl/main/rss.xml"
-  small_info_path: "https://example.com/null"
+  rss_server_v2: "https://raw.githubusercontent.com/fbelavenuto/arpl/main/rss.json"
-  updateurl: "http://example.com/"
+  #supportraidgroup: "no"
-  myds_region_api_base_url: "https://example.com"
-  security_version_server: "https://example.com/smallupdate"
 cmdline: &cmdline
   intel_iommu: "igfx_off"
   HddEnableDynamicPower: 1
@@ -16,7 +14,9 @@ cmdline: &cmdline
   syno_ttyS0: "serial,0x3f8"
   syno_ttyS1: "serial,0x2f8"
   vender_format_version: 2
+  elevator: elevator
 platform: "geminilake"
+unique: "synology_geminilake_920+"
 dom: 2
 dt: true
 serial:
@@ -33,7 +33,6 @@ builds:
     ver: "7.0.1"
     kver: "4.4.180"
     rd-compressed: false
-    efi-bug: no
     cmdline:
       <<: *cmdline
     synoinfo:
@@ -43,16 +42,17 @@ builds:
       hash: "fe2a4648f76adeb65c3230632503ea36bbac64ee88b459eb9bfb5f3b8c8cebb3"
       ramdisk-hash: "f7dd1317f24ec6b9bac839e37f66b59030218c7f97c06f73f1f54ed0f892c4aa"
       zimage-hash: "346b68f662b50f47d3ee6c2bc9de6302e4b60436142c24ee88b620c7afd1ba06"
+      md5-hash: "7764ad4fca0a11ae0ebd7ccd4a49e1aa"
     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:
@@ -62,7 +62,29 @@ builds:
       hash: "8076950fdad2ca58ea9b91a12584b9262830fe627794a0c4fc5861f819095261"
       ramdisk-hash: "c8ad44826c87e065a3b05f354a639c0a86cb2fa47b88e11949604d53f3e80048"
       zimage-hash: "1d0e5b76e08e3483f6bf06d23b5978ec498b855bde23db1f96f343db4c43337d"
+      md5-hash: "fa3936a53299b1a1142e4c614e2b360c"
     patch:
       - "ramdisk-common-disable-root-pwd.patch"
       - "ramdisk-common-init-script.patch"
+      - "ramdisk-common-etc-rc.patch"
       - "ramdisk-42661-post-init-script.patch"
+
+  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_DS920%2B_42962.pat"
+      hash: "90b1bd215b85eb366b3d3b6bef6bb6bef657dd0caba032dae556717b58e44c06"
+      ramdisk-hash: "42053cbfbce34d43c50db2d68786360f644fc88af3e9bbaa6377ffa9953bf158"
+      zimage-hash: "89ee173272101e6714728e73930d8b31a414f9f1eca8ab78f45c12fc721138ab"
+      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,47 @@
+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"
+  #supportraidgroup: "no"
+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:
+    - "2270"
+  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

@@ -1,15 +1,13 @@
 id: "DVA1622"
 synoinfo: &synoinfo
+  support_disk_compatibility: "no"
+  support_memory_compatibility: "no"
   buzzeroffen: "0xffff"
-  rss_server: "http://example.com/null.xml"
+  support_led_brightness_adjustment: "no"
-  rss_server_ssl: "https://example.com/null.xml"
+  rss_server: "https://raw.githubusercontent.com/fbelavenuto/arpl/main/rss.xml"
-  rss_server_v2: "https://example.com/autoupdate/v2/getList"
+  rss_server_ssl: "https://raw.githubusercontent.com/fbelavenuto/arpl/main/rss.xml"
-  update_server: "http://example.com/"
+  rss_server_v2: "https://raw.githubusercontent.com/fbelavenuto/arpl/main/rss.json"
-  update_server_ssl: "https://example.com/"
+  #supportraidgroup: "no"
-  small_info_path: "https://example.com/null"
-  updateurl: "http://example.com/"
-  myds_region_api_base_url: "https://example.com"
-  security_version_server: "https://example.com/smallupdate"
 cmdline: &cmdline
   intel_iommu: "igfx_off"
   HddEnableDynamicPower: 1
@@ -18,7 +16,9 @@ cmdline: &cmdline
   synoboot2:
   syno_ttyS0: "serial,0x3f8"
   syno_ttyS1: "serial,0x2f8"
+  elevator: elevator
 platform: "geminilake"
+unique: "synology_geminilake_dva1622"
 dom: 2
 serial:
   prefix:
@@ -35,7 +35,6 @@ builds:
     ver: "7.1.0"
     kver: "4.4.180"
     rd-compressed: false
-    efi-bug: no
     cmdline:
       <<: *cmdline
     synoinfo:
@@ -45,7 +44,29 @@ builds:
       hash: "f1484cf302627072ca393293cd73e61dc9e09d479ef028b216eae7c12f7b7825"
       ramdisk-hash: "6290945ba61f652aec83725f81f5a47bd5e4cdbeb86241c33825154140e164ec"
       zimage-hash: "1d0e5b76e08e3483f6bf06d23b5978ec498b855bde23db1f96f343db4c43337d"
+      md5-hash: "27515a2e7c2f2113ccf8955bf22f3974"
     patch:
       - "ramdisk-common-disable-root-pwd.patch"
       - "ramdisk-common-init-script.patch"
+      - "ramdisk-common-etc-rc.patch"
       - "ramdisk-42661-post-init-script.patch"
+
+  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_DVA1622_42962.pat"
+      hash: "9106f6bcc52b4bc2b4ce82748788ca353ddecf8b7552e7c6fb477eb4eca42e67"
+      ramdisk-hash: "e610146b475074cb1835c7a2528afd0cba389cfa68b8a3ef20214b48ddca78dc"
+      zimage-hash: "89ee173272101e6714728e73930d8b31a414f9f1eca8ab78f45c12fc721138ab"
+      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

@@ -0,0 +1,96 @@
+id: "DVA3219"
+synoinfo: &synoinfo
+  support_disk_compatibility: "no"
+  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"
+  #supportraidgroup: "no"
+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
+dom: 2
+serial:
+  prefix:
+    - "1930"
+    - "1940"
+  middle: "RFR"
+  suffix: "alpha"
+flags:
+  - "fma"
+disks: 4
+builds:
+  42218:
+    ver: "7.0.1"
+    kver: "4.4.180"
+    rd-compressed: false
+    cmdline:
+      <<: *cmdline
+    synoinfo:
+      <<: *synoinfo
+    pat:
+      url: "https://global.download.synology.com/download/DSM/release/7.0.1/42218/DSM_DVA3219_42218.pat"
+      hash: "3557df23ff6af9bbb0cf46872ba2fc09c344eb303a38e8283dbc9a46e5eae979"
+      ramdisk-hash: "6820f900bf2870660541b83f9741a0b70e05e8871bc41c006c9d688105c97f7c"
+      zimage-hash: "ef97f2d64f3f7f8c5e3f4e8fee613d385d7888826f56e119f1885a722c95c7cc"
+      md5-hash: "40917aaf18d069f862f9536ac5504385"
+    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"
+
+  42661:
+    ver: "7.1.0"
+    kver: "4.4.180"
+    rd-compressed: false
+    cmdline:
+      <<: *cmdline
+    synoinfo:
+      <<: *synoinfo
+    pat:
+      url: "https://global.download.synology.com/download/DSM/release/7.1/42661-1/DSM_DVA3219_42661.pat"
+      hash: "01596eaf7310a56b504fde5743262f721dd0be2836e53d2d74386e14f509bec4"
+      ramdisk-hash: "a62ef4468db4e6c7eab04bb810c603c65e201aebbcc8994423b0c95dd215e4c5"
+      zimage-hash: "5222b5efaf7af28ff3833fd37f13100c30acba1ee201a15b2ee360e66e75b48e"
+      md5-hash: "5c4dea4a45d96e1a6d5bcc041d300079"
+    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"
+
+  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_DVA3219_42962.pat"
+      hash: "f03395fd9db108d2c5a684b6ba9b4fadc6b1ab05c4e227d401572c01ec4b3dca"
+      ramdisk-hash: "8a36c36096dfc9dd5bbd572a6174719c5018fe5d932a4859832025719abac4fc"
+      zimage-hash: "3c67cefc969ee3de51b7978b8d86cd53cbb0e49ec43b2240bf9b8aad3f2e2200"
+      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

@@ -1,24 +1,23 @@
 id: "DVA3221"
 synoinfo: &synoinfo
+  support_disk_compatibility: "no"
+  support_memory_compatibility: "yes"
   esataportcfg: "0x00"
   support_bde_internal_10g: "no"
-  support_disk_compatibility: "no"
+  support_led_brightness_adjustment: "no"
-  rss_server: "http://example.com/null.xml"
+  rss_server: "https://raw.githubusercontent.com/fbelavenuto/arpl/main/rss.xml"
-  rss_server_ssl: "https://example.com/null.xml"
+  rss_server_ssl: "https://raw.githubusercontent.com/fbelavenuto/arpl/main/rss.xml"
-  rss_server_v2: "https://example.com/autoupdate/v2/getList"
+  rss_server_v2: "https://raw.githubusercontent.com/fbelavenuto/arpl/main/rss.json"
-  update_server: "http://example.com/"
+  #supportraidgroup: "no"
-  update_server_ssl: "https://example.com/"
-  small_info_path: "https://example.com/null"
-  updateurl: "http://example.com/"
-  myds_region_api_base_url: "https://example.com"
-  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
 serial:
   prefix:
@@ -36,7 +35,6 @@ builds:
     ver: "7.0.1"
     kver: "4.4.180"
     rd-compressed: false
-    efi-bug: no
     cmdline:
       <<: *cmdline
     synoinfo:
@@ -46,9 +44,11 @@ builds:
       hash: "01f101d7b310c857e54b0177068fb7250ff722dc9fa2472b1a48607ba40897ee"
       ramdisk-hash: "0825958923a5e67d967389769cff5fb7a04a25b98a2826c4c1e8aa7b8146dc8b"
       zimage-hash: "ef97f2d64f3f7f8c5e3f4e8fee613d385d7888826f56e119f1885a722c95c7cc"
+      md5-hash: "b8bd6562290d06dd3a7360f3af330bec"
     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 +56,6 @@ builds:
     ver: "7.1.0"
     kver: "4.4.180"
     rd-compressed: false
-    efi-bug: no
     cmdline:
       <<: *cmdline
     synoinfo:
@@ -66,8 +65,31 @@ builds:
       hash: "ed3207db40b7bac4d96411378558193b7747ebe88f0fc9c26c59c0b5c688c359"
       ramdisk-hash: "0ff061f453bc9888b16c59baaf3617bfa6ee42044122eb1dd0eaaa18b3832381"
       zimage-hash: "5222b5efaf7af28ff3833fd37f13100c30acba1ee201a15b2ee360e66e75b48e"
+      md5-hash: "d433ae251ba95754edde1586851d1e0a"
     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"
+
+  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_DVA3221_42962.pat"
+      hash: "d83044ff12c9ed81c5e7f5ba4b23b68d96c9a40c29a6a9e5c53ad807d1e27ed2"
+      ramdisk-hash: "7ecb774bfccde028d456613c7232b1d770526ea37e928bf90badac267bafcd78"
+      zimage-hash: "3c67cefc969ee3de51b7978b8d86cd53cbb0e49ec43b2240bf9b8aad3f2e2200"
+      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

@@ -0,0 +1,88 @@
+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"
+  #supportraidgroup: "no"
+cmdline: &cmdline
+  intel_iommu: igfx_off
+  SMBusHddDynamicPower: 1
+  vender_format_version: 2
+  synoboot2:
+  syno_ttyS0: "serial,0x3f8"
+  syno_ttyS1: "serial,0x2f8"
+  elevator: elevator
+platform: "v1000"
+unique: "synology_v1000_fs2500"
+beta: true
+dom: 2
+serial:
+  prefix:
+    - "0000"
+  middle: "XXX"
+  suffix: "alpha"
+disks: 12
+dt: true
+builds:
+  42218:
+    ver: "7.0.1"
+    kver: "4.4.180"
+    rd-compressed: false
+    cmdline:
+      <<: *cmdline
+    synoinfo:
+      <<: *synoinfo
+    pat:
+      url: "https://global.download.synology.com/download/DSM/release/7.0.1/42218/DSM_FS2500_42218.pat"
+      hash: "4d060be8afec548fdb042bc8095524f10ff200033cab74df37ae07f3de5eaa69"
+      ramdisk-hash: "cbe9099c57f23ba53415574b011580218fa55a0bdb83c4e4bba9e27100e5379d"
+      zimage-hash: "f6816165a52b1f53ce44a45878fe06641da34e9478947f826a236c1a6548f8fd"
+      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
+    cmdline:
+      <<: *cmdline
+    synoinfo:
+      <<: *synoinfo
+    pat:
+      url: "https://global.download.synology.com/download/DSM/release/7.1/42661-1/DSM_FS2500_42661.pat"
+      hash: "f8343ac070b43fe62d02af6ac9a9c61f8c9852b6b2c79b933629409113e1d3e6"
+      ramdisk-hash: "698e9b1d719d3032a9a2b91ca08078c632b3265590147b2f6c9ca200c826e987"
+      zimage-hash: "d939b5937be00a644aae64c33633619a7c310433e60a515c77bbef00b0a7e6b6"
+      md5-hash: "e071c4984d041309f151de29b9ba82b5"
+    patch:
+      - "ramdisk-common-disable-root-pwd.patch"
+      - "ramdisk-common-init-script.patch"
+      - "ramdisk-common-etc-rc.patch"
+      - "ramdisk-42661-post-init-script.patch"
+      
+  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_FS2500_42962.pat"
+      hash: "1adc272ba9f308866dc69a8f550d4511966a1156c553f925be167815046a5ab4"
+      ramdisk-hash: "9efc0351212d36e5a51542bff9b2f173beb913c5be3eaaeec1e78625d62763cb"
+      zimage-hash: "b0f296aad0cc3b8adba13483f89770d0a4daf9b9cab335910717448b1eaa8254"
+      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

@@ -0,0 +1,93 @@
+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"
+  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"
+  #supportraidgroup: "no"
+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
+dom: 2
+serial:
+  prefix:
+    - "2250"
+  middle: "T2R"
+  suffix: "alpha"
+disks: 16
+dt: false
+builds:
+  42218:
+    ver: "7.0.1"
+    kver: "4.4.180"
+    rd-compressed: false
+    cmdline:
+      <<: *cmdline
+    synoinfo:
+      <<: *synoinfo
+    pat:
+      url: "https://global.download.synology.com/download/DSM/release/7.0.1/42218/DSM_RS4021xs%2B_42218.pat"
+      hash: "7afca3970ac7324d7431c1484d4249939bedd4c18ac34187f894c43119edf3a1"
+      ramdisk-hash: "3aa9d810064747fca6d0a3ab4c979bd82b49fc0d166dfe714261c2a22145cc70"
+      zimage-hash: "17607e1739c8acc9903272ebd981bccb27b51057cdcb3cc446e5c5149db452d3"
+      md5-hash: "46d9eb6aba71dbd61ba0394e575b6d58"
+    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"
+
+  42661:
+    ver: "7.1"
+    kver: "4.4.180"
+    rd-compressed: false
+    cmdline:
+      <<: *cmdline
+    synoinfo:
+      <<: *synoinfo
+    pat:
+      url: "https://global.download.synology.com/download/DSM/release/7.1/42661-1/DSM_RS4021xs%2B_42661.pat"
+      hash: "496b64e431dafa34cdebb92da8ac736bf1610fe157f03df7e6d11152d60991f5"
+      ramdisk-hash: "143e475fe73c0adb3377361402b4baad21448476e844e55e16d1ed51ffc4c971"
+      zimage-hash: "e073dd84054f652811e0ae1932af2c7cdbd5fb6e5f18f265097072b8af4605e8"
+      md5-hash: "ddbbbcf8ccb8d9d345df3e08debc66f6"
+    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"
+
+  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_RS4021xs%2B_42962.pat"
+      hash: "fd848be9336d8b5cc9b514e71d447c7612d0f542d373eef61a6d427430daa931"
+      ramdisk-hash: "40775a6b9b4fae2887cd07c0efdfb26e738e2b8de73602657f7bc4407ae4a688"
+      zimage-hash: "8903dc99f7201c8656de618d767c05f91bfd32edd9a3706a50fd223237842bf2"
+      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,47 @@
+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"
+  #supportraidgroup: "no"
+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-boot_params-check.php

@@ -1,141 +0,0 @@
-#!/usr/bin/env php
-<?php
-declare(strict_types=1);
-
-/**
- * A quick tool for patching the boot_params check in the DSM kernel image
- * This lets you tinker with the initial ramdisk contents without disabling mount() features and modules loading
- *
- * The overall pattern we need to find is:
- *  - an CDECL function
- *  - does "LOCK OR [const-ptr],n" 4x
- *  - values of ORs are 1/2/4/8 respectively
- *  - [const-ptr] is always the same
- *
- * Usage: php patch-boot_params-check.php vmlinux vmlinux-mod
- */
-
-require __DIR__ . '/common.php';
-
-if ($argc < 2 || $argc > 3) {
-    perr("Usage: " . $argv[0] . " <inFile> [<outFile>]\n", true);
-}
-
-$file = getArgFilePath(1);
-perr("\nGenerating patch for $file\n");
-
-//The function will reside in init code part. We don't care we may potentially search beyond as we expect it to be found
-$codeAddr = getELFSectionAddr($file, '.init.text', 3);
-
-//Finding a function boundary is non-trivial really as patters can vary, we can have multiple exit points, and in CISC
-// there are many things which may match e.g. "PUSH EBP". Implementing even a rough disassembler is pointless.
-//However, we can certainly cheat here as we know with CDECL a non-empty function will always contain one or more
-// PUSH (0x41) R12-R15 (0x54-57) sequences. Then we can search like a 1K forward for these characteristic LOCK OR.
-const PUSH_R12_R15_SEQ = [0x41, [0x54, 0x57]];
-const PUSH_R12_R15_SEQ_LEN = 2;
-const LOCK_OR_LOOK_AHEAD = 1024;
-const LOCK_OR_PTR_SEQs = [
-    [0xF0, 0x80, null, null, null, null, null, 0x01],
-    [0xF0, 0x80, null, null, null, null, null, 0x02],
-    [0xF0, 0x80, null, null, null, null, null, 0x04],
-    [0xF0, 0x80, null, null, null, null, null, 0x08],
-];
-const LOCK_OR_PTR_SEQs_NUM = 4; //how many sequences we are expecting
-const LOCK_OR_PTR_SEQ_LEN = 8; //length of a single sequence
-
-$fp = getFileMemMapped($file); //Read the whole file to memory to make fseet/fread much faster
-$pos = $codeAddr; //Start from where code starts
-$orsPos = null; //When matched it will contain our resulting file offsets to LOCK(); OR BYTE PTR [rip+...],0x calls
-perr("Looking for f() candidates...\n");
-do {
-    $find = findSequenceWithWildcard($fp, PUSH_R12_R15_SEQ, $pos, -1);
-    if ($find === -1) {
-        break; //no more "functions" left
-    }
-
-    perr("\rAnalyzing f() candidate @ " . decTo32bUFhex($pos));
-
-    //we found something looking like PUSH R12-R15, now find the ORs
-    $orsPos = []; //file offsets where LOCK() calls should start
-    $orsPosNum = 0; //Number of LOCK(); OR ptr sequences found
-    $seqPos = $pos;
-    foreach (LOCK_OR_PTR_SEQs as $idx => $seq) {
-        $find = findSequenceWithWildcard($fp, $seq, $seqPos, LOCK_OR_LOOK_AHEAD);
-        if ($find === -1) {
-            break; //Seq not found - there's no point to look further
-        }
-
-        $orsPos[] = $find;
-        ++$orsPosNum;
-        $seqPos = $find + LOCK_OR_PTR_SEQ_LEN; //Next search will start after the current sequence code
-    }
-
-    //We can always move forward by the function token length (obvious) but if we couldn't find any LOCK-OR tokens
-    // we can skip the whole look ahead distance. We CANNOT do that if we found even a single token because the next one
-    // might have been just after the look ahead distance
-    if ($orsPosNum !== LOCK_OR_PTR_SEQs_NUM) {
-        $pos += PUSH_R12_R15_SEQ_LEN;
-        if ($orsPosNum === 0) {
-            $pos += LOCK_OR_LOOK_AHEAD;
-        }
-        continue; //Continue the main search loop to find next function candidate
-    }
-
-    //We found LOCK(); OR ptr sequences so we can print some logs and collect ptrs (as this is quite expensive)
-    $seqPtrsDist = [];
-    perr("\n[?] Found possible f() @ " . decTo32bUFhex($pos) . "\n");
-    $ptrOffset = null;
-    $equalJumps = 0;
-    foreach (LOCK_OR_PTR_SEQs as $idx => $seq) {
-        //data will have the following bytes:
-        // [0-LOCK()] [1-OR()] [2-BYTE-PTR] [3-OFFS-b3] [4-OFFS-b2] [5-OFFS-b1] [6-OFFS-b1] [7-NUMBER]
-        $seqData = readAt($fp, $orsPos[$idx], LOCK_OR_PTR_SEQ_LEN);
-        $newPtrOffset = //how far it "jumps"
-            $orsPos[$idx] +
-            (unpack('V', $seqData[3] . $seqData[4] . $seqData[5] . $seqData[6])[1]); //u32 bit LE
-
-        if($ptrOffset === null) {
-            $ptrOffset = $newPtrOffset; //Save the first one to compare in the next loop
-            ++$equalJumps;
-        } elseif ($ptrOffset === $newPtrOffset) {
-            ++$equalJumps;
-        }
-
-        perr(
-            "\t[+] Found LOCK-OR#$idx sequence @ " . decTo32bUFhex($orsPos[$idx]) . " => " .
-            rawToUFhex($seqData) . " [RIP+(dec)$newPtrOffset]\n"
-        );
-    }
-    if ($equalJumps !== 4) {
-        perr("\t[-] LOCK-OR PTR offset mismatch - $equalJumps/" . LOCK_OR_PTR_SEQs_NUM . " matched\n");
-        //If the pointer checking failed we can at least move beyond the last LOCK-OR found as we know there's no valid
-        // sequence of LOCK-ORs there
-        $pos = $orsPos[3];
-        continue;
-    }
-
-    perr("\t[+] All $equalJumps LOCK-OR PTR offsets equal - match found!\n");
-    break;
-} while(!feof($fp));
-
-if ($orsPos === null) { //There's a small chance no candidates with LOCK ORs were found
-    perr("Failed to find matching sequences", true);
-}
-
-//Patch offsets
-foreach ($orsPos as $seqFileOffset) {
-    //The offset will point at LOCK(), we need to change the OR (0x80 0x0d) to AND (0x80 0x25) so the two bytes after
-    $seqFileOffset = $seqFileOffset+2;
-
-    perr("Patching OR to AND @ file offset (dec)$seqFileOffset\n");
-    fseek($fp, $seqFileOffset);
-    fwrite($fp, "\x25"); //0x0d is OR, 0x25 is AND
-}
-
-if (!isset($argv[2])) {
-    perr("No output file specified - discarding data\n");
-    exit;
-}
-
-saveStreamToFile($fp, $argv[2]);
-fclose($fp);

files/board/arpl/overlayfs/opt/arpl/patch-ramdisk-check.php

@@ -1,85 +0,0 @@
-#!/usr/bin/env php
-<?php
-declare(strict_types=1);
-
-/**
- * A quick tool for patching the ramdisk check in the DSM kernel image
- * This lets you tinker with the initial ramdisk contents without disabling mount() features and modules loading
- *
- * Usage: php patch-ramdisk-check.php vmlinux vmlinux-mod
- */
-
-require __DIR__ . '/common.php';
-
-if ($argc < 2 || $argc > 3) {
-    perr("Usage: " . $argv[0] . " <inFile> [<outFile>]\n", true);
-}
-
-$file = getArgFilePath(1);
-perr("\nGenerating patch for $file\n");
-
-//Strings (e.g. error for printk()) reside in .rodata - start searching there to save time
-$rodataAddr = getELFSectionAddr($file, '.rodata', 2);
-
-//Locate the precise location of "ramdisk error" string
-$rdErrAddr = getELFStringLoc($file, '3ramdisk corrupt');
-
-
-//offsets will be 32 bit in ASM and in LE
-$errPrintAddr = $rodataAddr + $rdErrAddr;
-$errPrintCAddrLEH = decTo32bLEhex($errPrintAddr - 1); //Somehow rodata contains off-by-one sometimes...
-$errPrintAddrLEH = decTo32bLEhex($errPrintAddr);
-perr("LE arg addr: " . $errPrintCAddrLEH . "\n");
-
-$fp = getFileMemMapped($file); //Read the whole file to memory to make fseet/fread much faster
-
-//Find the printk() call argument
-$printkPos = findSequence($fp, hex2raw($errPrintCAddrLEH), 0, DIR_FWD, -1);
-if ($printkPos === -1) {
-    perr("printk pos not found!\n", true);
-}
-perr("Found printk arg @ " . decTo32bUFhex($printkPos) . "\n");
-
-//double check if it's a MOV reg,VAL (where reg is EAX/ECX/EDX/EBX/ESP/EBP/ESI/EDI)
-fseek($fp, $printkPos - 3);
-$instr = fread($fp, 3);
-if (strncmp($instr, "\x48\xc7", 2) !== 0) {
-    perr("Expected MOV=>reg before printk error, got " . bin2hex($instr) . "\n", true);
-}
-$dstReg = ord($instr[2]);
-if ($dstReg < 192 || $dstReg > 199) {
-    perr("Expected MOV w/reg operand [C0-C7], got " . bin2hex($instr[2]) . "\n", true);
-}
-$movPos = $printkPos - 3;
-perr("Found printk MOV @ " . decTo32bUFhex($movPos) . "\n");
-
-//now we should seek a reasonable amount (say, up to 32 bytes) for a sequence of CALL x => TEST EAX,EAX => JZ
-$testPos = findSequence($fp, "\x85\xc0", $movPos, DIR_RWD, 32);
-if ($testPos === -1) {
-    perr("Failed to find TEST eax,eax\n", true);
-}
-
-$jzPos = $testPos + 2;
-fseek($fp, $jzPos);
-$jz = fread($fp, 2);
-if ($jz[0] !== "\x74") {
-    perr("Failed to find JZ\n", true);
-}
-
-$jzp = "\xEB" . $jz[1];
-perr('OK - patching ' . bin2hex($jz) . " (JZ) to " . bin2hex($jzp) . " (JMP) @ $jzPos\n");
-fseek($fp, $jzPos); //we should be here already
-perr("Patched " . fwrite($fp, $jzp) . " bytes in memory\n");
-
-if (!isset($argv[2])) {
-    perr("No output file specified - discarding data\n");
-    exit;
-}
-
-if (!isset($argv[2])) {
-    perr("No output file specified - discarding data\n");
-    exit;
-}
-
-saveStreamToFile($fp, $argv[2]);
-fclose($fp);

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

@@ -0,0 +1,31 @@
+--- a/usr/sbin/init.post
++++ b/usr/sbin/init.post
+@@ -31,7 +31,28 @@
+ OptPrjQuota="$(GetPQMountOpt "${RootMountPath}")"
+ # shellcheck disable=SC2046
+ Mount "${RootMountPath}" /tmpRoot -o barrier=1,noatime ${OptPrjQuota}
++############################################################################################
++SED_PATH='/tmpRoot/usr/bin/sed'
+ 
++@@@CONFIG-MANIPULATORS-TOOLS@@@
++
++@@@CONFIG-GENERATED@@@
++
++UPSTART="/tmpRoot/usr/share/init"
++
++if ! echo; then
++  _replace_in_file '^start on' '#start on' $UPSTART/tty.conf
++  _replace_in_file "console output" "console none" $UPSTART/syno_poweroff_task.conf
++  _replace_in_file "console output" "console none" $UPSTART/burnin_loader.conf
++  _replace_in_file "console output" "console none" $UPSTART/udevtrigger.conf
++  _replace_in_file "console output" "console none" $UPSTART/bs-poweroff.conf
++  _replace_in_file "console output" "console none" $UPSTART/udevd.conf
++else
++  _replace_in_file '^#start on' 'start on' $UPSTART/tty.conf
++fi
++
++/addons/addons.sh late
++############################################################################################
+ Mkdir -p /tmpRoot/initrd
+ 
+ Umount /proc >/dev/null 2>&1

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

@@ -1,28 +1,37 @@
---- a/linuxrc.syno.impl	2022-07-13 19:11:36.166689682 -0300
+--- a/linuxrc.syno.impl
-+++ b/linuxrc.syno.impl	2022-07-14 10:50:50.616836807 -0300
++++ b/linuxrc.syno.impl
-@@ -59,6 +59,7 @@
+@@ -38,6 +38,8 @@
+ UnknownSynoPartitionMigrationFlag="/.unknown_syno_partition_migrate"
+ IncompatibleRootDevice="/.incompatible_root_device"
+ 
++/addons/addons.sh early
++
+ UmountRoot()
+ {
+ 	grep "^${RootDevice}" /proc/mounts && /bin/umount -f ${Mnt}
+@@ -59,5 +61,6 @@
  	fi
  
- 	UmountRoot
 +	/addons/addons.sh jrExit
+ 	UmountRoot
  
  	exit $1
  }
-@@ -155,6 +156,8 @@
+@@ -155,6 +158,8 @@
  # insert basic USB modules for detect f401/FDT
  echo "Insert basic USB modules..."
  SYNOLoadModules $USB_MODULES
-+SYNOLoadModules "usb-storage"
++
-+/addons/addons.sh early; /addons/addons.sh patches
++/addons/addons.sh modules
- 
+
  # insert Etron USB3.0 drivers
  
-@@ -208,7 +211,7 @@
+@@ -209,6 +214,8 @@
- 			rmmod i2c_core
  		fi
  fi
--
+ 
 +/addons/addons.sh patches
++
  if [ "$SupportDualhead" = "yes" ]; then
  	# Run HA script
  	/etc.defaults/AHAtasks check_stage

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,10 @@ 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}"`"
+LAYOUT="`readConfigKey "layout" "${USER_CONFIG_FILE}"`"
+KEYMAP="`readConfigKey "keymap" "${USER_CONFIG_FILE}"`"
+UNIQUE=`readModelKey "${MODEL}" "unique"`
 
 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,22 +51,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 more config
+# Read synoinfo and addons from config
 while IFS="=" read KEY VALUE; do
   [ -n "${KEY}" ] && SYNOINFO["${KEY}"]="${VALUE}"
-done < <(readModelMap "${MODEL}" "builds.${BUILD}.synoinfo")
-while IFS="=" read KEY VALUE; do
-  [ -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 "."
@@ -65,8 +80,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 "."
@@ -75,9 +92,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"
 
@@ -85,47 +104,66 @@ 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}"
+  else
+    rm -f "${RAMDISK_PATH}/usr/lib/modules/${M}"
+  fi
 done
+mkdir -p "${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"
 
-# Build modules dependencies
-/opt/arpl/depmod -a -b ${RAMDISK_PATH} 2>/dev/null
-
 echo -n "."
 # Copying fake modprobe
 cp "${PATCH_PATH}/iosched-trampoline.sh" "${RAMDISK_PATH}/usr/sbin/modprobe"
 # Copying LKM to /usr/lib/modules
-cp "${LKM_PATH}/rp-${PLATFORM}-${KVER}-${LKM}.ko" "${RAMDISK_PATH}/usr/lib/modules/rp.ko"
+gzip -dc "${LKM_PATH}/rp-${PLATFORM}-${KVER}-${LKM}.ko.gz" > "${RAMDISK_PATH}/usr/lib/modules/rp.ko"
 
 # Addons
 MAXDISKS=`readConfigKey "maxdisks" "${USER_CONFIG_FILE}"`
 # Check if model needs Device-tree dynamic patch
 DT="`readModelKey "${MODEL}" "dt"`"
-# Add system addon "dtbpatch" or "maxdisks"
-[ "${DT}" = "true" ] && ADDONS['dtbpatch']="" || ADDONS['maxdisks']="${MAXDISKS}"
-# Indispensable eudev system addon
-ADDONS['eudev']=""
 
 echo -n "."
 mkdir -p "${RAMDISK_PATH}/addons"
 echo "#!/bin/sh" > "${RAMDISK_PATH}/addons/addons.sh"
-echo 'export INSMOD="/sbin/insmod"' >> "${RAMDISK_PATH}/addons/addons.sh"
 echo 'echo "addons.sh called with params ${@}"' >> "${RAMDISK_PATH}/addons/addons.sh"
+echo "export PLATFORM=${PLATFORM}"              >> "${RAMDISK_PATH}/addons/addons.sh"
+echo "export MODEL=${MODEL}"                    >> "${RAMDISK_PATH}/addons/addons.sh"
+echo "export BUILD=${BUILD}"                    >> "${RAMDISK_PATH}/addons/addons.sh"
+echo "export LAYOUT=${LAYOUT}"                  >> "${RAMDISK_PATH}/addons/addons.sh"
+echo "export KEYMAP=${KEYMAP}"                  >> "${RAMDISK_PATH}/addons/addons.sh"
+chmod +x "${RAMDISK_PATH}/addons/addons.sh"
+
+# Required addons: eudev, dtbpatch/maxdisks, wol
+installAddon eudev
+echo "/addons/eudev.sh \${1} " >> "${RAMDISK_PATH}/addons/addons.sh" 2>"${LOG_FILE}" || dieLog
+if [ "${DT}" = "true" ]; then
+  installAddon dtbpatch
+  echo "/addons/dtbpatch.sh \${1} ${UNIQUE}" >> "${RAMDISK_PATH}/addons/addons.sh" 2>"${LOG_FILE}" || dieLog
+else
+  installAddon maxdisks
+  echo "/addons/maxdisks.sh \${1} ${MAXDISKS}" >> "${RAMDISK_PATH}/addons/addons.sh" 2>"${LOG_FILE}" || dieLog
+fi
+installAddon wol
+echo "/addons/wol.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
 
 # Reassembly ramdisk
 echo -n "."

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,13 +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
-# cksum $ZIMAGE_MOD # https://blog.box.com/crc32-checksums-the-good-the-bad-and-the-ugly
+else
-size_le $(($((16#$(php "${SCRIPT_DIR}/crc32.php" "${ZIMAGE_MOD}"))) ^ 0xFFFFFFFF)) | dd of="${ZIMAGE_MOD}" conv=notrunc oflag=append >"${LOG_FILE}" 2>&1 || dieLog
+  # 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"
 
@@ -12,15 +14,11 @@ echo -n "."
 # Extract vmlinux
 /opt/arpl/bzImage-to-vmlinux.sh "${ORI_ZIMAGE_FILE}" "${TMP_PATH}/vmlinux" >"${LOG_FILE}" 2>&1 || dieLog
 echo -n "."
-# Patch boot params
+# Patch boot params and ramdisk check
-/opt/arpl/patch-boot_params-check.php "${TMP_PATH}/vmlinux" "${TMP_PATH}/vmlinux-mod1" >"${LOG_FILE}" 2>&1 || dieLog
+/opt/arpl/kpatch "${TMP_PATH}/vmlinux" "${TMP_PATH}/vmlinux-mod" >"${LOG_FILE}" 2>&1 || dieLog
-echo -n "."
-# Patch ramdisk check
-/opt/arpl/patch-ramdisk-check.php "${TMP_PATH}/vmlinux-mod1" "${TMP_PATH}/vmlinux-mod2" >"${LOG_FILE}" 2>&1 || dieLog
 echo -n "."
 # rebuild zImage
-/opt/arpl/vmlinux-to-bzImage.sh "${TMP_PATH}/vmlinux-mod2" "${MOD_ZIMAGE_FILE}" >"${LOG_FILE}" 2>&1 || dieLog
+/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