Merge pull request #53 from fbelavenuto/dev

Various commits
Modules compiled with DSM toolchain
2025-12-24 23:12:05 +08:00 · 2022-07-22 16:58:46 -03:00 · 2022-07-22 16:58:08 -03:00 · 2022-07-22 15:59:00 -03:00 · 2022-07-22 15:50:43 -03:00 · 2022-07-22 08:11:37 -03:00
264 changed files with 987 additions and 1671 deletions
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -1,33 +1,17 @@
 name: Build image

-# Controls when the workflow will run
 on:
-
-  # Push
  push:
    branches:
      - main
    tags:
      - v*
-#  pull_request:
-
-  # When a release is published
-#  release:
-#    types: [published]
-
-  # 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
@@ -54,7 +38,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

@@ -70,32 +54,32 @@ jobs:
          rm -rf .buildroot/board/arpl/p1
          rm -rf .buildroot/board/arpl/p3
          # 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)}'`
-          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
-          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"
-          echo "Installing addons to ${DEST_PATH}"
-          for PKG in `ls /tmp/addons/*.addon`; do
-            ADDON=`basename ${PKG} | sed 's|.addon||'`
-            mkdir -p "${DEST_PATH}/${ADDON}"
-            echo "Extracting ${PKG} to ${DEST_PATH}/${ADDON}"
-            tar xaf "${PKG}" -C "${DEST_PATH}/${ADDON}"
-          done
+          # 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
+          # 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"
+          # echo "Installing addons to ${DEST_PATH}"
+          # for PKG in `ls /tmp/addons/*.addon`; do
+          #   ADDON=`basename ${PKG} | sed 's|.addon||'`
+          #   mkdir -p "${DEST_PATH}/${ADDON}"
+          #   echo "Extracting ${PKG} to ${DEST_PATH}/${ADDON}"
+          #   tar xaf "${PKG}" -C "${DEST_PATH}/${ADDON}"
+          # done
          # Copy files
          echo "Copying files"
          sed 's/^ARPL_VERSION=.*/ARPL_VERSION="'${VERSION}'"/' -i files/board/arpl/overlayfs/opt/arpl/include/consts.sh
          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
--- a/.gitignore
+++ b/.gitignore
@@ -1,10 +1,11 @@
 !.gitkeep
 .vscode
-arpl.img
-arpl.vmdk
+arpl*.img
+arpl*.vmdk
 *.zip
 .buildroot
 test.sh
 docker/Dockerfile
 docker/cache
 *.bak
+*.o
--- a/README.md
+++ b/README.md
@@ -4,25 +4,28 @@ This particular project was created to facilitate my testing with Redpill and I

 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 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 update, the loader re-applies the patches. Builds 42218 and 42661 up to update5 are working. Automatic updates should still be disabled as we are not sure if this technique will work forever. The most important kernel modules are built into the DSM ramdisk image for automatic peripheral detection.
+
+# Use

 To use this project, download the latest image available and burn it to a USB stick or SATA disk-on-module. Set the PC to boot from the burned media and follow the informations on the screen. When booting, the user can call the "menu.sh" command from the computer itself, access via SSH or use the virtual terminal (ttyd) by typing the address provided on the screen (http://(ip):7681). The loader will automatically increase the size of the last partition and use this space as cache if it is larger than 2GiB.

-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.
+### It is highly recommended to use an SSD for the loader in the case of the option via DoM or a fast USB flash drive

-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.
+The menu system is dynamic and I hope it is intuitive enough that the user can use it without any problems. Its allows you to choose a model, the existing buildnumber for the chosen model, type or randomly create a serial number, add/remove addons, add/remove/view "cmdline" and "synoinfo" entries, choose the LKM version, create the loader, boot, manually edit the configuration file, choose a keymap, update and exit.
+
+Changing addons and synoinfo entries require re-creating the loader, cmdline entries do not.

 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).

-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 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.

 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.
+# 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.
-
--- a/7
+++ b/7
@@ -1,5 +1,6 @@
 A fazer
 - Descobrir como é o serial do DS2422+
+ - Estudar acrescentar modo simples e avançado do menu

 Concluidos:
 - Generalizar código dos addons
@@ -22,5 +23,7 @@ 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
-
-https://kb.synology.com/en-me/DSM/tutorial/What_kind_of_CPU_does_my_NAS_have
+ - Mudar addons para colocar pacote completo na partição 3 e detectar dinâmicamente durante o boot do júnior
+ - 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
--- a/Taskfile.yaml
+++ b/Taskfile.yaml
@@ -12,11 +12,8 @@ tasks:
    cmds:
      - ./build.sh

-  compile-lkms:
+  compile-kpatch:
+    dir: kpatch
    cmds:
-      - ./compile-lkm.sh
-
-  compile-addons:
-    dir: addons
-    cmds:
-      - ./compile-addons.sh {{.CLI_ARGS}}
+      - make clean all
+      - mv kpatch ../files/board/arpl/overlayfs/opt/arpl/
--- a/2
+++ b/2
@@ -1 +1 @@
-0.2-alpha3
+0.3-alpha4
--- a/docker/Dockerfile.template
+++ b/docker/Dockerfile.template
@@ -3,15 +3,17 @@ ARG PLATFORMS="@@@PLATFORMS@@@"
 ARG TOOLKIT_VER="@@@TOOLKIT_VER@@@"

 # Copy downloaded toolkits
-ADD cache /cache
+ADD cache/$TOOLKIT_VER /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=10 \
-          "usr/local/x86_64-pc-linux-gnu/x86_64-pc-linux-gnu/sys-root/usr/lib/modules/DSM-7.0/build" && \
-        echo -e "${PLATFORM}\t${KVER}" >> /opt/platforms; \
+        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; \
      done; \
    done

@@ -22,7 +24,8 @@ ENV SHELL=/bin/bash \

 RUN apt update --yes && \
    apt install --yes --no-install-recommends --no-install-suggests \
