Merge pull request #31 from fbelavenuto/dev

Fixing maxdisks/dtbpatch early bug

.github/workflows/main.yml

@@ -2,10 +2,13 @@ name: Build image
 
 # Controls when the workflow will run
 on:
-  
-  # When a release is published
-  release:
-    types: [published]
+
+  # Push
+  push:
+    branches:
+      - main
+    tags:
+      - v*
 
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
@@ -25,16 +28,16 @@ jobs:
       # Check cache
       - name: Cache buildroot
         id: cache
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: .buildroot
           key: ${{ runner.os }}-${{ hashFiles('files/configs/arpl_defconfig') }}
 
-      # Install missing buildroot dependency
-      - name: Install dependency
+      # Install  dependencies
+      - name: Install dependencies
         run: |
           sudo apt-get update
-          sudo apt-get install -y libelf-dev
+          sudo apt-get install -y libelf-dev qemu-utils
 
       # Prepare buildroot for first make (for cache)
       - name: Prepare buildroot
@@ -92,18 +95,23 @@ jobs:
           echo "Building..."
           make BR2_EXTERNAL=../external
           cd -
+          qemu-img convert -O vmdk arpl.img arpl.vmdk
 
       # Zip image
       - name: Pack
         shell: bash
-        run: zip -9 "arpl-${{ steps.build.outputs.VERSION }}.img.zip" arpl.img
+        run: |
+          zip -9 "arpl-${{ steps.build.outputs.VERSION }}.img.zip" arpl.img
+          zip -9 "arpl-${{ steps.build.outputs.VERSION }}.vmdk.zip" arpl.vmdk
 
       # Upload artifact
       - name: Upload
         uses: actions/upload-artifact@v3
         with:
-          name: Image to burn
-          path: arpl.img
+          name: Images
+          path: |
+            arpl.img
+            arpl.vmdk
           retention-days: 1
 
       # Publish a release if is a tag
@@ -113,5 +121,6 @@ jobs:
         with:
           files: |
             arpl-${{ steps.build.outputs.VERSION }}.img.zip
+            arpl-${{ steps.build.outputs.VERSION }}.vmdk.zip
             .buildroot/output/images/bzImage
             .buildroot/output/images/rootfs.cpio.xz

.gitignore

@@ -1,6 +1,7 @@
 !.gitkeep
 .vscode
-arpl.img*
+arpl.img
+arpl.vmdk
 *.zip
 .buildroot
 test.sh

README.md

@@ -6,15 +6,15 @@ It is still in alpha stage, with little documentation, but it is functional. I'm
 
 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.
 
-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.
+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 and exit.
+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.
 
 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.
 
 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". There is also an option to change the maximum amount of HDs supported by the model, adjusting "maxdisks" and "internalportcfg" automatically.
+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".
 
 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.
 
@@ -25,3 +25,4 @@ Addons can be downloaded and added to the loader.
 All code was based on the work of TTG, pocopico, jumkey and others involved in continuing TTG's original redpill-load project.
 
 More information will be added in the future.
+

TODO

@@ -1,5 +1,7 @@
 A fazer
- - Implementar update do bzimage e ramdisk online
+ - Descobrir como é o serial do DS2422+
+ - Mudar addons para colocar pacote completo na partição 3 e detectar dinâmicamente durante o boot do júnior
+ - Estudar acrescentar modo simples e avançado do menu
 
 Concluidos:
  - Generalizar código dos addons
@@ -21,5 +23,6 @@ Concluidos:
  - Limpar addons quando usuário muda de modelo
  - 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

VERSION

@@ -1 +1 @@
-0.1-alpha6
+0.2-alpha5

docker/Dockerfile.template

@@ -11,7 +11,12 @@ RUN for V in ${PLATFORMS}; do \
         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; \
+        echo -e "${PLATFORM}\t${KVER}" >> /opt/platforms && \
+        if [ ! -d "/opt/linux-${KVER}" ]; then \
+          mkdir "/opt/linux-${KVER}" && \
+          echo "Extracting linux-${KVER}.tar.xz" && \
+          tar -xaf "/cache/linux-${KVER}.tar.xz" -C "/opt/linux-${KVER}" --strip-components=1; \
+        fi; \
       done; \
     done
 
