fix something

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

@@ -205,6 +205,73 @@ function _get_fastest() {
   echo "${fastest}"
 }
 
+###############################################################################
+# sort netif name
+# @1 -mac1,mac2,mac3...
+function _sort_netif() {
+  ETHLIST=""
+  ETHX=$(ls /sys/class/net/ | grep eth) # real network cards list
+  for ETH in ${ETHX}; do
+    MAC="$(cat /sys/class/net/${ETH}/address | sed 's/://g' | tr '[:upper:]' '[:lower:]')"
+    BUS=$(ethtool -i ${ETH} | grep bus-info | awk '{print $2}')
+    ETHLIST="${ETHLIST}${BUS} ${MAC} ${ETH}\n"
+  done
+
+  if [ -n "${1}" ]; then
+    MACS=$(echo "${1}" | sed 's/://g' | tr '[:upper:]' '[:lower:]' | tr ',' ' ')
+    ETHLISTTMPC=""
+    ETHLISTTMPF=""
+
+    for MACX in ${MACS}; do
+      ETHLISTTMPC="${ETHLISTTMPC}$(echo -e "${ETHLIST}" | grep "${MACX}")\n"
+    done
+
+    while read -r BUS MAC ETH; do
+      [ -z "${MAC}" ] && continue
+      if echo "${MACS}" | grep -q "${MAC}"; then continue; fi
+      ETHLISTTMPF="${ETHLISTTMPF}${BUS} ${MAC} ${ETH}\n"
+    done <<EOF
+$(echo -e ${ETHLIST} | sort)
+EOF
+    ETHLIST="${ETHLISTTMPC}${ETHLISTTMPF}"
+  else
+    ETHLIST="$(echo -e "${ETHLIST}" | sort)"
+  fi
+  ETHLIST="$(echo -e "${ETHLIST}" | grep -v '^$')"
+
+  echo -e "${ETHLIST}" > /tmp/ethlist
+  # cat /tmp/ethlist
+
+  # sort
+  IDX=0
+  while true; do
+    # cat /tmp/ethlist 
+    [ ${IDX} -ge $(wc -l < /tmp/ethlist) ] && break
+    ETH=$(cat /tmp/ethlist | sed -n "$((${IDX} + 1))p" | awk '{print $3}')
+    # echo "ETH: ${ETH}"
+    if [ -n "${ETH}" ] && [ ! "${ETH}" = "eth${IDX}" ]; then
+      # echo "change ${ETH} <=> eth${IDX}"
+      ip link set dev eth${IDX} down
+      ip link set dev ${ETH} down
+      sleep 1
+      ip link set dev eth${IDX} name tmp
+      ip link set dev ${ETH} name eth${IDX}
+      ip link set dev tmp name ${ETH}
+      sleep 1
+      ip link set dev eth${IDX} up
+      ip link set dev ${ETH} up
+      sleep 1
+      sed -i "s/eth${IDX}/tmp/" /tmp/ethlist
+      sed -i "s/${ETH}/eth${IDX}/" /tmp/ethlist
+      sed -i "s/tmp/${ETH}/" /tmp/ethlist
+      sleep 1
+    fi
+    IDX=$((${IDX} + 1))
+  done
+
+  rm -f /tmp/ethlist
+}
+
 ###############################################################################
 # Find and mount the DSM root filesystem
 # (based on pocopico's TCRP code)

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

@@ -105,6 +105,8 @@ if [ ! -f "${USER_CONFIG_FILE}" ]; then
   writeConfigKey "modules" "{}" "${USER_CONFIG_FILE}"
 fi
 
+# _sort_netif "$(readConfigKey "addons.sortnetif" "${USER_CONFIG_FILE}")"
+
 for ETH in ${ETHX[@]}; do
   MACR="$(cat /sys/class/net/${ETH}/address | sed 's/://g')"
   IPR="$(readConfigKey "network.${MACR}" "${USER_CONFIG_FILE}")"

files/board/arpl/overlayfs/opt/arpl/lang/arpl.pot

