fix getmodels on TimeError

.github/workflows/data.yml

@@ -77,7 +77,7 @@ jobs:
         if: success()
         uses: actions/upload-artifact@v4
         with:
-          name: addons
+          name: docs
           path: |
             docs/*.json
             docs/*.xlsx

VERSION

@@ -1 +1 @@
-24.5.6
+24.6.0

files/initrd/opt/rr/boot.sh

@@ -216,7 +216,6 @@ else
   echo "$(TEXT "Waiting IP.")"
   for N in ${ETHX}; do
     COUNT=0
-    /etc/init.d/S41dhcpcd restart >/dev/null 2>&1 || true
     DRIVER=$(ls -ld /sys/class/net/${N}/device/driver 2>/dev/null | awk -F '/' '{print $NF}')
     echo -en "${N}(${DRIVER}): "
     while true; do

files/initrd/opt/rr/include/consts.sh

@@ -1,4 +1,4 @@
-RR_VERSION="24.5.6"
+RR_VERSION="24.6.0"
 RR_RELEASE=""
 RR_TITLE="RR v${RR_VERSION}"
 

files/initrd/opt/rr/include/functions.py

@@ -99,7 +99,7 @@ def getmodels(platforms=None):
     """
     Get Syno Models.
     """
-    import json, requests
+    import json, requests, urllib3
     from requests.adapters import HTTPAdapter
     from requests.packages.urllib3.util.retry import Retry # type: ignore
 
@@ -107,7 +107,8 @@ def getmodels(platforms=None):
     session = requests.Session()
     session.mount('http://', adapter)
     session.mount('https://', adapter)
-
+    urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
+    
     if platforms is not None and platforms != "":
         PS = platforms.lower().replace(",", " ").split()
     else:
@@ -116,7 +117,7 @@ def getmodels(platforms=None):
     models = []
     if len(models) == 0:
         try:
-            req = session.get("https://autoupdate.synology.com/os/v2", timeout=10)
+            req = session.get("https://autoupdate.synology.com/os/v2", timeout=10, verify=False)
             req.encoding = "utf-8"
             data = json.loads(req.text)
 
@@ -143,7 +144,7 @@ def getmodels(platforms=None):
             from bs4 import BeautifulSoup
             #url="https://kb.synology.com/en-us/DSM/tutorial/What_kind_of_CPU_does_my_NAS_have"
             url="https://kb.synology.cn/zh-cn/DSM/tutorial/What_kind_of_CPU_does_my_NAS_have"
-            req = session.get(url, timeout=10)
+            req = session.get(url, timeout=10, verify=False)
             req.encoding = "utf-8"
             bs = BeautifulSoup(req.text, "html.parser")
             p = re.compile(r"data: (.*?),$", re.MULTILINE | re.DOTALL)

files/initrd/opt/rr/init.sh

@@ -77,8 +77,9 @@ if [ -f "${PART2_PATH}/GRUB_VER" ]; then
 fi
 
 if [ ! "LOCALBUILD" = "${LOADER_DISK}" ]; then
-  _sort_netif "$(readConfigKey "addons.sortnetif" "${USER_CONFIG_FILE}")"
-
+  if arrayExistItem "sortnetif:" $(readConfigMap "addons" "${USER_CONFIG_FILE}"); then
+    _sort_netif "$(readConfigKey "addons.sortnetif" "${USER_CONFIG_FILE}")"
+  fi
   for ETH in ${ETHX}; do
     [ "${ETH::4}" = "wlan" ] && connectwlanif "${ETH}" && sleep 1
     MACR="$(cat /sys/class/net/${ETH}/address 2>/dev/null | sed 's/://g')"
@@ -165,7 +166,6 @@ done
 echo "$(TEXT "Waiting IP.")"
 for N in ${ETHX}; do
   COUNT=0
-  /etc/init.d/S41dhcpcd restart >/dev/null 2>&1 || true
   DRIVER=$(ls -ld /sys/class/net/${N}/device/driver 2>/dev/null | awk -F '/' '{print $NF}')
   echo -en "${N}(${DRIVER}): "
   while true; do

files/initrd/opt/rr/menu.sh

@@ -986,6 +986,7 @@ function synoinfoMenu() {
     a)
       MSG=""
       MSG+="$(TEXT "Commonly used synoinfo:\n")"
+      MSG+="$(TEXT " * \Z4support_apparmor=no\Zn\n    Disable apparmor.\n")"
       MSG+="$(TEXT " * \Z4maxdisks=??\Zn\n    Maximum number of disks supported.\n")"
       MSG+="$(TEXT " * \Z4internalportcfg=0x????\Zn\n    Internal(sata) disks mask(Not apply to DT models).\n")"
       MSG+="$(TEXT " * \Z4esataportcfg=0x????\Zn\n    Esata disks mask(Not apply to DT models).\n")"

files/initrd/opt/rr/platforms.yml

@@ -12,6 +12,9 @@ synoinfo: &synoinfo
   support_syno_hybrid_raid: "no"
   supportraidgroup: "no"
   HddEnableDynamicPower: "yes"
+  enableRCPower: "yes"
+  support_fan: "no"
+  supportadt7490: "no"
   maxlanport: "8"
   netif_seq: "0 1 2 3 4 5 6 7"
   buzzeroffen: "0xffff"

files/mnt/p1/RR_VERSION

@@ -1 +1 @@
-24.5.6
+24.6.0