@@ -22,7 +27,8 @@ ENV SHELL=/bin/bash \
 
 RUN apt update --yes && \
     apt install --yes --no-install-recommends --no-install-suggests \
-      build-essential nano make && \
+      nano curl bc kmod \
+      build-essential make ncurses-dev libssl-dev autogen automake pkg-config libtool xsltproc gperf && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/*
 

docker/build.sh

@@ -20,6 +20,7 @@ done <../PLATFORMS
 mkdir -p cache
 TOOLKIT_VER="7.0"
 for PLATFORM in ${!PLATFORMS[@]}; do
+  KVER="${PLATFORMS[${PLATFORM}]}"
   echo -n "Checking cache/ds.${PLATFORM}-${TOOLKIT_VER}.dev.txz... "
   if [ ! -f "cache/ds.${PLATFORM}-${TOOLKIT_VER}.dev.txz" ]; then
     URL="https://global.download.synology.com/download/ToolChain/toolkit/${TOOLKIT_VER}/${PLATFORM}/ds.${PLATFORM}-${TOOLKIT_VER}.dev.txz"
@@ -28,6 +29,14 @@ for PLATFORM in ${!PLATFORMS[@]}; do
   else
     echo "OK"
   fi
+  echo -n "Checking cache/linux-${KVER}.tar.xz... "
+  if [ ! -f "cache/linux-${KVER}.tar.xz" ]; then
+    URL="https://cdn.kernel.org/pub/linux/kernel/v${KVER:0:1}.x/linux-${KVER}.tar.xz"
+    echo "Downloading ${URL}"
+    curl -L "${URL}" -o "cache/linux-${KVER}.tar.xz"
+  else
+    echo "OK"
+  fi
 done
 
 # Generate Dockerfile

docker/files/opt/do.sh

@@ -19,7 +19,7 @@ function compile-module {
   fi
   echo "Compiling module for ${PLATFORM}-${KVER}..."
   cp -R /input /tmp
-  make -C "/opt/${PLATFORM}" M="/tmp/input" modules
+  make -C "/opt/${PLATFORM}" M="/tmp/input" PLATFORM=${PLATFORM^^} modules
   while read F; do
     strip -g "${F}"
     echo "Copying `basename ${F}`"

files/board/arpl/make-img.sh

@@ -19,13 +19,13 @@ dd if="/dev/zero" of="${IMAGE_FILE}" bs=1M count=250 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+100M\na\nt\n\n0b\nn\np\n\n\n+100M\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

files/board/arpl/overlayfs/etc/inittab

@@ -30,7 +30,7 @@ null::sysinit:/bin/ln -sf /proc/self/fd/2 /dev/stderr
 
 # Login in terminals
 ::respawn:/sbin/agetty -a root --noclear tty1
-ttyS0::askfirst:/sbin/agetty -a root ttyS0 115200 vt100
+ttyS0::askfirst:/sbin/agetty -a root ttyS0 115200 linux
 ::respawn:/usr/bin/ttyd login -f root
 
 # Stuff to do for the 3-finger salute

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

@@ -74,11 +74,16 @@ 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))
+  # Read SATADoM type
+  DOM="`readModelKey "${MODEL}" "dom"`"
+fi
 
 # Prepare command line
 CMDLINE_LINE=""
 [ ${EFI} -eq 1 ] && CMDLINE_LINE+="withefi "
-[ "${BUS}" = "ata" ] && CMDLINE_LINE+="synoboot_satadom=1 "
+[ "${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"
 for KEY in ${!CMDLINE[@]}; do
   VALUE="${CMDLINE[${KEY}]}"
@@ -92,6 +97,23 @@ CMDLINE_LINE=`echo ${CMDLINE_LINE} | sed 's/>/\\\\>/g'`
 echo -e "Model: \033[1;36m${MODEL}\033[0m"
 echo -e "Build: \033[1;36m${BUILD}\033[0m"
 echo -e "Cmdline:\n\033[1;36m${CMDLINE_LINE}\033[0m"
+
+# Wait for an IP
+COUNT=0
+echo -n "IP: "
+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"
+    break
+  elif [ ${COUNT} -eq 8 ]; then
+    echo -e "\033[1;31mERROR\033[0m"
+    break
+  fi
+  COUNT=$((${COUNT}+1))
+  sleep 1
+done
+
 echo -e "\033[1;37mLoading DSM kernel...\033[0m"
 
 # Executes DSM kernel via KEXEC

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

@@ -1,5 +1,5 @@
 
-ARPL_VERSION="0.1-alpha6"
+ARPL_VERSION="0.2-alpha5"
 
 # Define paths
 TMP_PATH="/tmp"

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

@@ -243,7 +243,6 @@ function addonMenu() {
       d "Delete addon(s)" \
       s "Show user addons" \
       m "Show all available addons" \
-      o "Download an addon" \
       e "Exit" \
       2>${TMP_PATH}/resp
     [ $? -ne 0 ] && return
@@ -317,32 +316,6 @@ function addonMenu() {
         dialog --backtitle "`backtitle`" --title "Available addons" \
           --colors --msgbox "${MSG}" 0 0
         ;;
-      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
-        URL="`<"${TMP_PATH}/resp"`"
-        [ -z "${URL}" ] && continue
-        clear
-        echo "Downloading ${URL}"
-        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
-          return 1
-        fi
-        ADDON="`untarAddon "${TMP_PATH}/addon.tgz"`"
-        if [ -n "${ADDON}" ]; then
-          dialog --backtitle "`backtitle`" --title "Success" --aspect 18 \
-            --msgbox "Addon '${ADDON}' added to loader" 0 0
-        else
-          dialog --backtitle "`backtitle`" --title "Invalid addon" --aspect 18 \
-            --msgbox "File format not recognized!" 0 0
-        fi
-        ;;
       e) return ;;
     esac
   done
@@ -350,8 +323,6 @@ function addonMenu() {
 
 ###############################################################################
 function cmdlineMenu() {
-  # Read device-tree flag
-  DT="`readModelKey "${MODEL}" "dt"`"
   unset CMDLINE
   declare -A CMDLINE
   while IFS="=" read KEY VALUE; do
@@ -359,11 +330,9 @@ function cmdlineMenu() {
   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 "u \"Show SATA(s) # ports and drives\""                 >> "${TMP_PATH}/menu"
   echo "e \"Exit\""                                            >> "${TMP_PATH}/menu"
   # Loop menu
   while true; do
@@ -406,6 +375,22 @@ function cmdlineMenu() {
           deleteConfigKey "cmdline.${I}" "${USER_CONFIG_FILE}"
         done
         ;;
+      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 +419,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

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

@@ -36,6 +36,7 @@ cmdline: &cmdline
   syno_ttyS0: "serial,0x3f8"
   syno_ttyS1: "serial,0x2f8"
 platform: "v1000"
+dom: 2
 serial:
   prefix:
     - "2080"
@@ -62,6 +63,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"
 
@@ -83,5 +85,6 @@ 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"

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

@@ -13,6 +13,8 @@ modules-notneeded: &modules-notneeded
   - uhci_hcd
   - mv14xx
 synoinfo: &synoinfo
+  support_disk_compatibility: "no"
+  support_memory_compatibility: "no"
   rss_server: "http://example.com/null.xml"
   rss_server_ssl: "https://example.com/null.xml"
   rss_server_v2: "https://example.com/autoupdate/v2/getList"
@@ -31,6 +33,7 @@ cmdline: &cmdline
   syno_ttyS0: "serial,0x3f8"
   syno_ttyS1: "serial,0x2f8"
 platform: "v1000"
+dom: 2
 serial:
   prefix:
     - "0000"
@@ -57,6 +60,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"

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

@@ -25,7 +25,6 @@ cmdline: &cmdline
   vender_format_version: 2
   syno_port_thaw: 1
   syno_hdd_detect: 0
-
 platform: "bromolow"
 serial:
   prefix: 
@@ -36,6 +35,7 @@ serial:
   middle: "LWN"
   suffix: "numeric"
 disks: 12
+dom: 1
 builds:
   42218:
     ver: "7.0.1"
@@ -55,6 +55,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"
@@ -77,6 +78,7 @@ 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"

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

@@ -29,8 +29,8 @@ cmdline: &cmdline
   vender_format_version: 2
   syno_port_thaw: 1
   syno_hdd_detect: 0
-
 platform: "broadwell"
+dom: 1
 serial:
   prefix:
     - "1130"
@@ -59,6 +59,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"
@@ -81,6 +82,7 @@ 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"

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

@@ -36,8 +36,8 @@ cmdline: &cmdline
   vender_format_version: 2
   syno_port_thaw: 1
   syno_hdd_detect: 0
-
 platform: "broadwellnk"
+dom: 1
 serial:
   prefix:
     - "2030"
@@ -66,6 +66,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"
@@ -88,6 +89,7 @@ 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"

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

@@ -29,8 +29,8 @@ cmdline: &cmdline
   vender_format_version: 2
   syno_port_thaw: 1
   syno_hdd_detect: 0
-
 platform: "apollolake"
+dom: 2
 serial:
   prefix:
     - "1780"
@@ -61,6 +61,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"
@@ -83,6 +84,7 @@ 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"

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

@@ -25,6 +25,7 @@ cmdline: &cmdline
   syno_ttyS1: "serial,0x2f8"
   vender_format_version: 2
 platform: "geminilake"
+dom: 2
 dt: true
 serial:
   prefix:
@@ -54,6 +55,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"
 
@@ -75,5 +77,6 @@ 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"

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

@@ -34,6 +34,7 @@ cmdline: &cmdline
   syno_ttyS0: "serial,0x3f8"
   syno_ttyS1: "serial,0x2f8"
 platform: "geminilake"
+dom: 2
 serial:
   prefix:
     - "2030"
@@ -63,5 +64,6 @@ 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"

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

@@ -29,8 +29,8 @@ cmdline: &cmdline
   vender_format_version: 2
   syno_port_thaw: 1
   syno_hdd_detect: 0
-
 platform: "denverton"
+dom: 2
 serial:
   prefix:
     - "2030"
@@ -61,6 +61,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"
@@ -83,6 +84,7 @@ 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"

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

@@ -30,8 +30,8 @@ cmdline: &cmdline
   vender_format_version: 2
   syno_port_thaw: 1
   syno_hdd_detect: 0
-
 platform: "broadwellnk"
+dom: 1
 serial:
   prefix:
     - "0000"
@@ -57,6 +57,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"
@@ -79,6 +80,7 @@ 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"

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

@@ -24,8 +24,8 @@
 +  _replace_in_file '^#start on' 'start on' $UPSTART/tty.conf
 +fi
 +
-+/addons/addons.sh sys
++/addons/addons.sh late
 +############################################################################################
  Mkdir -p /tmpRoot/initrd
  
- Umount /proc >/dev/null 2>&1
+ Umount /proc >/dev/null 2>&1

files/board/arpl/overlayfs/opt/arpl/patch/ramdisk-42661-rc.patch

@@ -0,0 +1,11 @@
+--- 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"

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

@@ -5,7 +5,7 @@
  echo "Insert basic USB modules..."
  SYNOLoadModules $USB_MODULES
 +SYNOLoadModules "usb-storage"
-+/addons/addons.sh rd
++/addons/addons.sh early; /addons/addons.sh patches
  
  # insert Etron USB3.0 drivers
  

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

@@ -24,7 +24,7 @@
 +  _replace_in_file '^#start on' 'start on' $UPSTART/tty.conf
 +fi
 +
-+/addons/addons.sh sys
++/addons/addons.sh late
 +############################################################################################
 +
  Mkdir -p /tmpRoot/initrd

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

@@ -0,0 +1,11 @@
+--- 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"

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

@@ -62,15 +62,6 @@ while read f; do
   (cd "${RAMDISK_PATH}" && patch -p1 < "${PATCH_PATH}/${f}") >>"${LOG_FILE}" 2>&1 || dieLog
 done < <(readModelArray "${MODEL}" "builds.${BUILD}.patch")
 
-# Temporary workaround
-DT="`readModelKey "${MODEL}" "dt"`"
-if [ "${DT}" != "true" ]; then
-  NUMPORTS=$((`ls /sys/class/scsi_host | wc -w`-1))
-  SYNOINFO["maxdisks"]=${NUMPORTS}
-  INTPORTCFG="0x`printf "%x" "$((2**${NUMPORTS}-1))"`"
-  SYNOINFO["internalportcfg"]="${INTPORTCFG}"
-fi
-
 # Patch /etc/synoinfo.conf
 echo -n "."
 for KEY in ${!SYNOINFO[@]}; do
@@ -101,14 +92,17 @@ cp "${PATCH_PATH}/iosched-trampoline.sh" "${RAMDISK_PATH}/usr/sbin/modprobe"
 # Addons
 # Check if model needs Device-tree dynamic patch
 DT="`readModelKey "${MODEL}" "dt"`"
-[ "${DT}" = "true" ] && ADDONS['qjs-dtb']=""  # Add system addon "qjs-dtb"
+# Add system addon "dtbpatch" or "maxdisks"
+[ "${DT}" = "true" ] && ADDONS['dtbpatch']="" || ADDONS['maxdisks']=""
 ADDONS['misc']=""  # Add system addon "misc"
+ADDONS['acpid']=""  # Add system addon "acpid"
+
 mkdir -p "${RAMDISK_PATH}/addons"
 echo -n "."
 #/proc/sys/kernel/syno_install_flag
 echo "#!/bin/sh" > "${RAMDISK_PATH}/addons/addons.sh"
 echo 'export INSMOD="/sbin/insmod"' >> "${RAMDISK_PATH}/addons/addons.sh"
-echo >> "${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}]}
   if ! installAddon ${ADDON}; then

files/board/arpl/p1/grub/grub.cfg

@@ -55,7 +55,7 @@ search --set=root --label "ARPL1"
 if [ -s /zImage -a -s /rd.gz ]; then
   menuentry 'Boot DSM' --id boot {
     echo "Loading kernel..."
-    linux /bzImage-arpl console=ttyS0,115200n8
+    linux /bzImage-arpl console=ttyS0,115200n8 quiet
     echo "Loading initramfs..."
     initrd /initrd-arpl
     echo "Booting..."
@@ -66,7 +66,7 @@ fi
 
 menuentry 'Configure loader' --id config {
   echo "Loading kernel..."
-  linux /bzImage-arpl console=ttyS0,115200n8 IWANTTOCHANGETHECONFIG
+  linux /bzImage-arpl console=ttyS0,115200n8 quiet IWANTTOCHANGETHECONFIG
   echo "Loading initramfs..."
   initrd /initrd-arpl
   echo "Booting..."

files/board/arpl/p3/addons/acpid/manifest.yml

@@ -1,5 +1,6 @@
 version: 1
 name: acpid
+system: true
 description: "Flexible and extensible daemon for delivering ACPI events"
 available-for:
   bromolow-3.10.108:

files/board/arpl/p3/addons/alx/manifest.yml

@@ -1,6 +1,6 @@
 version: 1
-name: ax88179_178a
-description: "Driver for ASIX AX88179/178A based USB 3.0/2.0 Gigabit Ethernet"
+name: alx
+description: "Driver for Qualcomm Atheros AR816x/AR817x ethernet adapters"
 available-for:
   bromolow-3.10.108:
     install-script: &script "install.sh"

files/board/arpl/p3/addons/atlantic/manifest.yml

@@ -1,6 +1,6 @@
 version: 1
-name: 9p
-description: "Driver for Plan 9 Resource Sharing Support (9P2000)"
+name: atlantic
+description: "Driver for aQuantia AQtion(tm) Ethernet card"
 available-for:
   bromolow-3.10.108:
     install-script: &script "install.sh"

files/board/arpl/p3/addons/bnx2x/manifest.yml

@@ -0,0 +1,25 @@
+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

files/board/arpl/p3/addons/dtbpatch/manifest.yml

@@ -0,0 +1,8 @@
+version: 1
+name: dtbpatch
+system: true
+description: "Patch model.dtb"
+compile-script: compile.sh
+all:
+  install-script: "install.sh"
+  copy: "all"