Merge pull request #21 from fbelavenuto/dev

Added a new step to call addons scripts.

TODO

@@ -1,5 +1,5 @@
 A fazer
- - Implementar update do bzimage e ramdisk online
+ - Descobrir como é o serial do DS2422+
 
 Concluidos:
  - Generalizar código dos addons
@@ -21,5 +21,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-alpha8
+0.2-alpha1

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

@@ -74,14 +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
-# Read SATADoM type
+  SIZE=$((`df -BM | awk '/\/mnt\/p3/{print$2}' | tr 'M' ' '`+300))
-DOM="`readModelKey "${MODEL}" "dom"`"
+  # 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=${DOM} "
+[ "${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}]}"

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

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

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

@@ -63,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"
 
@@ -84,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

@@ -60,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

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

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

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

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

@@ -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"
 
@@ -76,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

@@ -64,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

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

@@ -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
  
  # 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

@@ -102,7 +102,7 @@ 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/atlantic/manifest.yml

@@ -1,6 +1,6 @@
 version: 1
-name: 9p
+name: atlantic
-description: "Driver for Plan 9 Resource Sharing Support (9P2000)"
+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

@@ -1,6 +1,6 @@
 version: 1
-name: ax88179_178a
+name: bnx2x
-description: "Driver for ASIX AX88179/178A based USB 3.0/2.0 Gigabit Ethernet"
+description: "Driver for Broadcom NetXtremeII 10Gb adapter"
 available-for:
   bromolow-3.10.108:
     install-script: &script "install.sh"