@@ -555,7 +555,7 @@ msgid "Checking hash of %s: "
 msgstr ""
 
 #: menu.sh:826
-msgid "md5 Hash of pat not match, try again!"
+msgid "md5 hash of pat not match, Please reget pat data from the version menu and try again!"
 msgstr ""
 
 #: menu.sh:830 menu.sh:933 menu.sh:943

files/board/arpl/overlayfs/opt/arpl/lang/zh_CN.po

@@ -559,8 +559,8 @@ msgid "Checking hash of %s: "
 msgstr "检查 %s 的 hash: "
 
 #: menu.sh:826
-msgid "md5 Hash of pat not match, try again!"
+msgid "md5 hash of pat not match, Please reget pat data from the version menu and try again!"
-msgstr "pat 的 md5 Hash值 不匹配, 请重试!"
+msgstr "pat 的 md5 Hash值 不匹配, 请在版本菜单中重新获取pat数据后重试!"
 
 #: menu.sh:830 menu.sh:933 menu.sh:943
 msgid "OK"

files/board/arpl/overlayfs/opt/arpl/lang/zh_HK.po

@@ -559,8 +559,8 @@ msgid "Checking hash of %s: "
 msgstr "檢查 %s 的 hash: "
 
 #: menu.sh:826
-msgid "md5 Hash of pat not match, try again!"
+msgid "md5 hash of pat not match, Please reget pat data from the version menu and try again!"
-msgstr "pat 的 md5 Hash 不匹配, 請重試!"
+msgstr "pat 的 md5 Hash 不匹配, 請在版本選單中重新獲取pat數據後重試!"
 
 #: menu.sh:830 menu.sh:933 menu.sh:943
 msgid "OK"

files/board/arpl/overlayfs/opt/arpl/lang/zh_TW.po

@@ -821,8 +821,8 @@ msgstr "備份完成。"
 msgid "kernel switching method:"
 msgstr "核心切換的方式:"
 
-msgid "md5 Hash of pat not match, try again!"
+msgid "md5 hash of pat not match, Please reget pat data from the version menu and try again!"
-msgstr "pat 的 md5 雜湊值不相符，請重試！"
+msgstr "pat 的 md5 雜湊值不相符，請在版本選單中重新獲取pat數據後重試！"
 
 msgid "modules"
 msgstr "模組"

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

