diff --git a/files/board/arpl/overlayfs/opt/arpl/boot.sh b/files/board/arpl/overlayfs/opt/arpl/boot.sh index ae6c454e..812f4025 100755 --- a/files/board/arpl/overlayfs/opt/arpl/boot.sh +++ b/files/board/arpl/overlayfs/opt/arpl/boot.sh @@ -75,10 +75,13 @@ 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` +# Read SATADoM type +DOM="`readModelKey "${MODEL}" "dom"`" + # 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} " 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 +95,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 diff --git a/files/board/arpl/overlayfs/opt/arpl/include/consts.sh b/files/board/arpl/overlayfs/opt/arpl/include/consts.sh index 078c63a8..08e838fe 100644 --- a/files/board/arpl/overlayfs/opt/arpl/include/consts.sh +++ b/files/board/arpl/overlayfs/opt/arpl/include/consts.sh @@ -1,5 +1,5 @@ -ARPL_VERSION="0.1-alpha6" +ARPL_VERSION="0.1-alpha7" # Define paths TMP_PATH="/tmp" diff --git a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS1621+.yml b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS1621+.yml index 99609569..d63004ea 100644 --- a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS1621+.yml +++ b/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" diff --git a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS2422+.yml b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS2422+.yml index 5d1c0231..b1116345 100644 --- a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS2422+.yml +++ b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS2422+.yml @@ -31,6 +31,7 @@ cmdline: &cmdline syno_ttyS0: "serial,0x3f8" syno_ttyS1: "serial,0x2f8" platform: "v1000" +dom: 2 serial: prefix: - "0000" diff --git a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS3615xs.yml b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS3615xs.yml index 0c27402f..c0f0f776 100644 --- a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS3615xs.yml +++ b/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" diff --git a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS3617xs.yml b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS3617xs.yml index ad17838d..0bcb975e 100644 --- a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS3617xs.yml +++ b/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" diff --git a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS3622xs+.yml b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS3622xs+.yml index c2e558ed..40f205e4 100644 --- a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS3622xs+.yml +++ b/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" diff --git a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS918+.yml b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS918+.yml index 85cd62a1..20ccb795 100644 --- a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS918+.yml +++ b/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" diff --git a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS920+.yml b/files/board/arpl/overlayfs/opt/arpl/model-configs/DS920+.yml index ded601d8..b8ed0a34 100644 --- a/files/board/arpl/overlayfs/opt/arpl/model-configs/DS920+.yml +++ b/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: diff --git a/files/board/arpl/overlayfs/opt/arpl/model-configs/DVA1622.yml b/files/board/arpl/overlayfs/opt/arpl/model-configs/DVA1622.yml index 6a11372a..f1fd0890 100644 --- a/files/board/arpl/overlayfs/opt/arpl/model-configs/DVA1622.yml +++ b/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" diff --git a/files/board/arpl/overlayfs/opt/arpl/model-configs/DVA3221.yml b/files/board/arpl/overlayfs/opt/arpl/model-configs/DVA3221.yml index 8489fb09..338d91ed 100644 --- a/files/board/arpl/overlayfs/opt/arpl/model-configs/DVA3221.yml +++ b/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" diff --git a/files/board/arpl/overlayfs/opt/arpl/model-configs/RS4021xs+.yml.disabled b/files/board/arpl/overlayfs/opt/arpl/model-configs/RS4021xs+.yml.disabled index a02e37a4..94f6bd99 100644 --- a/files/board/arpl/overlayfs/opt/arpl/model-configs/RS4021xs+.yml.disabled +++ b/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"