-      build-essential nano make && \
+      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/*

--- a/docker/build.sh
+++ b/docker/build.sh
@@ -6,41 +6,75 @@ function trap_cancel() {
    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
+###############################################################################
+function prepare() {
+  declare -A URLS

-# Download toolkits
-mkdir -p cache
+  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"
+
+  # 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
+
+  for PLATFORM in ${!PLATFORMS[@]}; do
+    KVER="${PLATFORMS[${PLATFORM}]}"
+    echo -n "Checking cache/${TOOLKIT_VER}/ds.${PLATFORM}-${TOOLKIT_VER}.dev.txz... "
+    if [ ! -f "cache/${TOOLKIT_VER}/ds.${PLATFORM}-${TOOLKIT_VER}.dev.txz" ]; then
+      URL="https://global.download.synology.com/download/ToolChain/toolkit/${TOOLKIT_VER}/${PLATFORM}/ds.${PLATFORM}-${TOOLKIT_VER}.dev.txz"
+      echo "Downloading ${URL}"
+      curl -L "${URL}" -o "cache/${TOOLKIT_VER}/ds.${PLATFORM}-${TOOLKIT_VER}.dev.txz"
+    else
+      echo "OK"
+    fi
+    echo -n "Checking cache/${TOOLKIT_VER}/${PLATFORM}-toolchain.txz... "
+    if [ ! -f "cache/${TOOLKIT_VER}/${PLATFORM}-toolchain.txz" ]; then
+      URL=${URLS["${PLATFORM}"]}
+      echo "Downloading ${URL}"
+      curl -L "${URL}" -o "cache/${TOOLKIT_VER}/${PLATFORM}-toolchain.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"
-for PLATFORM in ${!PLATFORMS[@]}; do
-  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
-done
+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}

-# 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
+# 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
--- a/docker/files/opt/do.sh
+++ b/docker/files/opt/do.sh
@@ -1,5 +1,20 @@
 #!/usr/bin/env bash

+set -e
+
+function export-vars {
+  # Validate
+  if [ -z "${1}" ]; then
+    echo "Use: export-vars <platform>"
+    exit 1
+  fi
+  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
+}
+
 function compile-module {
  # Validate
  if [ -z "${1}" ]; then
@@ -14,12 +29,14 @@ function compile-module {
    fi
  done </opt/platforms
  if [ $VALID -eq 0 ]; then
-    echo "Platform ${PLATFORM} not found."
+    echo "Platform ${1} 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
+  export-vars ${PLATFORM}
+  make -C "/opt/${PLATFORM}/build" M="/tmp/input" \
+       ${PLATFORM^^}-Y=y ${PLATFORM^^}-M=m modules
  while read F; do
    strip -g "${F}"
    echo "Copying `basename ${F}`"
@@ -34,22 +51,49 @@ function compile-lkm {
    exit 1
  fi
  cp -R /input /tmp
-  make -C "/tmp/input" LINUX_SRC="/opt/${PLATFORM}" dev-v7
+  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" LINUX_SRC="/opt/${PLATFORM}" clean
-  make -C "/tmp/input" LINUX_SRC="/opt/${PLATFORM}" prod-v7
+  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>)"
  exit 1
 fi
 case $1 in
-  bash) bash -l ;;
+  bash) shift && bash -l $@ ;;
+  shell) export-vars $2 && shift 2 && bash -l $@ ;;
  compile-module) compile-module $2 ;;
  compile-lkm) compile-lkm $2 ;;
+  # compile-drivers) compile-drivers ;;
  *) echo "Command not recognized: $1" ;;
 esac
--- a/external/Config.in
+++ b/external/Config.in
@@ -1,2 +1,2 @@
-source "$BR2_EXTERNAL_ARPL_PATH/r8125/Config.in"
 source "$BR2_EXTERNAL_ARPL_PATH/r8168/Config.in"
+source "$BR2_EXTERNAL_ARPL_PATH/r8125/Config.in"
--- a/files/board/arpl/kernel_defconfig
+++ b/files/board/arpl/kernel_defconfig
@@ -116,27 +116,63 @@ CONFIG_EFI_VARS=y
 CONFIG_BLK_DEV_LOOP=y
 CONFIG_VIRTIO_BLK=m
 CONFIG_BLK_DEV_NVME=y
+CONFIG_VMWARE_VMCI=m
 CONFIG_BLK_DEV_SD=y
 CONFIG_CHR_DEV_SG=y
 CONFIG_SCSI_CONSTANTS=y
 CONFIG_SCSI_SPI_ATTRS=y
 CONFIG_BLK_DEV_3W_XXXX_RAID=m
 CONFIG_SCSI_HPSA=m
+CONFIG_SCSI_3W_9XXX=m
+CONFIG_SCSI_3W_SAS=m
+CONFIG_SCSI_ACARD=m
+CONFIG_SCSI_AACRAID=m
+CONFIG_SCSI_AIC7XXX=m
 CONFIG_SCSI_AIC79XX=m
 # CONFIG_AIC79XX_DEBUG_ENABLE is not set
 CONFIG_SCSI_AIC94XX=m
 CONFIG_SCSI_MVSAS=m
 CONFIG_SCSI_MVUMI=m
 CONFIG_SCSI_DPT_I2O=m
+CONFIG_SCSI_ADVANSYS=m
+CONFIG_SCSI_ARCMSR=m
+CONFIG_SCSI_ESAS2R=m
+CONFIG_MEGARAID_NEWGEN=y
+CONFIG_MEGARAID_MM=m
+CONFIG_MEGARAID_MAILBOX=m
 CONFIG_MEGARAID_LEGACY=m
 CONFIG_MEGARAID_SAS=m
 CONFIG_SCSI_MPT2SAS=m
+CONFIG_SCSI_MPI3MR=m
+CONFIG_SCSI_SMARTPQI=m
 CONFIG_SCSI_UFSHCD=m
+CONFIG_SCSI_UFSHCD_PCI=m
+CONFIG_SCSI_UFS_DWC_TC_PCI=m
+CONFIG_SCSI_UFSHCD_PLATFORM=m
+CONFIG_SCSI_UFS_CDNS_PLATFORM=m
+CONFIG_SCSI_UFS_DWC_TC_PLATFORM=m
+CONFIG_SCSI_HPTIOP=m
 CONFIG_SCSI_BUSLOGIC=m
+CONFIG_SCSI_MYRB=m
+CONFIG_SCSI_MYRS=m
 CONFIG_VMWARE_PVSCSI=m
+CONFIG_SCSI_SNIC=m
+CONFIG_SCSI_DMX3191D=m
 CONFIG_SCSI_ISCI=m
 CONFIG_SCSI_IPS=m
+CONFIG_SCSI_INITIO=m
+CONFIG_SCSI_INIA100=m
+CONFIG_SCSI_STEX=m
+CONFIG_SCSI_SYM53C8XX_2=m
+CONFIG_SCSI_IPR=m
+CONFIG_SCSI_QLOGIC_1280=m
+CONFIG_SCSI_QLA_ISCSI=m
+CONFIG_QEDI=m
+CONFIG_SCSI_DC395x=m
 CONFIG_SCSI_AM53C974=m
+CONFIG_SCSI_WD719X=m
+CONFIG_SCSI_PMCRAID=m
+CONFIG_SCSI_PM8001=m
 CONFIG_SCSI_VIRTIO=m
 CONFIG_SCSI_DH=y
 CONFIG_ATA=y
@@ -157,33 +193,57 @@ CONFIG_BLK_DEV_MD=y
 CONFIG_BLK_DEV_DM=y
 CONFIG_DM_MIRROR=y
 CONFIG_DM_ZERO=y
+CONFIG_FUSION=y
+CONFIG_FUSION_SPI=m
+CONFIG_FUSION_SAS=m
+CONFIG_FUSION_CTL=m
 CONFIG_NETDEVICES=y
+CONFIG_MACVLAN=m
+CONFIG_IPVLAN=m
+CONFIG_VXLAN=m
 CONFIG_NETCONSOLE=y
 CONFIG_VIRTIO_NET=m
 CONFIG_ET131X=m
 CONFIG_SLICOSS=m
 CONFIG_ACENIC=m
+CONFIG_ENA_ETHERNET=m
+CONFIG_AMD8111_ETH=m
+CONFIG_PCNET32=m
 CONFIG_AMD_XGBE=m
+CONFIG_AQTION=m
 CONFIG_ATL1=m
 CONFIG_ATL1E=m
 CONFIG_ATL1C=m
 CONFIG_ALX=m
+CONFIG_B44=m
+CONFIG_BCMGENET=m
 CONFIG_CNIC=m
 CONFIG_TIGON3=y
 CONFIG_BNX2X=m
+CONFIG_SYSTEMPORT=m
+CONFIG_BNXT=m
 CONFIG_BNA=m
+CONFIG_MACB=m
+CONFIG_THUNDER_NIC_PF=m
+CONFIG_THUNDER_NIC_VF=m
+CONFIG_LIQUIDIO=m
+CONFIG_LIQUIDIO_VF=m
 CONFIG_CHELSIO_T1=m
 CONFIG_CHELSIO_T1_1G=y
 CONFIG_CHELSIO_T3=m
 CONFIG_CHELSIO_T4=m
 CONFIG_CHELSIO_T4VF=m
-CONFIG_NET_TULIP=y
+CONFIG_ENIC=m
+CONFIG_CX_ECAT=m
+CONFIG_DNET=m
 CONFIG_DL2K=m
+CONFIG_SUNDANCE=m
 CONFIG_BE2NET=m
+# CONFIG_NET_VENDOR_GOOGLE is not set
 CONFIG_HINIC=m
 CONFIG_E100=y
-CONFIG_E1000=y
-CONFIG_E1000E=y
+CONFIG_E1000=m
+CONFIG_E1000E=m
 CONFIG_IGB=m
 CONFIG_IGBVF=m
 CONFIG_IXGB=m
@@ -199,14 +259,22 @@ CONFIG_SKGE=m
 CONFIG_SKY2=y
 CONFIG_MLX4_EN=m
 CONFIG_MYRI10GE=m
+CONFIG_NATSEMI=m
+CONFIG_NS83820=m
 CONFIG_S2IO=m
 CONFIG_VXGE=m
+CONFIG_NFP=m
+CONFIG_NI_XGE_MANAGEMENT_ENET=m
 CONFIG_FORCEDETH=m
+CONFIG_HAMACHI=m
+CONFIG_YELLOWFIN=m
+CONFIG_QLA3XXX=m
 CONFIG_QLCNIC=m
 CONFIG_NETXEN_NIC=m
 CONFIG_QED=m
+CONFIG_QEDE=m
 CONFIG_QCOM_EMAC=m
-CONFIG_R8169=m
+CONFIG_RMNET=m
 CONFIG_SXGBE_ETH=m
 CONFIG_SFC=m
 # CONFIG_SFC_MCDI_MON is not set
@@ -223,7 +291,36 @@ CONFIG_VIA_VELOCITY=m
 CONFIG_XILINX_AXI_EMAC=m
 CONFIG_XILINX_LL_TEMAC=m
 CONFIG_REALTEK_PHY=y
-# CONFIG_USB_NET_DRIVERS is not set
+CONFIG_USB_NET_DRIVERS=m
+CONFIG_USB_CATC=m
+CONFIG_USB_KAWETH=m
+CONFIG_USB_PEGASUS=m
+CONFIG_USB_RTL8150=m
+CONFIG_USB_RTL8152=m
+CONFIG_USB_LAN78XX=m
+CONFIG_USB_USBNET=m
+CONFIG_USB_NET_CDC_EEM=m
+CONFIG_USB_NET_HUAWEI_CDC_NCM=m
+CONFIG_USB_NET_CDC_MBIM=m
+CONFIG_USB_NET_DM9601=m
+CONFIG_USB_NET_SR9700=m
+CONFIG_USB_NET_SR9800=m
+CONFIG_USB_NET_SMSC75XX=m
+CONFIG_USB_NET_SMSC95XX=m
+CONFIG_USB_NET_GL620A=m
+CONFIG_USB_NET_PLUSB=m
+CONFIG_USB_NET_MCS7830=m
+CONFIG_USB_NET_RNDIS_HOST=m
+CONFIG_USB_NET_CX82310_ETH=m
+CONFIG_USB_NET_KALMIA=m
+CONFIG_USB_NET_QMI_WWAN=m
+CONFIG_USB_NET_INT51X1=m
+CONFIG_USB_IPHETH=m
+CONFIG_USB_SIERRA_NET=m
+CONFIG_USB_VL600=m
+CONFIG_USB_NET_CH9200=m
+CONFIG_USB_NET_AQC111=m
+CONFIG_USB_RTL8153_ECM=m
 # CONFIG_WLAN is not set
 CONFIG_VMXNET3=m
 CONFIG_INPUT_EVDEV=y
--- a/files/board/arpl/make-img.sh
+++ b/files/board/arpl/make-img.sh
@@ -15,17 +15,17 @@ BOARD_PATH="${CONFIG_DIR}/board/arpl"

 echo "Creating image file"
 # Create image zeroed
-dd if="/dev/zero" of="${IMAGE_FILE}" bs=1M count=250 conv=sync 2>/dev/null
+dd if="/dev/zero" of="${IMAGE_FILE}" bs=1M count=300 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+100M\nt\n\n0b\nn\np\n\n\n+100M\nn\np\n\n\n\nw" | fdisk "${IMAGE_FILE}" >/dev/null
+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

 # Force umount, ignore errors
 sudo umount "${BINARIES_DIR}/p1" 2>/dev/null || true
 sudo umount "${BINARIES_DIR}/p3" 2>/dev/null || true
 # Force unsetup of loop device
-sudSetupo losetup -d "/dev/loop8" 2>/dev/null || true
+sudo losetup -d "/dev/loop8" 2>/dev/null || true
 # Setup the loop8 loop device
 sudo losetup -P "/dev/loop8" "${IMAGE_FILE}"
 # Format partitions
--- a/files/board/arpl/overlayfs/etc/init.d/S41dhcpcd
+++ b/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
--- a/files/board/arpl/overlayfs/opt/arpl/boot.sh
+++ b/files/board/arpl/overlayfs/opt/arpl/boot.sh
@@ -9,12 +9,13 @@ loaderIsConfigured || die "Loader is not configured!"

 # Print text centralized, if variable ${COLUMNS} is defined
 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 ""
 TITLE="BOOTING..."
-if [ -z "${COLUMNS}" ]; then
-  echo -e "\033[1;33m${TITLE}\033[0m"
-else
-  printf "\033[1;33m%*s\033[0m\n" $(((${#TITLE}+${COLUMNS})/2)) "${TITLE}"
-fi
+printf "\033[1;33m%*s\033[0m\n" $(((${#TITLE}+${COLUMNS})/2)) "${TITLE}"

 # Check if DSM zImage changed, patch it if necessary
 ZIMAGE_HASH="`readConfigKey "zimage-hash" "${USER_CONFIG_FILE}"`"
@@ -75,13 +76,15 @@ EFI_BUG="`readModelKey "${MODEL}" "builds.${BUILD}.efi-bug"`"
 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

 # 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"
@@ -100,18 +103,19 @@ 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 8 ]; then
-    echo -e "\033[1;31mERROR\033[0m"
+  elif [ ${COUNT} -eq 15 ]; then
+    echo -e ": \033[1;31mERROR\033[0m"
    break
  fi
  COUNT=$((${COUNT}+1))
  sleep 1
+  echo -n "."
 done

 echo -e "\033[1;37mLoading DSM kernel...\033[0m"
--- a/files/board/arpl/overlayfs/opt/arpl/common.php
+++ b/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);
-}
--- a/files/board/arpl/overlayfs/opt/arpl/crc32.php
+++ b/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]);
-?>
--- a/files/board/arpl/overlayfs/opt/arpl/depmod
+++ b/files/board/arpl/overlayfs/opt/arpl/depmod
@@ -0,0 +1 @@
+kmod
--- a/files/board/arpl/overlayfs/opt/arpl/include/consts.sh
+++ b/files/board/arpl/overlayfs/opt/arpl/include/consts.sh
@@ -1,8 +1,9 @@

-ARPL_VERSION="0.2-alpha3"
+ARPL_VERSION="0.3-alpha4"

 # Define paths
 TMP_PATH="/tmp"
+UNTAR_PAT_PATH="${TMP_PATH}/pat"
 RAMDISK_PATH="${TMP_PATH}/ramdisk"
 LOG_FILE="${TMP_PATH}/log.txt"

@@ -15,6 +16,7 @@ ORI_RDGZ_FILE="${SLPART_PATH}/rd.gz"

 ADDONS_PATH="${CACHE_PATH}/addons"
 LKM_PATH="${CACHE_PATH}/lkms"
+MODULES_PATH="${CACHE_PATH}/modules"

 MODEL_CONFIG_PATH="/opt/arpl/model-configs"
 INCLUDE_PATH="/opt/arpl/include"
--- a/files/board/arpl/overlayfs/opt/arpl/init.sh
+++ b/files/board/arpl/overlayfs/opt/arpl/init.sh
@@ -34,7 +34,6 @@ 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"
@@ -50,6 +49,7 @@ if [ ! -f "${USER_CONFIG_FILE}" ]; then
  writeConfigKey "model" "" "${USER_CONFIG_FILE}"
  writeConfigKey "build" "" "${USER_CONFIG_FILE}"
  writeConfigKey "sn" "" "${USER_CONFIG_FILE}"
+  writeConfigKey "maxdisks" "" "${USER_CONFIG_FILE}"
  writeConfigKey "keymap" "" "${USER_CONFIG_FILE}"
  writeConfigKey "zimage-hash" "" "${USER_CONFIG_FILE}"
  writeConfigKey "ramdisk-hash" "" "${USER_CONFIG_FILE}"
@@ -58,6 +58,14 @@ if [ ! -f "${USER_CONFIG_FILE}" ]; then
  writeConfigKey "addons" "{}" "${USER_CONFIG_FILE}"
 fi

+# Set custom MAC if defined
+MAC1=`readConfigKey "cmdline.mac1" "${USER_CONFIG_FILE}"`
+if [ -n "${MAC1}" ]; then
+  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} >/dev/null 2>&1 && \
+    (/etc/init.d/S41dhcpcd restart >/dev/null 2>&1 &) || true
+fi
+
 # Get the VID/PID if we are in USB
 VID="0x0000"
 PID="0x0000"
@@ -147,3 +155,7 @@ 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
+
+mkdir -p "${ADDONS_PATH}"
+mkdir -p "${LKM_PATH}"
+mkdir -p "${MODULES_PATH}"
--- a/files/board/arpl/overlayfs/opt/arpl/kmod
+++ b/files/board/arpl/overlayfs/opt/arpl/kmod
--- a/files/board/arpl/overlayfs/opt/arpl/kpatch
+++ b/files/board/arpl/overlayfs/opt/arpl/kpatch
--- a/files/board/arpl/overlayfs/opt/arpl/menu.sh
+++ b/files/board/arpl/overlayfs/opt/arpl/menu.sh
@@ -14,17 +14,6 @@ fi
 # Get actual IP
 IP=`ip route get 1.1.1.1 2>/dev/null | awk '{print$7}'`

-# Define classes for hw detection
-declare -A CLASSES
-CLASSES["0100"]="SCSI"
-CLASSES["0106"]="SATA"
-CLASSES["0101"]="IDE"
-CLASSES["0107"]="SAS"
-CLASSES["0200"]="Ethernet"
-CLASSES["0300"]="VGA"
-CLASSES["0c03"]="USB Controller"
-CLASSES["0c04"]="Fiber Channel"
-
 # Dirty flag
 DIRTY=0

@@ -73,6 +62,7 @@ function modelMenu() {
  while read M; do
    M="`basename ${M}`"
    M="${M::-4}"
+    PLATFORM=`readModelKey "${M}" "platform"`
    # Check id model is compatible with CPU
    COMPATIBLE=1
    for F in `readModelArray "${M}" "flags"`; do
@@ -81,13 +71,10 @@ function modelMenu() {
        break
      fi
    done
-    [ ${COMPATIBLE} -eq 1 ] && ITEMS+="${M} "
+    [ ${COMPATIBLE} -eq 1 ] && ITEMS+="${M} ${PLATFORM} "
  done < <(find "${MODEL_CONFIG_PATH}" -maxdepth 1 -name \*.yml | sort)
-  dialog --clear --no-items \
-    --backtitle "`backtitle`" \
-    --menu "Choose the model" 0 0 0 \
-    ${ITEMS} \
-    2>${TMP_PATH}/resp
+  dialog --backtitle "`backtitle`" --menu "Choose the model" 0 0 0 \
+    ${ITEMS} 2>${TMP_PATH}/resp
  [ $? -ne 0 ] && return
  resp=$(<${TMP_PATH}/resp)
  [ -z "${resp}" ] && return
@@ -100,11 +87,8 @@ function modelMenu() {
    SN=""
    writeConfigKey "sn" "${SN}" "${USER_CONFIG_FILE}"
    # Delete old files
-    rm -f "${MOD_ZIMAGE_FILE}"
-    rm -f "${MOD_RDGZ_FILE}"
+    rm -f "${ORI_ZIMAGE_FILE}" "${ORI_RDGZ_FILE}" "${MOD_ZIMAGE_FILE}" "${MOD_RDGZ_FILE}"
    DIRTY=1
-    # Remove addons
-    writeConfigKey "addons" "{}" "${USER_CONFIG_FILE}"
  fi
 }

@@ -120,10 +104,14 @@ function buildMenu() {
  if [ "${BUILD}" != "${resp}" ]; then
    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")
    # Remove old files
-    rm -f "${MOD_ZIMAGE_FILE}"
-    rm -f "${MOD_RDGZ_FILE}"
+    rm -f "${ORI_ZIMAGE_FILE}" "${ORI_RDGZ_FILE}" "${MOD_ZIMAGE_FILE}" "${MOD_RDGZ_FILE}"
+    DIRTY=1
  fi
 }

@@ -165,64 +153,7 @@ function serialMenu() {
 }

 ###############################################################################
-# Detect hardware
-function detectHw() {
-  PLATFORM="`readModelKey "${MODEL}" "platform"`"
-  KVER="`readModelKey "${MODEL}" "builds.${BUILD}.kver"`"
-  # Get modules not needed
-  unset NOTNEEDED
-  declare -A NOTNEEDED
-  while read M; do
-    NOTNEEDED[${M}]="1"
-  done < <(readModelArray "${MODEL}" "builds.${BUILD}.modules-notneeded")
-  unset DEVC DEVN
-  declare -A DEVC
-  declare -A DEVN
-  while read L; do
-    F=` sed -E 's/^([0-9a-z]{2}:[0-9a-z]{2}.[0-9a-z]{1})[^\[]*\[([0-9a-z]{4})\]: (.*)/\1|\2|\3/' <<<"${L}"`
-    PCI="`cut -d'|' -f1 <<<"${F}"`"
-    CLASS="`cut -d'|' -f2 <<<"${F}"`"
-    NAME="`cut -d'|' -f3 <<<"${F}"`"
-    MODULE="`lspci -ks "${PCI}" | awk '/Kernel driver in use/{print$5}'`"
-    [ -z "${MODULE}" ] && continue
-    # If is a virtio module, change id
-    if grep -q "virtio" <<<"$MODULE"; then
-      MODULE="virtio"
-    fi
-    CLASS=${CLASSES[${CLASS}]}                             # Get class name of module
-    [ -z "${CLASS}" ] && continue                          # If no class, skip
-    arrayExistItem "${MODULE}" "${!ADDONS[@]}" && continue # Check if module already added
-    [ -n "${NOTNEEDED[${MODULE}]}" ] && continue           # Check if module is not necessary
-    # Add module to list
-    DEVC[${MODULE}]="${CLASS}"
-    DEVN[${MODULE}]="${NAME}"
-  done < <(lspci -nn)
-  if [ ${#DEVC[@]} -eq 0 ]; then
-    dialog --backtitle "`backtitle`" --aspect 18 \
-      --msgbox "No device detected or already added!" 0 0
-    return
-  fi
-  for MODULE in ${!DEVC[@]}; do
-    CLASS="${DEVC[${MODULE}]}"
-    NAME="${DEVN[${MODULE}]}"
-    TEXT="Found a ${NAME}\nClass ${CLASS}\nModule ${MODULE}\nAccept?"
-    checkAddonExist "${MODULE}" "${PLATFORM}" "${KVER}" || TEXT+="\n\n\Z1PS: Addon for this module not found\Zn"
-    dialog --backtitle "`backtitle`" --title "Found Hardware" \
-      --colors --yesno "${TEXT}" 12 70
-    [ $? -ne 0 ] && continue
-    dialog --backtitle "`backtitle`" --title "params" \
-      --inputbox "Type a opcional params to module" 0 0 \
-      2>${TMP_PATH}/resp
-    [ $? -ne 0 ] && continue
-    VALUE="`<${TMP_PATH}/resp`"
-    ADDONS["${MODULE}"]="${VALUE}"
-    writeConfigKey "addons.${MODULE}" "${VALUE}" "${USER_CONFIG_FILE}"
-    DIRTY=1
-  done
-}
-
-###############################################################################
-# Manage addons/drivers
+# Manage addons
 function addonMenu() {
  # Read 'platform' and kernel version to check if addon exists
  PLATFORM="`readModelKey "${MODEL}" "platform"`"
@@ -233,25 +164,20 @@ function addonMenu() {
  while IFS="=" read KEY VALUE; do
    [ -n "${KEY}" ] && ADDONS["${KEY}"]="${VALUE}"
  done < <(readConfigMap "addons" "${USER_CONFIG_FILE}")
-  NEXT="h"
+  NEXT="a"
  # Loop menu
  while true; do
    dialog --backtitle "`backtitle`" --default-item ${NEXT} \
      --menu "Choose a option" 0 0 0 \
-      h "Detect hardware" \
      a "Add an addon" \
      d "Delete addon(s)" \
      s "Show user addons" \
      m "Show all available addons" \
-      o "Download an addon" \
+      o "Download a external addon" \
      e "Exit" \
      2>${TMP_PATH}/resp
    [ $? -ne 0 ] && return
    case "`<${TMP_PATH}/resp`" in
-      h)
-        detectHw
-        NEXT='e'
-        ;;
      a) NEXT='a'
        rm "${TMP_PATH}/menu"
        while read ADDON DESC; do
@@ -260,6 +186,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 \
@@ -319,8 +246,6 @@ function addonMenu() {
        ;;
      o)
        TEXT="please enter the complete URL to download.\n"
-        TEXT+="\Zb(Official addons location: https://github.com/fbelavenuto/arpl-addons/releases)\Zn\n"
-        TEXT+="Ex: https://github.com/fbelavenuto/arpl-addons/releases/download/v0.2/9p.addon"
        dialog --backtitle "`backtitle`" --aspect 18 --colors --inputbox "${TEXT}" 0 0 \
          2>${TMP_PATH}/resp
        [ $? -ne 0 ] && continue
@@ -331,7 +256,7 @@ function addonMenu() {
        curl --insecure -L "${URL}" -o "${TMP_PATH}/addon.tgz" --progress-bar
        if [ $? -ne 0 ]; then
          dialog --backtitle "`backtitle`" --title "Error downloading" --aspect 18 \
-            --msgbox "Check internet or cache disk space" 0 0
+            --msgbox "Check internet, URL or cache disk space" 0 0
          return 1
        fi
        ADDON="`untarAddon "${TMP_PATH}/addon.tgz"`"
@@ -350,21 +275,18 @@ function addonMenu() {

 ###############################################################################
 function cmdlineMenu() {
-  # Read device-tree flag
-  DT="`readModelKey "${MODEL}" "dt"`"
  unset CMDLINE
  declare -A CMDLINE
  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 "d \"Delete cmdline item(s)\""                          >> "${TMP_PATH}/menu"
-  if [ "${DT}" != "true" ]; then
-    echo "u \"Show SATA(s) # ports and drives\""               >> "${TMP_PATH}/menu"
-  fi
-  echo "s \"Show user cmdline\""                               >> "${TMP_PATH}/menu"
-  echo "m \"Show model/build cmdline\""                        >> "${TMP_PATH}/menu"
-  echo "e \"Exit\""                                            >> "${TMP_PATH}/menu"
+  echo "a \"Add/edit an cmdline item\""                         > "${TMP_PATH}/menu"
+  echo "d \"Delete cmdline item(s)\""                           >> "${TMP_PATH}/menu"
+  echo "c \"Define a custom MAC\""                              >> "${TMP_PATH}/menu"
+  echo "s \"Show user cmdline\""                                >> "${TMP_PATH}/menu"
+  echo "m \"Show model/build cmdline\""                         >> "${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 \
@@ -406,6 +328,45 @@ function cmdlineMenu() {
          deleteConfigKey "cmdline.${I}" "${USER_CONFIG_FILE}"
        done
        ;;
+      c)
+        dialog --backtitle "`backtitle`" --title "User cmdline" \
+          --inputbox "Type a custom MAC address" 0 0 "${CMDLINE['mac1']}"\
+          2>${TMP_PATH}/resp
+        [ $? -ne 0 ] && continue
+        MAC1="`sed 's/://g' <"${TMP_PATH}/resp"`"
+        if [ -z "${MAC1}" ]; then
+          unset CMDLINE["mac1"]
+          unset CMDLINE["netif_num"]
+          deleteConfigKey "cmdline.mac1" "${USER_CONFIG_FILE}"
+          deleteConfigKey "cmdline.netif_num" "${USER_CONFIG_FILE}"
+        else
+          CMDLINE["mac1"]="${MAC1}"
+          CMDLINE["netif_num"]=1
+          writeConfigKey "cmdline.mac1"      "${MAC1}" "${USER_CONFIG_FILE}"
+          writeConfigKey "cmdline.netif_num" "1"       "${USER_CONFIG_FILE}"
+        fi
+        /etc/init.d/S30arpl-mac restart 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
+          ITEMS+="${KEY}: ${CMDLINE[$KEY]}\n"
+        done
+        dialog --backtitle "`backtitle`" --title "User cmdline" \
+          --aspect 18 --msgbox "${ITEMS}" 0 0
+        ;;
+      m)
+        ITEMS=""
+        while IFS="=" read KEY VALUE; do
+          ITEMS+="${KEY}: ${VALUE}\n"
+        done < <(readModelMap "${MODEL}" "builds.${BUILD}.cmdline")
+        dialog --backtitle "`backtitle`" --title "Model/build cmdline" \
+          --aspect 18 --msgbox "${ITEMS}" 0 0
+        ;;
      u) TEXT=""
        NUMPORTS=0
        for PCI in `lspci -d ::106 | awk '{print$1}'`; do
@@ -434,22 +395,6 @@ function cmdlineMenu() {
        dialog --backtitle "`backtitle`" --colors --aspect 18 \
          --msgbox "${TEXT}" 0 0
        ;;
-      s)
-        ITEMS=""
-        for KEY in ${!CMDLINE[@]}; do
-          ITEMS+="${KEY}: ${CMDLINE[$KEY]}\n"
-        done
-        dialog --backtitle "`backtitle`" --title "User cmdline" \
-          --aspect 18 --msgbox "${ITEMS}" 0 0
-        ;;
-      m)
-        ITEMS=""
-        while IFS="=" read KEY VALUE; do
-          ITEMS+="${KEY}: ${VALUE}\n"
-        done < <(readModelMap "${MODEL}" "builds.${BUILD}.cmdline")
-        dialog --backtitle "`backtitle`" --title "Model/build cmdline" \
-          --aspect 18 --msgbox "${ITEMS}" 0 0
-        ;;
      e) return ;;
    esac
  done
@@ -457,6 +402,8 @@ function cmdlineMenu() {

 ###############################################################################
 function synoinfoMenu() {
+  # Get dt flag from model
+  DT="`readModelKey "${MODEL}" "dt"`"
  # Read synoinfo from user config
  unset SYNOINFO
  declare -A SYNOINFO
@@ -466,8 +413,10 @@ function synoinfoMenu() {

  echo "a \"Add/edit an synoinfo item\""   > "${TMP_PATH}/menu"
  echo "d \"Delete synoinfo item(s)\""    >> "${TMP_PATH}/menu"
-  echo "s \"Show user synoinfo\""         >> "${TMP_PATH}/menu"
-  echo "m \"Show model/build synoinfo\""  >> "${TMP_PATH}/menu"
+  if [ "${DT}" != "true" ]; then
+    echo "x \"Set maxdisks manually\""    >> "${TMP_PATH}/menu"
+  fi
+  echo "s \"Show synoinfo entries\""      >> "${TMP_PATH}/menu"
  echo "e \"Exit\""                       >> "${TMP_PATH}/menu"

  # menu loop
@@ -477,13 +426,13 @@ function synoinfoMenu() {
    [ $? -ne 0 ] && return
    case "`<${TMP_PATH}/resp`" in
      a)
-        dialog --backtitle "`backtitle`" --title "User synoinfo" \
-          --inputbox "Type a name of synoinfo variable" 0 0 \
+        dialog --backtitle "`backtitle`" --title "Synoinfo entries" \
+          --inputbox "Type a name of synoinfo entry" 0 0 \
          2>${TMP_PATH}/resp
        [ $? -ne 0 ] && continue
        NAME="`sed 's/://g' <"${TMP_PATH}/resp"`"
-        dialog --backtitle "`backtitle`" --title "User synoinfo" \
-          --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"`"
@@ -493,7 +442,7 @@ 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=""
@@ -501,7 +450,7 @@ function synoinfoMenu() {
          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"`
@@ -512,20 +461,21 @@ function synoinfoMenu() {
        done
        DIRTY=1
        ;;
+      x)
+        MAXDISKS=`readConfigKey "maxdisks" "${USER_CONFIG_FILE}"`
+        dialog --backtitle "`backtitle`" --title "Maxdisks" \
+          --inputbox "Type a value for maxdisks" 0 0 "${MAXDISKS}" \
+          2>${TMP_PATH}/resp
+        [ $? -ne 0 ] && continue
+        VALUE="`<"${TMP_PATH}/resp"`"
+        [ "${VALUE}" != "${MAXDISKS}" ] && writeConfigKey "maxdisks" "${VALUE}" "${USER_CONFIG_FILE}"
+        ;;
      s)
        ITEMS=""
        for KEY in ${!SYNOINFO[@]}; do
          ITEMS+="${KEY}: ${SYNOINFO[$KEY]}\n"
        done
-        dialog --backtitle "`backtitle`" --title "User synoinfo" \
-          --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" \
+        dialog --backtitle "`backtitle`" --title "Synoinfo entries" \
          --aspect 18 --msgbox "${ITEMS}" 0 0
        ;;
      e) return ;;
@@ -534,26 +484,13 @@ function synoinfoMenu() {
 }

 ###############################################################################
-# Where the magic happens :D
-function make() {
-  clear
-  PLATFORM="`readModelKey "${MODEL}" "platform"`"
-  KVER="`readModelKey "${MODEL}" "builds.${BUILD}.kver"`"
+# Extract linux and ramdisk files from the DSM .pat
+function extractDsmFiles() {
  PAT_URL="`readModelKey "${MODEL}" "builds.${BUILD}.pat.url"`"
  PAT_HASH="`readModelKey "${MODEL}" "builds.${BUILD}.pat.hash"`"
  RAMDISK_HASH="`readModelKey "${MODEL}" "builds.${BUILD}.pat.ramdisk-hash"`"
  ZIMAGE_HASH="`readModelKey "${MODEL}" "builds.${BUILD}.pat.zimage-hash"`"

-  # Check if all addon exists
-  while IFS="=" read ADDON PARAM; do
-    [ -z "${ADDON}" ] && continue
-    if ! checkAddonExist "${ADDON}" "${PLATFORM}" "${KVER}"; then
-      dialog --backtitle "`backtitle`" --title "Error" --aspect 18 \
-        --msgbox "Addon ${ADDON} not found!" 0 0
-      return 1
-    fi
-  done < <(readConfigMap "addons" "${USER_CONFIG_FILE}")
-
  if [ ${RAMCACHE} -eq 0 ]; then
    OUT_PATH="${CACHE_PATH}/dl"
    echo "Cache in disk"
@@ -563,7 +500,6 @@ function make() {
  fi
  mkdir -p "${OUT_PATH}"

-  UNTAR_PAT_PATH="${TMP_PATH}/pat"
  PAT_FILE="${MODEL}-${BUILD}.pat"
  PAT_PATH="${OUT_PATH}/${PAT_FILE}"
  EXTRACTOR_PATH="${CACHE_PATH}/extractor"
@@ -694,6 +630,24 @@ function make() {
  cp "${UNTAR_PAT_PATH}/zImage"          "${ORI_ZIMAGE_FILE}"
  cp "${UNTAR_PAT_PATH}/rd.gz"           "${ORI_RDGZ_FILE}"
  echo "OK"
+}
+
+function make() {
+  clear
+  PLATFORM="`readModelKey "${MODEL}" "platform"`"
+  KVER="`readModelKey "${MODEL}" "builds.${BUILD}.kver"`"
+
+  # Check if all addon exists
+  while IFS="=" read ADDON PARAM; do
+    [ -z "${ADDON}" ] && continue
+    if ! checkAddonExist "${ADDON}" "${PLATFORM}" "${KVER}"; then
+      dialog --backtitle "`backtitle`" --title "Error" --aspect 18 \
+        --msgbox "Addon ${ADDON} not found!" 0 0
+      return 1
+    fi
+  done < <(readConfigMap "addons" "${USER_CONFIG_FILE}")
+
+  [ ! -f "${ORI_ZIMAGE_FILE}" -o ! -f "${ORI_RDGZ_FILE}" ] && extractDsmFiles

  /opt/arpl/zimage-patch.sh
  if [ $? -ne 0 ]; then
@@ -780,6 +734,7 @@ function updateMenu() {
      a "Update arpl" \
      d "Update addons" \
      l "Update LKMs" \
+      m "Update modules" \
      e "Exit" \
      2>${TMP_PATH}/resp
    [ $? -ne 0 ] && return
@@ -848,13 +803,13 @@ 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"
        for PKG in `ls /tmp/addons/*.addon`; do
          ADDON=`basename ${PKG} | sed 's|.addon||'`
-          rm -rf "${DEST_PATH}/${ADDON}"
-          mkdir -p "${DEST_PATH}/${ADDON}"
-          tar xaf "${PKG}" -C "${DEST_PATH}/${ADDON}" >/dev/null 2>&1
+          rm -rf "${ADDONS_PATH}/${ADDON}"
+          mkdir -p "${ADDONS_PATH}/${ADDON}"
+          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
        ;;
@@ -873,17 +828,54 @@ function updateMenu() {
        curl --insecure -s -L "https://github.com/fbelavenuto/redpill-lkm/releases/download/${TAG}/rp-lkms.zip" -o /tmp/rp-lkms.zip
        if [ $? -ne 0 ]; then
          dialog --backtitle "`backtitle`" --title "Update LKMs" --aspect 18 \
-            --msgbox "Error downloading new version" 0 0
+            --msgbox "Error downloading last version" 0 0
          continue
        fi
        dialog --backtitle "`backtitle`" --title "Update LKMs" --aspect 18 \
          --infobox "Extracting last version" 0 0
-        rm -rf /mnt/p3/lkms/*
-        unzip /tmp/rp-lkms.zip -d /mnt/p3/lkms >/dev/null 2>&1
+        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
        ;;
-
+      m)
+        unset PLATFORMS
+        declare -A PLATFORMS
+        while read M; do
+          M="`basename ${M}`"
+          M="${M::-4}"
+          P=`readModelKey "${M}" "platform"`
+          ITEMS="`readConfigEntriesArray "builds" "${MODEL_CONFIG_PATH}/${M}.yml"`"
+          for B in ${ITEMS}; do
+            KVER=`readModelKey "${M}" "builds.${B}.kver"`
+            PLATFORMS["${P}-${KVER}"]=""
+          done
+        done < <(find "${MODEL_CONFIG_PATH}" -maxdepth 1 -name \*.yml | sort)
+        dialog --backtitle "`backtitle`" --title "Update Modules" --aspect 18 \
+          --infobox "Checking last version" 0 0
+        TAG=`curl --insecure -s https://api.github.com/repos/fbelavenuto/arpl-modules/releases/latest | grep "tag_name" | awk '{print substr($2, 2, length($2)-3)}'`
+        if [ $? -ne 0 -o -z "${TAG}" ]; then
+          dialog --backtitle "`backtitle`" --title "Update Modules" --aspect 18 \
+            --msgbox "Error checking new version" 0 0
+          continue
+        fi
+        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"
+          if [ $? -ne 0 ]; then
+            dialog --backtitle "`backtitle`" --title "Update Modules" --aspect 18 \
+              --msgbox "Error downloading ${P}.tgz" 0 0
+            continue
+          fi
+          rm "${MODULES_PATH}/${P}.tgz"
+          mv "/tmp/${P}.tgz" "${MODULES_PATH}/${P}.tgz"
+        done
+        DIRTY=1
+        dialog --backtitle "`backtitle`" --title "Update Modules" --aspect 18 \
+          --msgbox "Modules updated with success!" 0 0
+        ;;
      e) return ;;
    esac
  done
@@ -900,7 +892,7 @@ while true; do
    echo "n \"Choose a Build Number\""                >> "${TMP_PATH}/menu"
    echo "s \"Choose a serial number\""               >> "${TMP_PATH}/menu"
    if [ -n "${BUILD}" ]; then
-      echo "a \"Addons/drivers\""                     >> "${TMP_PATH}/menu"
+      echo "a \"Addons\""                             >> "${TMP_PATH}/menu"
      echo "x \"Cmdline menu\""                       >> "${TMP_PATH}/menu"
      echo "i \"Synoinfo menu\""                      >> "${TMP_PATH}/menu"
      echo "l \"Switch LKM version: \Z4${LKM}\Zn\""   >> "${TMP_PATH}/menu"
--- a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS1621+.yml
+++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS1621+.yml
@@ -1,18 +1,4 @@
 id: "DS1621+"
-modules-notneeded: &modules-notneeded
-  - ahci
-  - ata_piix
-  - amd_xgbe
-  - marvell10g
-  - i40e
-  - r8168
-  - r8169
-  - ixgbe
-  - etxhci_hcd
-  - xhci_hcd
-  - ehci-pci
-  - uhci_hcd
-  - mv14xx
 synoinfo: &synoinfo
  support_disk_compatibility: "no"
  support_memory_compatibility: "no"
@@ -50,7 +36,6 @@ builds:
    kver: "4.4.180"
    rd-compressed: false
    efi-bug: no
-    modules-notneeded: *modules-notneeded
    cmdline:
      <<: *cmdline
    synoinfo:
@@ -63,16 +48,13 @@ builds:
    patch:
      - "ramdisk-common-disable-root-pwd.patch"
      - "ramdisk-common-init-script.patch"
-      - "ramdisk-common-rc.patch"
      - "ramdisk-common-post-init-script.patch"
-      - "ramdisk-common-network-hosts.patch"

  42661:
    ver: "7.1.0"
    kver: "4.4.180"
    rd-compressed: false
    efi-bug: no
-    modules-notneeded: *modules-notneeded
    cmdline:
      <<: *cmdline
    synoinfo:
@@ -85,6 +67,4 @@ builds:
    patch:
      - "ramdisk-common-disable-root-pwd.patch"
      - "ramdisk-common-init-script.patch"
-      - "ramdisk-42661-rc.patch"
      - "ramdisk-42661-post-init-script.patch"
-      - "ramdisk-common-network-hosts.patch"
--- a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS2422+.yml
+++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS2422+.yml
@@ -1,17 +1,4 @@
 id: "DS2422+"
-modules-notneeded: &modules-notneeded
-  - ahci
-  - ata_piix
-  - amd_xgbe
-  - marvell10g
-  - i40e
-  - r8168
-  - ixgbe
-  - etxhci_hcd
-  - xhci_hcd
-  - ehci-pci
-  - uhci_hcd
-  - mv14xx
 synoinfo: &synoinfo
  support_disk_compatibility: "no"
  support_memory_compatibility: "no"
@@ -47,7 +34,6 @@ builds:
    kver: "4.4.180"
    rd-compressed: false
    efi-bug: no
-    modules-notneeded: *modules-notneeded
    cmdline:
      <<: *cmdline
    synoinfo:
@@ -60,7 +46,22 @@ builds:
    patch:
      - "ramdisk-common-disable-root-pwd.patch"
      - "ramdisk-common-init-script.patch"
-      - "ramdisk-common-rc.patch"
      - "ramdisk-common-post-init-script.patch"
-      - "ramdisk-common-network-hosts.patch"
-      - "ramdisk-common-disable-disabled-ports.patch"
+  42661:
+    ver: "7.1.0"
+    kver: "4.4.180"
+    rd-compressed: false
+    efi-bug: no
+    cmdline:
+      <<: *cmdline
+    synoinfo:
+      <<: *synoinfo
+    pat:
+      url: "https://global.download.synology.com/download/DSM/release/7.1/42661-1/DSM_DS2422%2B_42661.pat"
+      hash: "c38fee0470c592b679ab52a64eac76b2a3912fb2e6aba65a65abb5aa05a98d4c"
+      ramdisk-hash: "bb109132e96b1e26d5e3d44557944f7518168d8cb18e35d6254c0dfe7fb19382"
+      zimage-hash: "d939b5937be00a644aae64c33633619a7c310433e60a515c77bbef00b0a7e6b6"
+    patch:
+      - "ramdisk-common-disable-root-pwd.patch"
+      - "ramdisk-common-init-script.patch"
+      - "ramdisk-42661-post-init-script.patch"
--- a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS3615xs.yml
+++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS3615xs.yml
@@ -1,16 +1,4 @@
 id: "DS3615xs"
-modules-notneeded: &modules-notneeded
-  - ahci
-  - ata_piix
-  - i40e
-  - ixgbe
-  - igb
-  - e1000e
-  - dca
-  - etxhci_hcd
-  - xhci_hcd
-  - ehci-pci
-  - uhci_hcd
 synoinfo: &synoinfo
  esataportcfg: "0x0"
  usbportcfg: "0x8700"
@@ -27,7 +15,7 @@ cmdline: &cmdline
  syno_hdd_detect: 0
 platform: "bromolow"
 serial:
-  prefix: 
+  prefix:
    - "1130"
    - "1230"
    - "1330"
@@ -42,7 +30,6 @@ builds:
    kver: "3.10.108"
    rd-compressed: false
    efi-bug: yes
-    modules-notneeded: *modules-notneeded
    cmdline:
      <<: *cmdline
    synoinfo:
@@ -55,9 +42,7 @@ builds:
    patch:
      - "ramdisk-common-disable-root-pwd.patch"
      - "ramdisk-common-init-script.patch"
-      - "ramdisk-common-rc.patch"
      - "ramdisk-common-post-init-script.patch"
-      - "ramdisk-common-network-hosts.patch"
      - "ramdisk-common-disable-disabled-ports.patch"

  42661:
@@ -65,7 +50,6 @@ builds:
    kver: "3.10.108"
    rd-compressed: false
    efi-bug: yes
-    modules-notneeded: *modules-notneeded
    cmdline:
      <<: *cmdline
    synoinfo:
@@ -78,7 +62,5 @@ builds:
    patch:
      - "ramdisk-common-disable-root-pwd.patch"
      - "ramdisk-common-init-script.patch"
-      - "ramdisk-42661-rc.patch"
      - "ramdisk-42661-post-init-script.patch"
-      - "ramdisk-common-network-hosts.patch"
      - "ramdisk-42661-disable-disabled-ports.patch"
--- a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS3617xs.yml
+++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS3617xs.yml
@@ -1,16 +1,4 @@
 id: "DS3617xs"
-modules-notneeded: &modules-notneeded
-  - ahci
-  - ata_piix
-  - i40e
-  - ixgbe
-  - igb
-  - e1000e
-  - dca
-  - xhci_pci
-  - xhci_hcd
-  - uhci_hcd
-  - mv14xx
 synoinfo: &synoinfo
  esataportcfg: "0x00"
  usbportcfg: "0x8700"
@@ -46,7 +34,6 @@ builds:
    kver: "4.4.180"
    rd-compressed: false
    efi-bug: no
-    modules-notneeded: *modules-notneeded
    cmdline:
      <<: *cmdline
    synoinfo:
@@ -59,9 +46,7 @@ builds:
    patch:
      - "ramdisk-common-disable-root-pwd.patch"
      - "ramdisk-common-init-script.patch"
-      - "ramdisk-common-rc.patch"
      - "ramdisk-common-post-init-script.patch"
-      - "ramdisk-common-network-hosts.patch"
      - "ramdisk-common-disable-disabled-ports.patch"

  42661:
@@ -69,7 +54,6 @@ builds:
    kver: "4.4.180"
    rd-compressed: false
    efi-bug: no
-    modules-notneeded: *modules-notneeded
    cmdline:
      <<: *cmdline
    synoinfo:
@@ -82,7 +66,5 @@ builds:
    patch:
      - "ramdisk-common-disable-root-pwd.patch"
      - "ramdisk-common-init-script.patch"
-      - "ramdisk-42661-rc.patch"
      - "ramdisk-42661-post-init-script.patch"
-      - "ramdisk-common-network-hosts.patch"
      - "ramdisk-42661-disable-disabled-ports.patch"
--- a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS3622xs+.yml
+++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS3622xs+.yml
@@ -1,19 +1,4 @@
 id: "DS3622xs+"
-modules-notneeded: &modules-notneeded
-  - ahci
-  - ata_piix
-  - i40e
-  - r8168
-  - r8169
-  - ixgbe
-  - igb
-  - e1000e
-  - dca
-  - etxhci_hcd
-  - xhci_hcd
-  - ehci-pci
-  - uhci_hcd
-  - mv14xx
 synoinfo: &synoinfo
  esataportcfg: "0x00"
  support_bde_internal_10g: "no"
@@ -53,7 +38,6 @@ builds:
    kver: "4.4.180"
    rd-compressed: false
    efi-bug: no
-    modules-notneeded: *modules-notneeded
    cmdline:
      <<: *cmdline
    synoinfo:
@@ -66,9 +50,7 @@ builds:
    patch:
      - "ramdisk-common-disable-root-pwd.patch"
      - "ramdisk-common-init-script.patch"
-      - "ramdisk-common-rc.patch"
      - "ramdisk-common-post-init-script.patch"
-      - "ramdisk-common-network-hosts.patch"
      - "ramdisk-common-disable-disabled-ports.patch"

  42661:
@@ -76,7 +58,6 @@ builds:
    kver: "4.4.180"
    rd-compressed: false
    efi-bug: no
-    modules-notneeded: *modules-notneeded
    cmdline:
      <<: *cmdline
    synoinfo:
@@ -89,7 +70,5 @@ builds:
    patch:
      - "ramdisk-common-disable-root-pwd.patch"
      - "ramdisk-common-init-script.patch"
-      - "ramdisk-42661-rc.patch"
      - "ramdisk-42661-post-init-script.patch"
-      - "ramdisk-common-network-hosts.patch"
      - "ramdisk-42661-disable-disabled-ports.patch"
--- a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS918+.yml
+++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS918+.yml
@@ -1,14 +1,4 @@
 id: "DS918+"
-modules-notneeded: &modules-notneeded
-  - ahci
-  - ata_piix
-  - r8168
-  - r8169
-  - igb
-  - e1000e
-  - etxhci_hcd
-  - xhci_hcd
-  - uhci_hcd
 synoinfo: &synoinfo
  esataportcfg: "0x00"
  support_led_brightness_adjustment: ""
@@ -48,7 +38,6 @@ builds:
    kver: "4.4.180"
    rd-compressed: false
    efi-bug: no
-    modules-notneeded: *modules-notneeded
    cmdline:
      <<: *cmdline
    synoinfo:
@@ -61,9 +50,7 @@ builds:
    patch:
      - "ramdisk-common-disable-root-pwd.patch"
      - "ramdisk-common-init-script.patch"
-      - "ramdisk-common-rc.patch"
      - "ramdisk-common-post-init-script.patch"
-      - "ramdisk-common-network-hosts.patch"
      - "ramdisk-common-disable-disabled-ports.patch"

  42661:
@@ -71,7 +58,6 @@ builds:
    kver: "4.4.180"
    rd-compressed: false
    efi-bug: no
-    modules-notneeded: *modules-notneeded
    cmdline:
      <<: *cmdline
    synoinfo:
@@ -84,7 +70,5 @@ builds:
    patch:
      - "ramdisk-common-disable-root-pwd.patch"
      - "ramdisk-common-init-script.patch"
-      - "ramdisk-42661-rc.patch"
      - "ramdisk-42661-post-init-script.patch"
-      - "ramdisk-common-network-hosts.patch"
      - "ramdisk-42661-disable-disabled-ports.patch"
--- a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS920+.yml
+++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS920+.yml
@@ -1,12 +1,4 @@
 id: "DS920+"
-modules-notneeded: &modules-notneeded
-  - ahci
-  - ata_piix
-  - r8168
-  - r8169
-  - etxhci_hcd
-  - xhci_hcd
-  - uhci_hcd
 synoinfo: &synoinfo
  rss_server: "http://example.com/null.xml"
  rss_server_ssl: "https://example.com/null.xml"
@@ -42,7 +34,6 @@ builds:
    kver: "4.4.180"
    rd-compressed: false
    efi-bug: no
-    modules-notneeded: *modules-notneeded
    cmdline:
      <<: *cmdline
    synoinfo:
@@ -55,16 +46,13 @@ builds:
    patch:
      - "ramdisk-common-disable-root-pwd.patch"
      - "ramdisk-common-init-script.patch"
-      - "ramdisk-common-rc.patch"
      - "ramdisk-common-post-init-script.patch"
-      - "ramdisk-common-network-hosts.patch"

  42661:
    ver: "7.1.0"
    kver: "4.4.180"
    rd-compressed: false
    efi-bug: no
-    modules-notneeded: *modules-notneeded
    cmdline:
      <<: *cmdline
    synoinfo:
@@ -77,6 +65,4 @@ builds:
    patch:
      - "ramdisk-common-disable-root-pwd.patch"
      - "ramdisk-common-init-script.patch"
-      - "ramdisk-42661-rc.patch"
      - "ramdisk-42661-post-init-script.patch"
-      - "ramdisk-common-network-hosts.patch"
--- a/files/board/arpl/overlayfs/opt/arpl/model-configs/DVA1622.yml
+++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/DVA1622.yml
@@ -1,19 +1,4 @@
 id: "DVA1622"
-modules-notneeded: &modules-notneeded
-  - ahci
-  - ata_piix
-  - r8168
-  - r8169
-  - etxhci_hcd
-  - xhci_hcd
-  - uhci_hcd
-  - i915
-  - drm
-  - fb
-  - fbdev
-  - video
-  - backlight
-  - button
 synoinfo: &synoinfo
  buzzeroffen: "0xffff"
  rss_server: "http://example.com/null.xml"
@@ -51,7 +36,6 @@ builds:
    kver: "4.4.180"
    rd-compressed: false
    efi-bug: no
-    modules-notneeded: *modules-notneeded
    cmdline:
      <<: *cmdline
    synoinfo:
@@ -64,6 +48,4 @@ builds:
    patch:
      - "ramdisk-common-disable-root-pwd.patch"
      - "ramdisk-common-init-script.patch"
-      - "ramdisk-42661-rc.patch"
      - "ramdisk-42661-post-init-script.patch"
-      - "ramdisk-common-network-hosts.patch"
--- a/files/board/arpl/overlayfs/opt/arpl/model-configs/DVA3221.yml
+++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/DVA3221.yml
@@ -1,15 +1,4 @@
 id: "DVA3221"
-modules-notneeded: &modules-notneeded
-  - ahci
-  - ata_piix
-  - i40e
-  - ixgbe
-  - igb
-  - e1000e
-  - etxhci_hcd
-  - xhci_hcd
-  - ehci-pci
-  - uhci_hcd
 synoinfo: &synoinfo
  esataportcfg: "0x00"
  support_bde_internal_10g: "no"
@@ -48,7 +37,6 @@ builds:
    kver: "4.4.180"
    rd-compressed: false
    efi-bug: no
-    modules-notneeded: *modules-notneeded
    cmdline:
      <<: *cmdline
    synoinfo:
@@ -61,9 +49,7 @@ builds:
    patch:
      - "ramdisk-common-disable-root-pwd.patch"
      - "ramdisk-common-init-script.patch"
-      - "ramdisk-common-rc.patch"
      - "ramdisk-common-post-init-script.patch"
-      - "ramdisk-common-network-hosts.patch"
      - "ramdisk-common-disable-disabled-ports.patch"

  42661:
@@ -71,7 +57,6 @@ builds:
    kver: "4.4.180"
    rd-compressed: false
    efi-bug: no
-    modules-notneeded: *modules-notneeded
    cmdline:
      <<: *cmdline
    synoinfo:
@@ -84,7 +69,5 @@ builds:
    patch:
      - "ramdisk-common-disable-root-pwd.patch"
      - "ramdisk-common-init-script.patch"
-      - "ramdisk-42661-rc.patch"
      - "ramdisk-42661-post-init-script.patch"
-      - "ramdisk-common-network-hosts.patch"
      - "ramdisk-42661-disable-disabled-ports.patch"
--- a/files/board/arpl/overlayfs/opt/arpl/model-configs/RS4021xs+.yml.disabled
+++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/RS4021xs+.yml.disabled
@@ -1,86 +0,0 @@
-id: "RS4021xs+"
-modules-notneeded: &modules-notneeded
-  - ahci
-  - i40e
-  - ixgbe
-  - igb
-  - e1000e
-  - dca
-  - etxhci_hcd
-  - xhci_hcd
-  - ehci-pci
-  - uhci_hcd
-synoinfo: &synoinfo
-  support_bde_internal_10g: "no"
-  support_disk_compatibility: "no"
-  supportraidgroup: "no"
-  esataportcfg: "0x00"
-  rss_server: "http://example.com/null.xml"
-  rss_server_ssl: "https://example.com/null.xml"
-  rss_server_v2: "https://example.com/autoupdate/v2/getList"
-  update_server: "http://example.com/"
-  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
-platform: "broadwellnk"
-dom: 1
-serial:
-  prefix:
-    - "0000"
-  middle: "XXX"
-  suffix: "numeric"
-disks: 16
-builds:
-  42218:
-    ver: "7.0.1"
-    kver: "4.4.180"
-    rd-compressed: false
-    efi-bug: no
-    modules-notneeded: *modules-notneeded
-    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: "3510afe5b3dfe3662bfe054c1728c8794911da431718b533cd03d2a2c061ffd5"
-      zimage-hash: "b4cc62e9953f226960de98b65887e17dd6df5fa0ad28f665e0b4660dbd5f2fa8"
-    patch:
-      - "ramdisk-common-disable-root-pwd.patch"
-      - "ramdisk-common-init-script.patch"
-      - "ramdisk-common-rc.patch"
-      - "ramdisk-common-post-init-script.patch"
-      - "ramdisk-common-network-hosts.patch"
-      - "ramdisk-common-disable-disabled-ports.patch"
-
-  42661:
-    ver: "7.1.0"
-    kver: "4.4.180"
-    rd-compressed: false
-    efi-bug: no
-    modules-notneeded: *modules-notneeded
-    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"
-    patch:
-      - "ramdisk-common-disable-root-pwd.patch"
-      - "ramdisk-common-init-script.patch"
-      - "ramdisk-42661-rc.patch"
-      - "ramdisk-42661-post-init-script.patch"
-      - "ramdisk-common-network-hosts.patch"
-      - "ramdisk-42661-disable-disabled-ports.patch"
--- a/files/board/arpl/overlayfs/opt/arpl/patch-boot_params-check.php
+++ b/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);
--- a/files/board/arpl/overlayfs/opt/arpl/patch-ramdisk-check.php
+++ b/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);
--- a/files/board/arpl/overlayfs/opt/arpl/patch/iosched-trampoline.sh
+++ b/files/board/arpl/overlayfs/opt/arpl/patch/iosched-trampoline.sh
@@ -9,7 +9,8 @@ do
  if [ "$arg" = "elevator-iosched" ]; then
    insmod /usr/lib/modules/rp.ko
    rm /usr/lib/modules/rp.ko
-    rm /sbin/modprobe
+    rm /usr/sbin/modprobe
+    ln -s /usr/bin/kmod /usr/sbin/modprobe
    exit 0
  fi
 done
--- a/files/board/arpl/overlayfs/opt/arpl/patch/ramdisk-42661-rc.patch
+++ b/files/board/arpl/overlayfs/opt/arpl/patch/ramdisk-42661-rc.patch
@@ -1,11 +0,0 @@
--- a/etc/rc
-+++ b/etc/rc
-@@ -247,7 +247,7 @@
- 	/etc.defaults/AHAtasks load_network_modules_junior
- fi
- SYNOLoadModules ${NET_MODULES}
-
-+/addons/addons.sh modules
- 
- if [ "no" != "$RUN_SYNOBIOS" ]; then
- 	SYNOLoadModules "synobios"
--- a/files/board/arpl/overlayfs/opt/arpl/patch/ramdisk-common-init-script.patch
+++ b/files/board/arpl/overlayfs/opt/arpl/patch/ramdisk-common-init-script.patch
@@ -1,6 +1,14 @@
--- a/linuxrc.syno.impl
-+++ b/linuxrc.syno.impl
-@@ -155,6 +155,8 @@ fi
+--- a/linuxrc.syno.impl	2022-07-13 19:11:36.166689682 -0300
+++ b/linuxrc.syno.impl	2022-07-14 10:50:50.616836807 -0300
+@@ -59,6 +59,7 @@
+ 	fi
+ 
+ 	UmountRoot
+	/addons/addons.sh jrExit
+ 
+ 	exit $1
+ }
+@@ -155,6 +156,8 @@
 # insert basic USB modules for detect f401/FDT
 echo "Insert basic USB modules..."
 SYNOLoadModules $USB_MODULES
@@ -9,3 +17,12 @@
 
 # insert Etron USB3.0 drivers
 
+@@ -208,7 +211,7 @@
+ 			rmmod i2c_core
+ 		fi
+ fi
+-
+/addons/addons.sh patches
+ if [ "$SupportDualhead" = "yes" ]; then
+ 	# Run HA script
+ 	/etc.defaults/AHAtasks check_stage
--- a/files/board/arpl/overlayfs/opt/arpl/patch/ramdisk-common-rc.patch
+++ b/files/board/arpl/overlayfs/opt/arpl/patch/ramdisk-common-rc.patch
@@ -1,11 +0,0 @@
--- a/etc/rc
-+++ b/etc/rc
-@@ -230,7 +230,7 @@
- 	/etc.defaults/AHAtasks load_network_modules_junior
- fi
- SYNOLoadModules ${NET_MODULES}
-
-+/addons/addons.sh modules
- 
- if [ "no" != "$RUN_SYNOBIOS" ]; then
- 	SYNOLoadModules "synobios"
--- a/files/board/arpl/overlayfs/opt/arpl/ramdisk-patch.sh
+++ b/files/board/arpl/overlayfs/opt/arpl/ramdisk-patch.sh
@@ -44,10 +44,7 @@ RD_COMPRESSED="`readModelKey "${MODEL}" "builds.${BUILD}.rd-compressed"`"
 declare -A SYNOINFO
 declare -A ADDONS

-# Read more config
-while IFS="=" read KEY VALUE; do
-  [ -n "${KEY}" ] && SYNOINFO["${KEY}"]="${VALUE}"
-done < <(readModelMap "${MODEL}" "builds.${BUILD}.synoinfo")
+# Read synoinfo and addons from config
 while IFS="=" read KEY VALUE; do
  [ -n "${KEY}" ] &&  SYNOINFO["${KEY}"]="${VALUE}"
 done < <(readConfigMap "synoinfo" "${USER_CONFIG_FILE}")
@@ -81,27 +78,43 @@ done
 sed -e "/@@@CONFIG-GENERATED@@@/ {" -e "r ${TMP_PATH}/rp.txt" -e 'd' -e '}' -i "${RAMDISK_PATH}/sbin/init.post"
 rm "${TMP_PATH}/rp.txt"

-# Copying LKM to /usr/lib/modules/rp.ko
 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"
+for F in `ls "${TMP_PATH}/modules/"*.ko`; do
+  M=`basename ${F}`
+  # Skip existent modules
+#  [ -f "${RAMDISK_PATH}/usr/lib/modules/${M}" ] || mv "${F}" "${RAMDISK_PATH}/usr/lib/modules/${M}"
+  cp "${F}" "${RAMDISK_PATH}/usr/lib/modules/${M}"
+done
+mkdir -p "${RAMDISK_PATH}/usr/lib/firmware"
+gzip -dc "${CACHE_PATH}/modules/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"

-# Copying fake modprobe
-echo -n "."
-cp "${PATCH_PATH}/iosched-trampoline.sh" "${RAMDISK_PATH}/usr/sbin/modprobe"
-
 # 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']=""
-ADDONS['misc']=""  # Add system addon "misc"
-ADDONS['acpid']=""  # Add system addon "acpid"
+[ "${DT}" = "true" ] && ADDONS['dtbpatch']="" || ADDONS['maxdisks']="${MAXDISKS}"
+# Indispensable eudev system addon
+ADDONS['eudev']=""

-mkdir -p "${RAMDISK_PATH}/addons"
 echo -n "."
-#/proc/sys/kernel/syno_install_flag
+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"
 for ADDON in ${!ADDONS[@]}; do
  PARAMS=${ADDONS[${ADDON}]}
--- a/files/board/arpl/overlayfs/opt/arpl/vmlinux-to-bzImage.sh
+++ b/files/board/arpl/overlayfs/opt/arpl/vmlinux-to-bzImage.sh
@@ -56,8 +56,7 @@ gzip -cd "${SCRIPT_DIR}/zImage_template.gz" > "${ZIMAGE_MOD}"
 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

-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
 file_size_le "${VMLINUX_MOD}" | dd of="${ZIMAGE_MOD}" bs=15745244 seek=1 conv=notrunc >"${LOG_FILE}" 2>&1 || dieLog
-# cksum $ZIMAGE_MOD # https://blog.box.com/crc32-checksums-the-good-the-bad-and-the-ugly
-size_le $(($((16#$(php "${SCRIPT_DIR}/crc32.php" "${ZIMAGE_MOD}"))) ^ 0xFFFFFFFF)) | dd of="${ZIMAGE_MOD}" conv=notrunc oflag=append >"${LOG_FILE}" 2>&1 || dieLog
+size_le $(($((16#`crc32 "${ZIMAGE_MOD}" | awk '{print$1}'`)) ^ 0xFFFFFFFF)) | dd of="${ZIMAGE_MOD}" conv=notrunc oflag=append >"${LOG_FILE}" 2>&1 || dieLog
--- a/files/board/arpl/overlayfs/opt/arpl/zimage-patch.sh
+++ b/files/board/arpl/overlayfs/opt/arpl/zimage-patch.sh
@@ -12,14 +12,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
-/opt/arpl/patch-boot_params-check.php "${TMP_PATH}/vmlinux" "${TMP_PATH}/vmlinux-mod1" >"${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
+# Patch boot params and ramdisk check
+/opt/arpl/kpatch "${TMP_PATH}/vmlinux" "${TMP_PATH}/vmlinux-mod" >"${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
--- a/files/board/arpl/p1/grub/grub.cfg
+++ b/files/board/arpl/p1/grub/grub.cfg
@@ -6,7 +6,7 @@ terminal_input console
 terminal_output console

 set default="0"
-set timeout="3"
+set timeout="5"
 set timeout_style="menu"

 insmod loadenv
@@ -60,6 +60,13 @@ if [ -s /zImage -a -s /rd.gz ]; then
    initrd /initrd-arpl
    echo "Booting..."
  }
+  menuentry 'Force re-install DSM' --id junior {
+    echo "Loading kernel..."
+    linux /bzImage-arpl console=ttyS0,115200n8 quiet force_junior
+    echo "Loading initramfs..."
+    initrd /initrd-arpl
+    echo "Booting..."
+  }
 else
  set timeout="1"
 fi
--- a/files/board/arpl/p3/addons/acpid/all.tgz
+++ b/files/board/arpl/p3/addons/acpid/all.tgz
--- a/files/board/arpl/p3/addons/acpid/apollolake-4.4.180.tgz
+++ b/files/board/arpl/p3/addons/acpid/apollolake-4.4.180.tgz
--- a/files/board/arpl/p3/addons/acpid/broadwell-4.4.180.tgz
+++ b/files/board/arpl/p3/addons/acpid/broadwell-4.4.180.tgz
--- a/files/board/arpl/p3/addons/acpid/broadwellnk-4.4.180.tgz
+++ b/files/board/arpl/p3/addons/acpid/broadwellnk-4.4.180.tgz
--- a/files/board/arpl/p3/addons/acpid/bromolow-3.10.108.tgz
+++ b/files/board/arpl/p3/addons/acpid/bromolow-3.10.108.tgz
--- a/files/board/arpl/p3/addons/acpid/denverton-4.4.180.tgz
+++ b/files/board/arpl/p3/addons/acpid/denverton-4.4.180.tgz
--- a/files/board/arpl/p3/addons/acpid/geminilake-4.4.180.tgz
+++ b/files/board/arpl/p3/addons/acpid/geminilake-4.4.180.tgz
--- a/files/board/arpl/p3/addons/acpid/manifest.yml
+++ b/files/board/arpl/p3/addons/acpid/manifest.yml
@@ -1,33 +1,14 @@
 version: 1
 name: acpid
-system: true
 description: "Flexible and extensible daemon for delivering ACPI events"
+all:
+  install-script: "install.sh"
+  copy: "all"
 available-for:
  bromolow-3.10.108:
-    install-script: "install.sh"
-    copy: "all"
-    modules: true
  apollolake-4.4.180:
-    install-script: "install.sh"
-    copy: "all"
-    modules: true
  broadwell-4.4.180:
-    install-script: "install.sh"
-    copy: "all"
-    modules: true
  broadwellnk-4.4.180:
-    install-script: "install.sh"
-    copy: "all"
-    modules: true
  denverton-4.4.180:
-    install-script: "install.sh"
-    copy: "all"
-    modules: true
  geminilake-4.4.180:
-    install-script: "install.sh"
-    copy: "all"
-    modules: true
  v1000-4.4.180:
-    install-script: "install.sh"
-    copy: "all"
-    modules: true
--- a/files/board/arpl/p3/addons/acpid/v1000-4.4.180.tgz
+++ b/files/board/arpl/p3/addons/acpid/v1000-4.4.180.tgz
--- a/files/board/arpl/p3/addons/arcmsr/apollolake-4.4.180.tgz
+++ b/files/board/arpl/p3/addons/arcmsr/apollolake-4.4.180.tgz
--- a/files/board/arpl/p3/addons/arcmsr/broadwell-4.4.180.tgz
+++ b/files/board/arpl/p3/addons/arcmsr/broadwell-4.4.180.tgz
--- a/files/board/arpl/p3/addons/arcmsr/broadwellnk-4.4.180.tgz
+++ b/files/board/arpl/p3/addons/arcmsr/broadwellnk-4.4.180.tgz
--- a/files/board/arpl/p3/addons/arcmsr/bromolow-3.10.108.tgz
+++ b/files/board/arpl/p3/addons/arcmsr/bromolow-3.10.108.tgz
--- a/files/board/arpl/p3/addons/arcmsr/denverton-4.4.180.tgz
+++ b/files/board/arpl/p3/addons/arcmsr/denverton-4.4.180.tgz
--- a/files/board/arpl/p3/addons/arcmsr/geminilake-4.4.180.tgz
+++ b/files/board/arpl/p3/addons/arcmsr/geminilake-4.4.180.tgz
--- a/files/board/arpl/p3/addons/arcmsr/manifest.yml
+++ b/files/board/arpl/p3/addons/arcmsr/manifest.yml
@@ -1,25 +0,0 @@
-version: 1
-name: arcmsr
-description: "Driver for Areca ARC11xx/12xx/16xx/188x SAS/SATA RAID Controller"
-available-for:
-  bromolow-3.10.108:
-    install-script: &script "install.sh"
-    modules: true
-  apollolake-4.4.180:
-    install-script: *script
-    modules: true
-  broadwell-4.4.180:
-    install-script: *script
-    modules: true
-  broadwellnk-4.4.180:
-    install-script: *script
-    modules: true
-  denverton-4.4.180:
-    install-script: *script
-    modules: true
-  geminilake-4.4.180:
-    install-script: *script
-    modules: true
-  v1000-4.4.180:
-    install-script: *script
-    modules: true
--- a/files/board/arpl/p3/addons/arcmsr/v1000-4.4.180.tgz
+++ b/files/board/arpl/p3/addons/arcmsr/v1000-4.4.180.tgz
--- a/files/board/arpl/p3/addons/atl1c/apollolake-4.4.180.tgz
+++ b/files/board/arpl/p3/addons/atl1c/apollolake-4.4.180.tgz
--- a/files/board/arpl/p3/addons/atl1c/broadwell-4.4.180.tgz
+++ b/files/board/arpl/p3/addons/atl1c/broadwell-4.4.180.tgz
--- a/files/board/arpl/p3/addons/atl1c/broadwellnk-4.4.180.tgz
+++ b/files/board/arpl/p3/addons/atl1c/broadwellnk-4.4.180.tgz
--- a/files/board/arpl/p3/addons/atl1c/bromolow-3.10.108.tgz
+++ b/files/board/arpl/p3/addons/atl1c/bromolow-3.10.108.tgz
--- a/files/board/arpl/p3/addons/atl1c/denverton-4.4.180.tgz
+++ b/files/board/arpl/p3/addons/atl1c/denverton-4.4.180.tgz
--- a/files/board/arpl/p3/addons/atl1c/geminilake-4.4.180.tgz
+++ b/files/board/arpl/p3/addons/atl1c/geminilake-4.4.180.tgz
--- a/files/board/arpl/p3/addons/atl1c/manifest.yml
+++ b/files/board/arpl/p3/addons/atl1c/manifest.yml
@@ -1,25 +0,0 @@
-version: 1
-name: atl1c
-description: "Driver for Atheros L1C Gigabit Ethernet adapters"
-available-for:
-  bromolow-3.10.108:
-    install-script: &script "install.sh"
-    modules: true
-  apollolake-4.4.180:
-    install-script: *script
-    modules: true
-  broadwell-4.4.180:
-    install-script: *script
-    modules: true
-  broadwellnk-4.4.180:
-    install-script: *script
-    modules: true
-  denverton-4.4.180:
-    install-script: *script
-    modules: true
-  geminilake-4.4.180:
-    install-script: *script
-    modules: true
-  v1000-4.4.180:
-    install-script: *script
-    modules: true
--- a/files/board/arpl/p3/addons/atl1c/v1000-4.4.180.tgz
+++ b/files/board/arpl/p3/addons/atl1c/v1000-4.4.180.tgz
--- a/files/board/arpl/p3/addons/atl1e/apollolake-4.4.180.tgz
+++ b/files/board/arpl/p3/addons/atl1e/apollolake-4.4.180.tgz
--- a/files/board/arpl/p3/addons/atl1e/broadwell-4.4.180.tgz
+++ b/files/board/arpl/p3/addons/atl1e/broadwell-4.4.180.tgz
--- a/files/board/arpl/p3/addons/atl1e/broadwellnk-4.4.180.tgz
+++ b/files/board/arpl/p3/addons/atl1e/broadwellnk-4.4.180.tgz
--- a/files/board/arpl/p3/addons/atl1e/bromolow-3.10.108.tgz
+++ b/files/board/arpl/p3/addons/atl1e/bromolow-3.10.108.tgz
--- a/files/board/arpl/p3/addons/atl1e/denverton-4.4.180.tgz
+++ b/files/board/arpl/p3/addons/atl1e/denverton-4.4.180.tgz
--- a/files/board/arpl/p3/addons/atl1e/geminilake-4.4.180.tgz
+++ b/files/board/arpl/p3/addons/atl1e/geminilake-4.4.180.tgz
--- a/files/board/arpl/p3/addons/atl1e/manifest.yml
+++ b/files/board/arpl/p3/addons/atl1e/manifest.yml
@@ -1,25 +0,0 @@
-version: 1
-name: atl1e
-description: "Driver for Atheros L1E Gigabit Ethernet adapters"
-available-for:
-  bromolow-3.10.108:
-    install-script: &script "install.sh"
-    modules: true
-  apollolake-4.4.180:
-    install-script: *script
-    modules: true
-  broadwell-4.4.180:
-    install-script: *script
-    modules: true
-  broadwellnk-4.4.180:
-    install-script: *script
-    modules: true
-  denverton-4.4.180:
-    install-script: *script
-    modules: true
-  geminilake-4.4.180:
-    install-script: *script
-    modules: true
-  v1000-4.4.180:
-    install-script: *script
-    modules: true
--- a/files/board/arpl/p3/addons/atl1e/v1000-4.4.180.tgz
+++ b/files/board/arpl/p3/addons/atl1e/v1000-4.4.180.tgz
--- a/files/board/arpl/p3/addons/atlantic/apollolake-4.4.180.tgz
+++ b/files/board/arpl/p3/addons/atlantic/apollolake-4.4.180.tgz
--- a/files/board/arpl/p3/addons/atlantic/broadwell-4.4.180.tgz
+++ b/files/board/arpl/p3/addons/atlantic/broadwell-4.4.180.tgz
--- a/files/board/arpl/p3/addons/atlantic/broadwellnk-4.4.180.tgz
+++ b/files/board/arpl/p3/addons/atlantic/broadwellnk-4.4.180.tgz
--- a/files/board/arpl/p3/addons/atlantic/bromolow-3.10.108.tgz
+++ b/files/board/arpl/p3/addons/atlantic/bromolow-3.10.108.tgz
--- a/files/board/arpl/p3/addons/atlantic/denverton-4.4.180.tgz
+++ b/files/board/arpl/p3/addons/atlantic/denverton-4.4.180.tgz
--- a/files/board/arpl/p3/addons/atlantic/geminilake-4.4.180.tgz
+++ b/files/board/arpl/p3/addons/atlantic/geminilake-4.4.180.tgz
--- a/files/board/arpl/p3/addons/atlantic/manifest.yml
+++ b/files/board/arpl/p3/addons/atlantic/manifest.yml
@@ -1,25 +0,0 @@
-version: 1
-name: atlantic
-description: "Driver for aQuantia AQtion(tm) Ethernet card"
-available-for:
-  bromolow-3.10.108:
-    install-script: &script "install.sh"
-    modules: true
-  apollolake-4.4.180:
-    install-script: *script
-    modules: true
-  broadwell-4.4.180:
-    install-script: *script
-    modules: true
-  broadwellnk-4.4.180:
-    install-script: *script
-    modules: true
-  denverton-4.4.180:
-    install-script: *script
-    modules: true
-  geminilake-4.4.180:
-    install-script: *script
-    modules: true
-  v1000-4.4.180:
-    install-script: *script
-    modules: true
--- a/files/board/arpl/p3/addons/atlantic/v1000-4.4.180.tgz
+++ b/files/board/arpl/p3/addons/atlantic/v1000-4.4.180.tgz
--- a/files/board/arpl/p3/addons/bnx2x/apollolake-4.4.180.tgz
+++ b/files/board/arpl/p3/addons/bnx2x/apollolake-4.4.180.tgz
--- a/files/board/arpl/p3/addons/bnx2x/broadwell-4.4.180.tgz
+++ b/files/board/arpl/p3/addons/bnx2x/broadwell-4.4.180.tgz
--- a/files/board/arpl/p3/addons/bnx2x/broadwellnk-4.4.180.tgz
+++ b/files/board/arpl/p3/addons/bnx2x/broadwellnk-4.4.180.tgz
--- a/files/board/arpl/p3/addons/bnx2x/bromolow-3.10.108.tgz
+++ b/files/board/arpl/p3/addons/bnx2x/bromolow-3.10.108.tgz
--- a/files/board/arpl/p3/addons/bnx2x/denverton-4.4.180.tgz
+++ b/files/board/arpl/p3/addons/bnx2x/denverton-4.4.180.tgz
--- a/files/board/arpl/p3/addons/bnx2x/geminilake-4.4.180.tgz
+++ b/files/board/arpl/p3/addons/bnx2x/geminilake-4.4.180.tgz
--- a/files/board/arpl/p3/addons/bnx2x/manifest.yml
+++ b/files/board/arpl/p3/addons/bnx2x/manifest.yml
@@ -1,25 +0,0 @@
-version: 1
-name: bnx2x
-description: "Driver for Broadcom NetXtremeII 10Gb adapter"
-available-for:
-  bromolow-3.10.108:
-    install-script: &script "install.sh"
-    modules: true
-  apollolake-4.4.180:
-    install-script: *script
-    modules: true
-  broadwell-4.4.180:
-    install-script: *script
-    modules: true
-  broadwellnk-4.4.180:
-    install-script: *script
-    modules: true
-  denverton-4.4.180:
-    install-script: *script
-    modules: true
-  geminilake-4.4.180:
-    install-script: *script
-    modules: true
-  v1000-4.4.180:
-    install-script: *script
-    modules: true
--- a/files/board/arpl/p3/addons/bnx2x/v1000-4.4.180.tgz
+++ b/files/board/arpl/p3/addons/bnx2x/v1000-4.4.180.tgz
--- a/files/board/arpl/p3/addons/dtbpatch/all.tgz
+++ b/files/board/arpl/p3/addons/dtbpatch/all.tgz
--- a/files/board/arpl/p3/addons/dtbpatch/manifest.yml
+++ b/files/board/arpl/p3/addons/dtbpatch/manifest.yml
@@ -6,3 +6,11 @@ compile-script: compile.sh
 all:
  install-script: "install.sh"
  copy: "all"
+available-for:
+  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:
--- a/files/board/arpl/p3/addons/e1000/apollolake-4.4.180.tgz
+++ b/files/board/arpl/p3/addons/e1000/apollolake-4.4.180.tgz
--- a/files/board/arpl/p3/addons/e1000/broadwell-4.4.180.tgz
+++ b/files/board/arpl/p3/addons/e1000/broadwell-4.4.180.tgz
--- a/files/board/arpl/p3/addons/e1000/broadwellnk-4.4.180.tgz
+++ b/files/board/arpl/p3/addons/e1000/broadwellnk-4.4.180.tgz
--- a/files/board/arpl/p3/addons/e1000/bromolow-3.10.108.tgz
+++ b/files/board/arpl/p3/addons/e1000/bromolow-3.10.108.tgz
--- a/files/board/arpl/p3/addons/e1000/denverton-4.4.180.tgz
+++ b/files/board/arpl/p3/addons/e1000/denverton-4.4.180.tgz
--- a/files/board/arpl/p3/addons/e1000/geminilake-4.4.180.tgz
+++ b/files/board/arpl/p3/addons/e1000/geminilake-4.4.180.tgz
--- a/files/board/arpl/p3/addons/e1000/manifest.yml
+++ b/files/board/arpl/p3/addons/e1000/manifest.yml
@@ -1,25 +0,0 @@
-version: 1
-name: e1000
-description: "Driver for Intel(R) PRO/1000 Gigabit Ethernet adapters"
-available-for:
-  bromolow-3.10.108:
-    install-script: &script "install.sh"
-    modules: true
-  apollolake-4.4.180:
-    install-script: *script
-    modules: true
-  broadwell-4.4.180:
-    install-script: *script
-    modules: true
-  broadwellnk-4.4.180:
-    install-script: *script
-    modules: true
-  denverton-4.4.180:
-    install-script: *script
-    modules: true
-  geminilake-4.4.180:
-    install-script: *script
-    modules: true
-  v1000-4.4.180:
-    install-script: *script
-    modules: true
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Fabio Belavenuto	415ee7e75d	Merge pull request #53 from fbelavenuto/dev Various commits	2022-07-22 16:58:46 -03:00
Fabio Belavenuto	2fe9b3237e	Modules compiled with DSM toolchain	2022-07-22 16:58:08 -03:00
Fabio Belavenuto	81c0e00b76	Little fixes	2022-07-22 15:59:00 -03:00
Fabio Belavenuto	1b766e4974	Docker: using DSM toolchain	2022-07-22 15:50:43 -03:00
Fabio Belavenuto	690af5115d	Re-added Addon external download	2022-07-22 08:11:37 -03:00
Fabio Belavenuto	a6ec7c0c46	Merge pull request #50 from fbelavenuto/dev Adding module firmwares	2022-07-21 17:24:21 -03:00
Fabio Belavenuto	37fe50a1c5	Adding module firmwares	2022-07-21 17:22:38 -03:00
Fabio Belavenuto	ce5f427837	Merge pull request #49 from fbelavenuto/dev Synoinfo entries unified	2022-07-21 16:50:16 -03:00
Fabio Belavenuto	5dc0b6e705	Synoinfo entries unified: Synoinfo entries from model config file are copyed to user config file when the user choose a build.	2022-07-21 16:49:04 -03:00
Fabio Belavenuto	ea67f64d31	Merge pull request #48 from fbelavenuto/dev Fixing custom MAC address	2022-07-21 14:26:12 -03:00
Fabio Belavenuto	722c03a506	Fixing custom MAC address	2022-07-21 14:21:25 -03:00
Fabio Belavenuto	678c7b6591	Merge pull request #47 from fbelavenuto/dev Update modules set DIRTY flag	2022-07-21 11:22:12 -03:00
Fabio Belavenuto	8f7318f90f	Cosmetics Update module sets DIRTY flag	2022-07-21 11:21:24 -03:00
Fabio Belavenuto	7b2a7b210a	Added DS2422+ 42661 build	2022-07-19 14:22:40 -03:00
Fabio Belavenuto	14362aae17	Added option to boot into junior mode	2022-07-19 13:54:51 -03:00
Fabio Belavenuto	0e16f96fad	Added option to boot into junior mode	2022-07-19 13:53:03 -03:00
Fabio Belavenuto	159b7172b0	Merge pull request #43 from fbelavenuto/dev Removing no more necessary php	2022-07-19 12:44:47 -03:00
Fabio Belavenuto	75c637a6e4	Removing no more necessary php	2022-07-19 12:44:03 -03:00
Fabio Belavenuto	a3bb685def	Merge pull request #42 from fbelavenuto/dev Rewind vanilla e1000e	2022-07-19 12:30:10 -03:00
Fabio Belavenuto	42010a1dc0	Rewind vanilla e1000e	2022-07-19 12:01:44 -03:00
Fabio Belavenuto	a456c2b21e	Merge pull request #41 from fbelavenuto/dev Fixing modules	2022-07-19 09:54:32 -03:00
Fabio Belavenuto	917c5f7280	Fixing modules	2022-07-19 09:53:42 -03:00
Fabio Belavenuto	8b530f12d1	Merge pull request #40 from fbelavenuto/dev Dev	2022-07-18 17:06:37 -03:00
Fabio Belavenuto	604728ecec	Added Fusion SPI module	2022-07-18 17:05:30 -03:00
Fabio Belavenuto	de224baf98	Fixing e1000 module (kernel panic)	2022-07-18 14:48:16 -03:00
Fabio Belavenuto	6ee0672e74	Merge pull request #39 from fbelavenuto/dev Dev	2022-07-18 13:19:05 -03:00
Fabio Belavenuto	ff422707b7	Replaced php scripts for alternatives Add kpatch C code for patch DSM kernel Fix ramdisk-common-init-script (wrong merge)	2022-07-18 13:15:26 -03:00
Fabio Belavenuto	9edb1cfe0f	Adding title into boot screen	2022-07-18 10:46:03 -03:00
Fabio Belavenuto	755a3d6a39	Added "Define custom MAC" to cmdline menu	2022-07-18 10:30:58 -03:00
Fabio Belavenuto	a17dc55a17	Merge pull request #38 from fbelavenuto/dev Dev	2022-07-18 10:10:03 -03:00
Fabio Belavenuto	b35a71f023	new mpt3sas module new version	2022-07-18 10:09:33 -03:00
Fabio Belavenuto	b9a02143b1	Little bugs	2022-07-18 09:36:03 -03:00
Fabio Belavenuto	8091c22402	wip	2022-07-16 19:09:13 -03:00
Fabio Belavenuto	da93438455	Merge branch 'eudev'	2022-07-16 18:27:10 -03:00
Fabio Belavenuto	b35496d053	Using pocopico's mpt3sas	2022-07-16 18:15:51 -03:00
Fabio Belavenuto	4ee4c14090	Adding modules update menu option	2022-07-15 21:59:56 -03:00
Fabio Belavenuto	2269b4b209	Adding maxdisks manually	2022-07-15 20:33:27 -03:00
Fabio Belavenuto	4a1d78056c	Testing eudev Addons misc and acpid is optional now	2022-07-15 19:34:21 -03:00
Fabio Belavenuto	0b7c7fd816	Merge pull request #31 from fbelavenuto/dev Fixing maxdisks/dtbpatch early bug	2022-07-15 15:59:55 -03:00
Fabio Belavenuto	84c405cdf7	Fixing maxdisks/dtbpatch early bug	2022-07-15 15:30:45 -03:00
Fabio Belavenuto	9560f40603	Update main.yml	2022-07-15 11:59:23 -03:00
Fabio Belavenuto	8718027acb	Fixing bootable flag into image	2022-07-15 11:55:36 -03:00
Fabio Belavenuto	69151c65b2	Merge branch 'eudev' of github.com:fbelavenuto/arpl into eudev	2022-07-14 13:14:23 -03:00
Fabio Belavenuto	7f464a94e1	Merge branch 'dev'	2022-07-14 13:08:19 -03:00
Fabio Belavenuto	6df00babb3	change main.yml	2022-07-14 13:07:47 -03:00
Fabio Belavenuto	a21392c97e	Merge pull request #30 from fbelavenuto/dev merge dev	2022-07-14 13:04:54 -03:00
Fabio Belavenuto	d1070d37c3	Merge branch 'main' into dev	2022-07-14 13:04:12 -03:00
Fabio Belavenuto	db464ec087	Removed download addon Little bug fixed New version	2022-07-14 12:56:27 -03:00
Fabio Belavenuto	8093df3040	Eudev tests	2022-07-14 12:48:02 -03:00
Fabio Belavenuto	45f36ca380	Testing eudev	2022-07-13 23:21:29 -03:00
Fabio Belavenuto	9c372a2320	Adding more functions to docker image	2022-07-13 16:24:27 -03:00
Fabio Belavenuto	b44fe819d0	Reformuling modules/addons	2022-07-13 14:01:56 -03:00
Fabio Belavenuto	3512ca422a	wip	2022-07-12 16:31:01 -03:00
Fabio Belavenuto	bbc44d9ba7	testes	2022-07-12 16:30:30 -03:00
Fabio Belavenuto	df1905b17d	Adding linux vanilla source to docker image	2022-07-11 22:10:54 -03:00
Fabio Belavenuto	14e8ac2a5c	Fix addons	2022-07-11 17:04:58 -03:00
Fabio Belavenuto	2225b6afd7	Adding buildroot package smartmontools	2022-07-11 14:22:24 -03:00
Fabio Belavenuto	fd6c9db110	Fix show menu "Show SATA(s) # ports and drives" to devicetree models. Added alx addon	2022-07-11 12:15:49 -03:00