@@ -823,7 +823,7 @@ function extractDsmFiles() {
   echo -n "$(printf "$(TEXT "Checking hash of %s: ")" "${PAT_FILE}")"
   if [ "$(md5sum ${PAT_PATH} | awk '{print $1}')" != "${PATSUM}" ]; then
     dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Error")" \
-      --msgbox "$(TEXT "md5 Hash of pat not match, try again!")" 0 0
+      --msgbox "$(TEXT "md5 hash of pat not match, Please reget pat data from the version menu and try again!")" 0 0
     rm -f ${PAT_PATH}
     return 1
   fi
@@ -1279,7 +1279,7 @@ function advancedMenu() {
       fi
       (
         for I in ${RESP}; do
-          mkfs.ext4 -T largefile4 "${I}"
+          echo y | mkfs.ext4 -T largefile4 "${I}" 2>&1
         done
       ) | dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Advanced")" \
         --progressbox "$(TEXT "Formatting ...")" 20 70

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

@@ -0,0 +1,69 @@
+id: "HD6500"
+synoinfo: &synoinfo
+  support_disk_compatibility: "no"
+  support_memory_compatibility: "no"
+  support_led_brightness_adjustment: "no"
+  support_syno_hybrid_raid:
+  supportraidgroup:
+  maxlanport: "8"
+  netif_seq: "0 1 2 3 4 5 6 7"
+  buzzeroffen: "0xffff"
+cmdline: &cmdline
+  synoboot2:
+  SMBusHddDynamicPower: 1
+  vender_format_version: 2
+  syno_ttyS0: "serial,0x3f8"
+  syno_ttyS1: "serial,0x2f8"
+  elevator: elevator
+patch: &patch
+  - "ramdisk-etc-rc-*.patch"
+  - "ramdisk-init-script-v4-*.patch"
+  - "ramdisk-post-init-script-*.patch"
+  - "ramdisk-disable-root-pwd-*.patch"
+platform: "purley"
+unique: "synology_purley_hd6500"
+serial:
+  prefix:
+    - "0000"
+  middle: "XXX"
+  suffix: "numeric"
+dom: 2
+dt: true
+disks: 24
+beta: true
+productvers:
+  "6.2":
+    kver: "4.4.59"
+    rd-compressed: false
+    cmdline:
+      <<: *cmdline
+    synoinfo:
+      <<: *synoinfo
+    patch: *patch
+
+  "7.0":
+    kver: "4.4.180"
+    rd-compressed: false
+    cmdline:
+      <<: *cmdline
+    synoinfo:
+      <<: *synoinfo
+    patch: *patch
+
+  "7.1":
+    kver: "4.4.180"
+    rd-compressed: false
+    cmdline:
+      <<: *cmdline
+    synoinfo:
+      <<: *synoinfo
+    patch: *patch
+
+  "7.2":
+    kver: "4.4.302"
+    rd-compressed: false
+    cmdline:
+      <<: *cmdline
+    synoinfo:
+      <<: *synoinfo
+    patch: *patch

guide.md

@@ -186,23 +186,28 @@
 * log:
   ```
   # 驱动相关
-  lsmod                                            # 查看已加载驱动  
+  lsmod                                            # 查看已加载驱动
-  ls -ld /sys/class/net/*/device/driver            # 查看已加载网卡和对应驱动  
+  ls -ld /sys/class/net/*/device/driver            # 查看已加载网卡和对应驱动
   cat /sys/class/net/*/address                     # 查看已加载网卡的MAC地址
 
-  # 磁盘相关   
+  # 磁盘相关
-  fdisk -l                                         # 查看硬盘信息 
+  fdisk -l                                         # 查看硬盘信息
-  ls /sys/block/                                   # 查看块设备  
+  lspci -d ::106                                   # 查看 ATA 控制器
-  ls /sys/block/sd*                                # 查看识别的 sata 硬盘 (非设备树(dtb)的型号)    
+  lspci -d ::107                                   # 查看 HBA 控制器
-  ls /sys/block/sata*                              # 查看识别的 sata 硬盘  (设备树(dtb)的型号)  
+  ls -l /sys/class/scsi_host                       # 查看硬盘 host 信息
-  ls /sys/block/nvme*                              # 查看识别的 nvme 硬盘  
+  ls /sys/block/                                   # 查看块设备
+  ls /sys/block/sd*                                # 查看识别的 sata 硬盘 (非设备树(dtb)的型号)
+  ls /sys/block/sata*                              # 查看识别的 sata 硬盘  (设备树(dtb)的型号)
+  ls /sys/block/nvme*                              # 查看识别的 nvme 硬盘
   cat /sys/block/sd*/device/syno_block_info        # 查看识别的 sata 硬盘挂载点 (非设备树(dtb)的型号)  
-  cat /sys/block/sata*/device/syno_block_info      # 查看识别的 sata 硬盘挂载点 (设备树(dtb)的型号)  
+  cat /sys/block/sata*/device/syno_block_info      # 查看识别的 sata 硬盘挂载点 (设备树(dtb)的型号)
-  cat /sys/block/nvme*/device/syno_block_info      # 查看识别的 nvme 硬盘挂载点  
+  cat /sys/block/nvme*/device/syno_block_info      # 查看识别的 nvme 硬盘挂载点
 
+  # 服务相关
   systemctl                                        # 查看服务  
+  netstat -tunlp                                   # 查看端口  
 
-  # 日志相关   
+  # 日志相关
   dmesg                                            # 内核日志
   cat /proc/cmdlime                                # 引导参数
   cat /var/log/linuxrc.syno.log                    # 引导态下启动日志