Merge pull request #4720 from AuxXxilium/dev

Dev

.github/workflows/autobuild.yml

@@ -236,7 +236,8 @@ jobs:
               - Development Build
 
             ### Information:
-              - Full Changelog and Arc Patch (Decryption Key) are available in my Discord.
+              - Full Changelog is available in my Discord
+              - Discord Account for Arc Patch needed
 
             ### Dependencies:
               - Addons: ${{ env.ADDONTAG }}

.github/workflows/build.yml

@@ -270,7 +270,8 @@ jobs:
               - ${{ inputs.notice }}
 
             ### Information:
-              - Full Changelog and Arc Patch (Decryption Key) are available in my Discord.
+              - Full Changelog is available in my Discord
+              - Discord Account for Arc Patch needed
 
             ### Versions:
               - stable: Stable Image (Full Image, all dependencies are included, less hardware support)

files/initrd/opt/arc/arc-functions.sh

@@ -828,13 +828,14 @@ function backupMenu() {
           dialog --backtitle "$(backtitle)" --title "Online Restore" --msgbox "Online Restore successful!" 5 40
         else
           dialog --backtitle "$(backtitle)" --title "Online Restore" --msgbox "Online Restore failed!" 5 40
-          mv -f "${USER_CONFIG_FILE}.bak" "${USER_CONFIG_FILE}"
+          [ -f "${USER_CONFIG_FILE}.bak" ] && mv -f "${USER_CONFIG_FILE}.bak" "${USER_CONFIG_FILE}"
         fi
         ;;
       5)
         if [ -f "${USER_CONFIG_FILE}" ]; then
           HWID="$(genHWID)"
-          if curl -sk -X POST -F "file=@${USER_CONFIG_FILE}" "https://arc.auxxxilium.tech?cup=${HWID}&userid=${USERID}"; then
+          curl -sk -X POST -F "file=@${USER_CONFIG_FILE}" "https://arc.auxxxilium.tech?cup=${HWID}&userid=${USERID}" 2>/dev/null
+          if [ $? -eq 0 ]; then
             dialog --backtitle "$(backtitle)" --title "Online Backup" --msgbox "Online Backup successful!" 5 40
           else
             dialog --backtitle "$(backtitle)" --title "Online Backup" --msgbox "Online Backup failed!" 5 40
@@ -857,7 +858,7 @@ function updateMenu() {
       --menu "Choose an Option" 0 0 0 \
       1 "Update Loader \Z1(no reflash)\Zn" \
       2 "Update Dependencies" \
-      3 "Update Arc Patch" \
+      3 "Update Configs and Arc Patch" \
       4 "Switch Arc Branch: \Z1${ARC_BRANCH}\Zn" \
       2>"${TMP_PATH}/resp"
     [ $? -ne 0 ] && break
@@ -885,9 +886,10 @@ function updateMenu() {
         updateLoader "${TAG}"
         ;;
       2)
-        updateDependencies
+        dependenciesUpdate
         ;;
       3)
+        updateConfigs
         checkHardwareID
         ;;
       4)
@@ -947,8 +949,8 @@ function sysinfo() {
   CPU="$(cat /proc/cpuinfo 2>/dev/null | grep 'model name' | uniq | awk -F':' '{print $2}')"
   SECURE=$(dmesg 2>/dev/null | grep -i "Secure Boot" | awk -F'] ' '{print $2}')
   VENDOR=$(dmesg 2>/dev/null | grep -i "DMI:" | head -1 | sed 's/\[.*\] DMI: //i')
-  ETHX="$(ls /sys/class/net 2>/dev/null | grep eth)"
-  ETHN="$(echo ${ETHX} | wc -w)"
+  ETHX=$(ip -o link show | awk -F': ' '{print $2}' | grep eth)
+  ETHN=$(echo ${ETHX} | wc -w)
   ARC_BRANCH="$(readConfigKey "arc.branch" "${USER_CONFIG_FILE}")"
   CONFDONE="$(readConfigKey "arc.confdone" "${USER_CONFIG_FILE}")"
   BUILDDONE="$(readConfigKey "arc.builddone" "${USER_CONFIG_FILE}")"
@@ -1008,15 +1010,15 @@ function sysinfo() {
   TEXT+="\n  Bootdisk: \Zb${LOADER_DISK}\Zn"
   TEXT+="\n"
   TEXT+="\n\Z4> Network: ${ETHN} NIC\Zn"
-  for ETH in ${ETHX}; do
+  for N in ${ETHX}; do
     COUNT=0
-    DRIVER=$(ls -ld /sys/class/net/${ETH}/device/driver 2>/dev/null | awk -F '/' '{print $NF}')
+    DRIVER=$(ls -ld /sys/class/net/${N}/device/driver 2>/dev/null | awk -F '/' '{print $NF}')
     while true; do
-      if ! ip link show ${ETH} 2>/dev/null | grep -q 'UP'; then
+      if [ -z "$(cat /sys/class/net/${N}/carrier 2>/dev/null)" ]; then
         TEXT+="\n${DRIVER}: \ZbDOWN\Zn"
         break
       fi
-      if ethtool ${ETH} 2>/dev/null | grep 'Link detected' | grep -q 'no'; then
+      if [ "0" = "$(cat /sys/class/net/${N}/carrier 2>/dev/null)" ]; then
         TEXT+="\n${DRIVER}: \ZbNOT CONNECTED\Zn"
         break
       fi
@@ -1025,9 +1027,9 @@ function sysinfo() {
         break
       fi
       COUNT=$((${COUNT} + 1))
-      IP="$(getIP ${ETH})"
+      IP="$(getIP ${N})"
       if [ -n "${IP}" ]; then
-        SPEED=$(ethtool ${ETH} 2>/dev/null | grep "Speed:" | awk '{print $2}')
+        SPEED=$(ethtool ${N} 2>/dev/null | grep "Speed:" | awk '{print $2}')
         if [[ "${IP}" =~ ^169\.254\..* ]]; then
           TEXT+="\n$   {DRIVER} (${SPEED}): \ZbLINK LOCAL (No DHCP server found.)\Zn"
         else
@@ -1227,7 +1229,8 @@ function getCMDline () {
 function uploadDiag () {
   if [ -f "${TMP_PATH}/sysinfo.yml" ]; then
     HWID="$(genHWID)"
-    if curl -sk -X POST -F "file=@${TMP_PATH}/sysinfo.yml" "https://arc.auxxxilium.tech?sysinfo=${HWID}&userid=${USERID}"; then
+    curl -sk -X POST -F "file=@${TMP_PATH}/sysinfo.yml" "https://arc.auxxxilium.tech?sysinfo=${HWID}&userid=${USERID}" 2>/dev/null
+    if [ $? -eq 0 ]; then
       dialog --backtitle "$(backtitle)" --title "Sysinfo Upload" --msgbox "Your Code: ${HWID}" 5 40
     else
       dialog --backtitle "$(backtitle)" --title "Sysinfo Upload" --msgbox "Failed to upload diag file!" 0 0
@@ -1242,22 +1245,22 @@ function uploadDiag () {
 # Shows Networkdiag to user
 function networkdiag() {
   (
-  ETHX="$(ls /sys/class/net 2>/dev/null | grep eth)"
-  for ETH in ${ETHX}; do
+  ETHX=$(ip -o link show | awk -F': ' '{print $2}' | grep eth)
+  for N in ${ETHX}; do
     echo
-    DRIVER=$(ls -ld /sys/class/net/${ETH}/device/driver 2>/dev/null | awk -F '/' '{print $NF}')
-    echo -e "Interface: ${ETH} (${DRIVER})"
-    if ethtool ${ETH} 2>/dev/null | grep 'Link detected' | grep -q 'no'; then
+    DRIVER=$(ls -ld /sys/class/net/${N}/device/driver 2>/dev/null | awk -F '/' '{print $NF}')
+    echo -e "Interface: ${N} (${DRIVER})"
+    if [ "0" = "$(cat /sys/class/net/${N}/carrier 2>/dev/null)" ]; then
       echo -e "Link: NOT CONNECTED"
       continue
     fi
-    if ! ip link show ${ETH} 2>/dev/null | grep -q 'UP'; then
+    if [ -z "$(cat /sys/class/net/${N}/carrier 2>/dev/null)" ]; then
       echo -e "Link: DOWN"
       continue
     fi
     echo -e "Link: CONNECTED"
-    addr=$(getIP ${ETH})
-    netmask=$(ifconfig ${ETH} | grep inet | grep 255 | awk '{print $4}' | cut -f2 -d':')
+    addr=$(getIP ${N})
+    netmask=$(ifconfig ${N} | grep inet | grep 255 | awk '{print $4}' | cut -f2 -d':')
     echo -e "IP Address: ${addr}"
     echo -e "Netmask: ${netmask}"
     echo
@@ -1278,14 +1281,21 @@ function networkdiag() {
         fi
       done
       echo
-      GITHUBAPI=$(curl --interface ${ETH} -skL "https://api.github.com/repos/AuxXxilium/arc/releases" | jq -r ".[].tag_name" | grep -v "dev" | sort -rV | head -1 2>/dev/null)
+      HWID="$(genHWID)"
+      USERIDAPI="$(curl --interface ${N} -skL -m 10 "https://arc.auxxxilium.tech?hwid=${HWID}" 2>/dev/null)"
+      if [[ $? -ne 0 || -z "${USERIDAPI}" ]]; then
+        echo -e "Arc UserID API not reachable!"
+      else
+        echo -e "Arc UserID API reachable! (${USERIDAPI})"
+      fi
+      GITHUBAPI=$(curl --interface ${N} -skL -m 10 "https://api.github.com/repos/AuxXxilium/arc/releases" | jq -r ".[].tag_name" | grep -v "dev" | sort -rV | head -1 2>/dev/null)
       if [[ $? -ne 0 || -z "${GITHUBAPI}" ]]; then
         echo -e "Github API not reachable!"
       else
         echo -e "Github API reachable!"
       fi
       if [ "${CONFDONE}" == "true" ]; then
-        SYNOAPI=$(curl --interface ${ETH} -m 5 -skL "https://www.synology.com/api/support/findDownloadInfo?lang=en-us&product=${MODEL/+/%2B}&major=${PRODUCTVER%%.*}&minor=${PRODUCTVER##*.}" | jq -r '.info.system.detail[0].items[0].files[0].url')
+        SYNOAPI=$(curl --interface ${N} -skL -m 10 "https://www.synology.com/api/support/findDownloadInfo?lang=en-us&product=${MODEL/+/%2B}&major=${PRODUCTVER%%.*}&minor=${PRODUCTVER##*.}" | jq -r '.info.system.detail[0].items[0].files[0].url')
         if [[ $? -ne 0 || -z "${SYNOAPI}" ]]; then
           echo -e "Syno API not reachable!"
         else
@@ -1337,15 +1347,16 @@ function credits() {
 }
 
 ###############################################################################
-# allow setting Static IP for Loader
+# Setting Static IP for Loader
 function staticIPMenu() {
-  ETHX="$(ls /sys/class/net 2>/dev/null | grep eth)"
-  for ETH in ${ETHX}; do
-    MACR="$(cat /sys/class/net/${ETH}/address 2>/dev/null | sed 's/://g' | tr '[:lower:]' '[:upper:]')"
+  ETHX=$(ip -o link show | awk -F': ' '{print $2}' | grep -v lo)
+  IPCON=""
+  for N in ${ETHX}; do
+    MACR="$(cat /sys/class/net/${N}/address 2>/dev/null | sed 's/://g')"
     IPR="$(readConfigKey "network.${MACR}" "${USER_CONFIG_FILE}")"
     IFS='/' read -r -a IPRA <<<"${IPR}"
 
-    MSG="$(printf "Set to %s: (Delete if empty)" "${ETH}(${MACR})")"
+    MSG="Set ${N}(${MACR}) IP to: (Delete if empty)"
     while true; do
       dialog --backtitle "$(backtitle)" --title "StaticIP" \
         --form "${MSG}" 10 60 4 "address" 1 1 "${IPRA[0]}" 1 9 36 16 "netmask" 2 1 "${IPRA[1]}" 2 9 36 16 "gateway" 3 1 "${IPRA[2]}" 3 9 36 16 "dns" 4 1 "${IPRA[3]}" 4 9 36 16 \
@@ -1353,19 +1364,42 @@ function staticIPMenu() {
       RET=$?
       case ${RET} in
       0) # ok-button
-        dialog --backtitle "$(backtitle)" --title "StaticIP" \
-          --infobox "Setting IP ..." 3 25
         address="$(cat "${TMP_PATH}/resp" | sed -n '1p')"
         netmask="$(cat "${TMP_PATH}/resp" | sed -n '2p')"
         gateway="$(cat "${TMP_PATH}/resp" | sed -n '3p')"
         dnsname="$(cat "${TMP_PATH}/resp" | sed -n '4p')"
-        if [ -z "${address}" ]; then
-          deleteConfigKey "network.${MACR}" "${USER_CONFIG_FILE}"
-        else
-          writeConfigKey "network.${MACR}" "${address}/${netmask}/${gateway}/${dnsname}" "${USER_CONFIG_FILE}"
-        fi
-        writeConfigKey "arc.builddone" "false" "${USER_CONFIG_FILE}"
-        BUILDDONE="$(readConfigKey "arc.builddone" "${USER_CONFIG_FILE}")"
+        (
+          if [ -z "${address}" ]; then
+            if [ -n "$(readConfigKey "network.${MACR}" "${USER_CONFIG_FILE}")" ]; then
+              if [ "1" = "$(cat /sys/class/net/${N}/carrier 2>/dev/null)" ]; then
+                ip addr flush dev ${N}
+              fi
+              deleteConfigKey "network.${MACR}" "${USER_CONFIG_FILE}"
+              IP="$(getIP)"
+              [ -z "${IPCON}" ] && IPCON="${IP}"
+              sleep 1
+            fi
+          else
+            if [ "1" = "$(cat /sys/class/net/${N}/carrier 2>/dev/null)" ]; then
+              ip addr flush dev ${N}
+              ip addr add ${address}/${netmask:-"255.255.255.0"} dev ${N}
+              if [ -n "${gateway}" ]; then
+                ip route add default via ${gateway} dev ${N}
+              fi
+              if [ -n "${dnsname:-${gateway}}" ]; then
+                sed -i "/nameserver ${dnsname:-${gateway}}/d" /etc/resolv.conf
+                echo "nameserver ${dnsname:-${gateway}}" >>/etc/resolv.conf
+              fi
+            fi
+            writeConfigKey "network.${MACR}" "${address}/${netmask}/${gateway}/${dnsname}" "${USER_CONFIG_FILE}"
+            IP="$(getIP)"
+            [ -z "${IPCON}" ] && IPCON="${IP}"
+            sleep 1
+          fi
+          writeConfigKey "arc.builddone" "false" "${USER_CONFIG_FILE}"
+          BUILDDONE="$(readConfigKey "arc.builddone" "${USER_CONFIG_FILE}")"
+        ) 2>&1 | dialog --backtitle "$(backtitle)" --title "StaticIP" \
+          --progressbox "Setting IP ..." 20 100
         break
         ;;
       1) # cancel-button
@@ -1376,28 +1410,6 @@ function staticIPMenu() {
         ;;
       esac
     done
-    sleep 1
-  done
-  IPCON=""
-  dialog --backtitle "$(backtitle)" --title "StaticIP" \
-    --infobox "Restart Network ..." 3 25
-  for ETH in ${ETHX}; do
-    MACR="$(cat /sys/class/net/${ETH}/address 2>/dev/null | sed 's/://g' | tr '[:lower:]' '[:upper:]')"
-    IPR="$(readConfigKey "network.${MACR}" "${USER_CONFIG_FILE}")"
-    if [ -n "${IPR}" ]; then
-      IFS='/' read -r -a IPRA <<<"${IPR}"
-      ip addr flush dev ${ETH}
-      ip addr add ${IPRA[0]}/${IPRA[1]:-"255.255.255.0"} dev ${ETH}
-      [ -z "${IPCON}" ] && IPCON="${IPRA[0]}"
-      if [ -n "${IPRA[2]}" ]; then
-        ip route add default via ${IPRA[2]} dev ${ETH}
-      fi
-      if [ -n "${IPRA[3]:-${IPRA[2]}}" ]; then
-        sed -i "/nameserver ${IPRA[3]:-${IPRA[2]}}/d" /etc/resolv.conf
-        echo "nameserver ${IPRA[3]:-${IPRA[2]}}" >>/etc/resolv.conf
-      fi
-      sleep 1
-    fi
   done
 }
 
@@ -1491,11 +1503,8 @@ function resetPassword() {
     for I in ${DSMROOTS}; do
       mount -t ext4 "${I}" "${TMP_PATH}/mdX"
       [ $? -ne 0 ] && continue
-      OLDPASSWD="$(cat "${TMP_PATH}/mdX/etc/shadow" 2>/dev/null | grep "^${USER}:" | awk -F ':' '{print $2}')"
-      if [ -n "${NEWPASSWD}" -a -n "${OLDPASSWD}" ]; then
-        sed -i "s|${OLDPASSWD}|${NEWPASSWD}|g" "${TMP_PATH}/mdX/etc/shadow"
-        sed -i "/^${USER}:/ s/\([^:]*\):\([^:]*\):\([^:]*\):\([^:]*\):\([^:]*\):\([^:]*\):\([^:]*\):\([^:]*\):\([^:]*\)/\1:\2:\3:\4:\5:\6:\7::\9/" "${TMP_PATH}/mdX/etc/shadow"
-      fi
+      sed -i "s|^${USER}:[^:]*|${USER}:${NEWPASSWD}|" "${TMP_PATH}/mdX/etc/shadow"
+      sed -i "/^${USER}:/ s/^\(${USER}:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:\)[^:]*:/\1:/" "${TMP_PATH}/mdX/etc/shadow"
       sed -i "s|status=on|status=off|g" "${TMP_PATH}/mdX/usr/syno/etc/packages/SecureSignIn/preference/${USER}/method.config" 2>/dev/null
       sync
       umount "${TMP_PATH}/mdX"
@@ -1609,17 +1618,6 @@ function loaderPorts() {
     RET=$?
     case ${RET} in
     0) # ok-button
-      function check_port() {
-        if [ -z "${1}" ]; then
-          return 0
-        else
-          if [[ "${1}" =~ ^[0-9]+$ ]] && [ "${1}" -ge 0 ] && [ "${1}" -le 65535 ]; then
-            return 0
-          else
-            return 1
-          fi
-        fi
-      }
       HTTPPORT=$(sed -n '1p' "${TMP_PATH}/resp")
       DUFSPORT=$(sed -n '2p' "${TMP_PATH}/resp")
       TTYDPORT=$(sed -n '3p' "${TMP_PATH}/resp")
@@ -1631,9 +1629,9 @@ function loaderPorts() {
         [ $? -eq 0 ] && continue || break
       fi
       rm -f "/etc/arc.conf"
-      [ ! "${HTTPPORT:-8080}" = "8080" ] && echo "HTTP_PORT=${HTTPPORT}" >>"/etc/arc.conf" && /etc/init.d/S90thttpd restart >/dev/null 2>&1
-      [ ! "${DUFSPORT:-7304}" = "7304" ] && echo "DUFS_PORT=${DUFSPORT}" >>"/etc/arc.conf" && /etc/init.d/S99dufs restart >/dev/null 2>&1
-      [ ! "${TTYDPORT:-7681}" = "7681" ] && echo "TTYD_PORT=${TTYDPORT}" >>"/etc/arc.conf" && /etc/init.d/S99ttyd restart >/dev/null 2>&1
+      if [ ! "${HTTPPORT:-8080}" = "8080" ]; then echo "HTTP_PORT=${HTTPPORT}" >>"/etc/arc.conf"; /etc/init.d/S90thttpd restart >/dev/null 2>&1; fi
+      if [ ! "${DUFSPORT:-7304}" = "7304" ]; then echo "DUFS_PORT=${DUFSPORT}" >>"/etc/arc.conf"; /etc/init.d/S99dufs restart >/dev/null 2>&1; fi
+      if [ ! "${TTYDPORT:-7681}" = "7681" ]; then echo "TTYD_PORT=${TTYDPORT}" >>"/etc/arc.conf"; /etc/init.d/S99ttyd restart >/dev/null 2>&1; fi
       RDXZ_PATH="${TMP_PATH}/rdxz_tmp"
       rm -rf "${RDXZ_PATH}"
       mkdir -p "${RDXZ_PATH}"
@@ -2003,7 +2001,7 @@ function rebootMenu() {
   dialog --backtitle "$(backtitle)" --title "Power Menu" \
     --infobox "Option: ${REDEST} selected ...!" 3 50
   if [ "${REDEST}" == "poweroff" ]; then
-    exec poweroff
+    poweroff
     exit 0
   elif [ "${REDEST}" == "shell" ]; then
     clear
@@ -2221,7 +2219,7 @@ function getpatfiles() {
       --infobox "Downloading DSM Boot Files..." 3 40
     # Get new Files
     DSM_URL="https://raw.githubusercontent.com/AuxXxilium/arc-dsm/main/files/${MODEL/+/%2B}/${PRODUCTVER}/${PAT_HASH}.tar"
-    if curl -skL "${DSM_URL}" -o "${DSM_FILE}"; then
+    if curl -skL "${DSM_URL}" -o "${DSM_FILE}" 2>/dev/null; then
       VALID="true"
     fi
   elif [ ! -f "${DSM_FILE}" ] && [ "${ARCOFFLINE}" == "true" ]; then
@@ -2256,28 +2254,31 @@ function getpatfiles() {
 # Generate HardwareID
 function genHardwareID() {
   HWID="$(genHWID)"
-  if [ -n "${HWID}" ]; then
-    USERID="$(curl -skL "https://arc.auxxxilium.tech?hwid=${HWID}")"
-    if echo "${USERID}" | grep -vq "Hardware ID"; then
-      dialog --backtitle "$(backtitle)" --title "HardwareID" \
-        --msgbox "HardwareID: ${HWID}\nYour HardwareID is registered to UserID: ${USERID}!" 6 70
-      writeConfigKey "arc.hwid" "${HWID}" "${USER_CONFIG_FILE}"
-      writeConfigKey "arc.userid" "${USERID}" "${USER_CONFIG_FILE}"
+  while true; do
+    if [ -n "${HWID}" ]; then
+      USERID="$(curl -skL -m 10 "https://arc.auxxxilium.tech?hwid=${HWID}" 2>/dev/null)"
+      if echo "${USERID}" | grep -vq "Hardware ID"; then
+        dialog --backtitle "$(backtitle)" --title "HardwareID" \
+          --msgbox "HardwareID: ${HWID}\nYour HardwareID is registered to UserID: ${USERID}!" 6 70
+        writeConfigKey "arc.hwid" "${HWID}" "${USER_CONFIG_FILE}"
+        writeConfigKey "arc.userid" "${USERID}" "${USER_CONFIG_FILE}"
+        break
+      else
+        dialog --backtitle "$(backtitle)" --title "HardwareID" \
+          --yes-label "Retry" --no-label "Cancel" --yesno "HardwareID: ${HWID}\nRegister your HardwareID on\nhttps://arc.auxxxilium.tech (Discord Account needed).\nPress Retry after you registered it." 8 60
+        [ $? -ne 0 ] && USERID="" && break
+        writeConfigKey "arc.hwid" "" "${USER_CONFIG_FILE}"
+        writeConfigKey "arc.userid" "" "${USER_CONFIG_FILE}"
+      fi
     else
       dialog --backtitle "$(backtitle)" --title "HardwareID" \
-      --yes-label "Retry" --no-label "Cancel" --yesno "HardwareID: ${HWID}\nRegister your HardwareID on\nhttps://arc.auxxxilium.tech (Discord Account needed)." 8 60
-      [ $? -ne 0 ] && USERID="" && return 1
+        --msgbox "HardwareID: ID Generation failed!" 6 50
+      USERID=""
       writeConfigKey "arc.hwid" "" "${USER_CONFIG_FILE}"
       writeConfigKey "arc.userid" "" "${USER_CONFIG_FILE}"
-      genHardwareID
+      break
     fi
-  else
-    dialog --backtitle "$(backtitle)" --title "HardwareID" \
-      --msgbox "HardwareID: Verification failed!" 6 50
-    USERID=""
-    writeConfigKey "arc.hwid" "" "${USER_CONFIG_FILE}"
-    writeConfigKey "arc.userid" "" "${USER_CONFIG_FILE}"
-  fi
+  done
   return
 }
 
@@ -2285,21 +2286,27 @@ function genHardwareID() {
 # Check HardwareID
 function checkHardwareID() {
   HWID="$(genHWID)"
-  USERID="$(curl -skL "https://arc.auxxxilium.tech?hwid=${HWID}")"
+  USERID="$(curl -skL -m 10 "https://arc.auxxxilium.tech?hwid=${HWID}" 2>/dev/null)"
   if echo "${USERID}" | grep -vq "Hardware ID"; then
-    writeConfigKey "arc.hwid" "${HWID}" "${USER_CONFIG_FILE}"
-    writeConfigKey "arc.userid" "${USERID}" "${USER_CONFIG_FILE}"
-    if [ -n "${USERID}" ] && [ -n "${HWID}" ]; then
-      cp -f "${S_FILE}" "${S_FILE}.bak"
-      curl -skL "https://arc.auxxxilium.tech?hwid=${HWID}&userid=${USERID}" > "${S_FILE}"
+    cp -f "${S_FILE}" "${S_FILE}.bak"
+    if curl -skL -m 10 "https://arc.auxxxilium.tech?hwid=${HWID}&userid=${USERID}" -o "${S_FILE}" 2>/dev/null; then
+      writeConfigKey "arc.hwid" "${HWID}" "${USER_CONFIG_FILE}"
+      writeConfigKey "arc.userid" "${USERID}" "${USER_CONFIG_FILE}"
+    else
+      dialog --backtitle "$(backtitle)" --title "HardwareID" \
+        --infobox "HardwareID: Your HardwareID couldn't be verified!" 4 50
+      sleep 3
+      USERID=""
+      writeConfigKey "arc.hwid" "" "${USER_CONFIG_FILE}"
+      writeConfigKey "arc.userid" "" "${USER_CONFIG_FILE}"
     fi
   else
+    dialog --backtitle "$(backtitle)" --title "HardwareID" \
+      --infobox "HardwareID: Your HardwareID isn't registered!" 4 50
+    sleep 3
+    USERID=""
     writeConfigKey "arc.hwid" "" "${USER_CONFIG_FILE}"
     writeConfigKey "arc.userid" "" "${USER_CONFIG_FILE}"
-    dialog --backtitle "$(backtitle)" --title "HardwareID" \
-      --infobox "Couldn't verify your HardwareID!\nArc Patch not enabled!" 6 40
-    cp -f "${S_FILE}.bak" "${S_FILE}"
-    sleep 3
   fi
   return
 }

files/initrd/opt/arc/arc.sh

@@ -89,11 +89,14 @@ function backtitlep() {
 # Model Selection
 function arcModel() {
   STEP="model"
-  dialog --backtitle "$(backtitlep)" --title "Model" \
-    --infobox "Reading Models..." 3 25
   if [ ! -f "${S_FILE}" ] || [ ! -f "${P_FILE}" ]; then
     updateConfigs
   fi
+  # Check for Hardware ID
+  checkHardwareID
+  dialog --backtitle "$(backtitlep)" --title "Model" \
+    --infobox "Reading Models..." 3 25
+  ARCCONF="$(readConfigKey "${MODEL:-SA6400}.serial" "${S_FILE}")"
   # Loop menu
   RESTRICT=1
   PS="$(readConfigEntriesArray "platforms" "${P_FILE}" | sort)"
@@ -151,14 +154,15 @@ function arcModel() {
         fi
         [ -n "$(grep -w "${M}" "${S_FILE}")" ] && BETA="Arc" || BETA="Syno"
         [ -z "$(grep -w "${A}" "${P_FILE}")" ] && COMPATIBLE=0
-        if [ -n "${ARCKEY}" ]; then
+        if [ -n "${ARCCONF}" ]; then
           [ ${COMPATIBLE} -eq 1 ] && echo -e "${M} \"\t$(printf "\Zb%-15s\Zn \Zb%-5s\Zn \Zb%-5s\Zn \Zb%-12s\Zn \Zb%-5s\Zn \Zb%-10s\Zn \Zb%-12s\Zn \Zb%-10s\Zn \Zb%-10s\Zn" "${A}" "${DTS}" "${ARC}" "${IGPUS}" "${HBAS}" "${M_2_CACHE}" "${M_2_STORAGE}" "${USBS}" "${BETA}")\" ">>"${TMP_PATH}/menu"
         else
           [ ${COMPATIBLE} -eq 1 ] && echo -e "${M} \"\t$(printf "\Zb%-15s\Zn \Zb%-5s\Zn \Zb%-12s\Zn \Zb%-5s\Zn \Zb%-10s\Zn \Zb%-12s\Zn \Zb%-10s\Zn \Zb%-10s\Zn" "${A}" "${DTS}" "${IGPUS}" "${HBAS}" "${M_2_CACHE}" "${M_2_STORAGE}" "${USBS}" "${BETA}")\" ">>"${TMP_PATH}/menu"
         fi
       done < <(cat "${TMP_PATH}/modellist")
-      [ -n "${ARCKEY}" ] && MSG="Supported Models for your Hardware (x = supported / + = need Addons)\n$(printf "\Zb%-16s\Zn \Zb%-15s\Zn \Zb%-5s\Zn \Zb%-5s\Zn \Zb%-12s\Zn \Zb%-5s\Zn \Zb%-10s\Zn \Zb%-12s\Zn \Zb%-10s\Zn \Zb%-10s\Zn" "Model" "Platform" "DT" "Arc" "Intel iGPU" "HBA" "M.2 Cache" "M.2 Volume" "USB Mount" "Source")" || MSG="Supported Models for your Hardware (x = supported / + = need Addons) | Syno Models can have faulty Values.\n$(printf "\Zb%-16s\Zn \Zb%-15s\Zn \Zb%-5s\Zn \Zb%-12s\Zn \Zb%-5s\Zn \Zb%-10s\Zn \Zb%-12s\Zn \Zb%-10s\Zn \Zb%-10s\Zn" "Model" "Platform" "DT" "Intel iGPU" "HBA" "M.2 Cache" "M.2 Volume" "USB Mount" "Source")"
-      [ -n "${ARCKEY}" ] && TITLEMSG="Arc Model" || TITLEMSG="Model"
+      ARCCONF="$(readConfigKey "${MODEL:-SA6400}.serial" "${S_FILE}")"
+      [ -n "${ARCCONF}" ] && MSG="Supported Models for your Hardware (x = supported / + = need Addons)\n$(printf "\Zb%-16s\Zn \Zb%-15s\Zn \Zb%-5s\Zn \Zb%-5s\Zn \Zb%-12s\Zn \Zb%-5s\Zn \Zb%-10s\Zn \Zb%-12s\Zn \Zb%-10s\Zn \Zb%-10s\Zn" "Model" "Platform" "DT" "Arc" "Intel iGPU" "HBA" "M.2 Cache" "M.2 Volume" "USB Mount" "Source")" || MSG="Supported Models for your Hardware (x = supported / + = need Addons) | Syno Models can have faulty Values.\n$(printf "\Zb%-16s\Zn \Zb%-15s\Zn \Zb%-5s\Zn \Zb%-12s\Zn \Zb%-5s\Zn \Zb%-10s\Zn \Zb%-12s\Zn \Zb%-10s\Zn \Zb%-10s\Zn" "Model" "Platform" "DT" "Intel iGPU" "HBA" "M.2 Cache" "M.2 Volume" "USB Mount" "Source")"
+      [ -n "${ARCCONF}" ] && TITLEMSG="Arc Model" || TITLEMSG="Model"
       dialog --backtitle "$(backtitlep)" --title "${TITLEMSG}" --colors \
         --cancel-label "Show all" --help-button --help-label "Exit" \
         --extra-button --extra-label "Info" \
@@ -667,19 +671,6 @@ function arcSummary() {
 # Building Loader
 function make() {
   STEP="build"
-  ARCCONF="$(readConfigKey "${MODEL}.serial" "${S_FILE}" 2>/dev/null)"
-  SN="$(readConfigKey "sn" "${USER_CONFIG_FILE}")"
-  BOOTMODE="$(readConfigKey "arc.mode" "${USER_CONFIG_FILE}")"
-  if [ "${BOOTMODE}" != "automated" ] && [ "${ARCOFFLINE}" != "true" ] && [[ "${ARCPATCH}" != "true" || -z "${ARCCONF}" ]]; then
-    if ! curl -skL "https://auxxxilium.tech/check.yml" -o "${TMP_PATH}/check.yml" 2>/dev/null; then
-      SN=$(generateSerial "${MODEL}" "false")
-    else
-      if grep -q "${SN}" "${TMP_PATH}/check.yml"; then
-        SN=$(generateSerial "${MODEL}" "false")
-      fi
-    fi
-    writeConfigKey "sn" "${SN}" "${USER_CONFIG_FILE}"
-  fi
   # Read Model Config
   MODEL="$(readConfigKey "model" "${USER_CONFIG_FILE}")"
   PLATFORM="$(readConfigKey "platform" "${USER_CONFIG_FILE}")"
@@ -821,7 +812,7 @@ if [ "${ARCMODE}" == "update" ]; then
     dialog --backtitle "$(backtitle)" --title "Arc Update" \
       --infobox "Update is not possible in Offline Mode!" 5 40
     sleep 3
-    exec reboot
+    reboot
   fi
 elif [ "${ARCMODE}" == "automated" ]; then
   # Check for Custom Build

files/initrd/opt/arc/boot.sh

@@ -187,15 +187,14 @@ if echo "purley broadwellnkv2" | grep -wq "${PLATFORM}"; then
 fi
 
 # Cmdline NIC Settings
-ETHX="$(ls /sys/class/net 2>/dev/null | grep eth)"
-ETHM="$(readConfigKey "${MODEL}.ports" "${S_FILE}" 2>/dev/null)"
-ETHN="$(echo ${ETHX} | wc -w)"
-[ -z "${ETHM}" ] && ETHM="${ETHN}"
+ETHX=$(ip -o link show | awk -F': ' '{print $2}' | grep eth)
+ETHM=$(readConfigKey "${MODEL}.ports" "${S_FILE}" 2>/dev/null)
+ETHN=$(echo ${ETHX} | wc -w)
+[ -z "${ETHM}" ] && ETHM=${ETHN}
 NIC=0
-for ETH in ${ETHX}; do
-  MAC="$(readConfigKey "${ETH}" "${USER_CONFIG_FILE}")"
-  [ -z "${MAC}" ] && MAC="$(cat /sys/class/net/${ETH}/address 2>/dev/null | tr '[:lower:]' '[:upper:]')"
-  NIC=$((${NIC} + 1))
+for N in ${ETHX}; do
+  MAC="$(readConfigKey "${N}" "${USER_CONFIG_FILE}")"
+  [ -z "${MAC}" ] && MAC="$(cat /sys/class/net/${N}/address 2>/dev/null | tr '[:lower:]' '[:upper:]')" || NIC=$((${NIC} + 1))
   [ ${NIC} -le ${ETHM} ] && CMDLINE["mac${NIC}"]="${MAC}"
   [ ${NIC} -ge ${ETHM} ] && break
 done
@@ -251,7 +250,7 @@ if [ "${DIRECTBOOT}" == "true" ]; then
   grub-editenv ${USER_GRUBENVFILE} set next_entry="direct"
   _bootwait || true
   echo -e "\033[1;34mReboot with Directboot\033[0m"
-  exec reboot
+  reboot
   exit 0
 elif [ "${DIRECTBOOT}" == "false" ]; then
   grub-editenv ${USER_GRUBENVFILE} unset dsm_cmdline
@@ -268,18 +267,18 @@ elif [ "${DIRECTBOOT}" == "false" ]; then
   echo
   [ ! -f /var/run/dhcpcd/pid ] && /etc/init.d/S41dhcpcd restart >/dev/null 2>&1 || true
   sleep 3
-  for ETH in ${ETHX}; do
+  for N in ${ETHX}; do
     COUNT=0
-    DRIVER=$(ls -ld /sys/class/net/${ETH}/device/driver 2>/dev/null | awk -F '/' '{print $NF}')
+    DRIVER=$(ls -ld /sys/class/net/${N}/device/driver 2>/dev/null | awk -F '/' '{print $NF}')
     while true; do
-      if ethtool ${ETH} 2>/dev/null | grep 'Link detected' | grep -q 'no'; then
+      if [ "0" = "$(cat /sys/class/net/${N}/carrier 2>/dev/null)" ]; then
         echo -e "\r${DRIVER}: \033[1;37mNOT CONNECTED\033[0m"
         break
       fi
       COUNT=$((${COUNT} + 1))
-      IP="$(getIP ${ETH})"
+      IP="$(getIP ${N})"
       if [ -n "${IP}" ]; then
-        SPEED=$(ethtool ${ETH} 2>/dev/null | grep "Speed:" | awk '{print $2}')
+        SPEED=$(ethtool ${N} 2>/dev/null | grep "Speed:" | awk '{print $2}')
         if [[ "${IP}" =~ ^169\.254\..* ]]; then
           echo -e "\r${DRIVER} (${SPEED}): \033[1;37mLINK LOCAL (No DHCP server found.)\033[0m"
         else
@@ -288,7 +287,7 @@ elif [ "${DIRECTBOOT}" == "false" ]; then
         fi
         break
       fi
-      if ! ip link show ${ETH} 2>/dev/null | grep -q 'UP'; then
+      if [ -z "$(cat /sys/class/net/${N}/carrier 2>/dev/null)" ]; then
         echo -e "\r${DRIVER}: \033[1;37mDOWN\033[0m"
         break
       fi
@@ -327,6 +326,5 @@ elif [ "${DIRECTBOOT}" == "false" ]; then
   echo -e "\033[1;37mBooting DSM...\033[0m"
   # Boot to DSM
   [ "${KERNELLOAD}" == "kexec" ] && kexec -e || poweroff
-fi
-
-exit 0
+  exit 0
+fi

files/initrd/opt/arc/include/functions.sh

@@ -229,18 +229,17 @@ function _set_conf_kv() {
 # sort netif busid
 function _sort_netif() {
   local ETHLIST=""
-  local ETHX="$(ls /sys/class/net/ 2>/dev/null | grep eth)" # real network cards list
-  for ETH in ${ETHX}; do
-    local MAC="$(cat /sys/class/net/${ETH}/address 2>/dev/null | sed 's/://g; s/.*/\L&/')"
-    local BUS="$(ethtool -i ${ETH} 2>/dev/null | grep bus-info | cut -d' ' -f2)"
-    ETHLIST="${ETHLIST}${BUS} ${MAC} ${ETH}\n"
+  local ETHX=$(ip -o link show | awk -F': ' '{print $2}' | grep eth)
+  for N in ${ETHX}; do
+    local MAC="$(cat /sys/class/net/${N}/address 2>/dev/null | sed 's/://g; s/.*/\L&/')"
+    local BUS="$(ethtool -i ${N} 2>/dev/null | grep bus-info | cut -d' ' -f2)"
+    ETHLIST="${ETHLIST}${BUS} ${MAC} ${N}\n"
   done
   local ETHLISTTMPB="$(echo -e "${ETHLIST}" | sort)"
   local ETHLIST="$(echo -e "${ETHLISTTMPB}" | grep -v '^$')"
   local ETHSEQ="$(echo -e "${ETHLIST}" | awk '{print $3}' | sed 's/eth//g')"
   local ETHNUM="$(echo -e "${ETHLIST}" | wc -l)"
 
-  # echo "${ETHSEQ}" >"/tmp/ethseq"
   # sort
   if [ ! "${ETHSEQ}" = "$(seq 0 $((${ETHNUM:0} - 1)))" ]; then
     /etc/init.d/S41dhcpcd stop >/dev/null 2>&1
@@ -565,6 +564,20 @@ function systemCheck () {
 ###############################################################################
 # Generate HardwareID
 function genHWID () {
-  HWID="$(echo $(dmidecode -t 4 | grep ID | sed 's/.*ID://;s/ //g' | head -1) $(ifconfig | grep eth0 | awk '{print $NF}' | sed 's/://g') | sha256sum | awk '{print $1}' | cut -c1-16)" 2>/dev/null
+  HWID="$(echo $(dmidecode -t 4 | grep ID | sed 's/.*ID://;s/ //g' | head -1) $(ifconfig | grep eth | awk '{print $NF}' | sed 's/://g' | sort | head -1) | sha256sum | awk '{print $1}' | cut -c1-16)" 2>/dev/null
   echo "${HWID}"
+}
+
+###############################################################################
+# Check if port is valid
+function check_port() {
+  if [ -z "${1}" ]; then
+    return 0
+  else
+    if [[ "${1}" =~ ^[0-9]+$ ]] && [ "${1}" -ge 0 ] && [ "${1}" -le 65535 ]; then
+      return 0
+    else
+      return 1
+    fi
+  fi
 }

files/initrd/opt/arc/include/network.sh

@@ -1,18 +1,17 @@
 # Get Network Config for Loader
 function getnet() {
-  ETHX="$(ls /sys/class/net 2>/dev/null | grep eth)"
+  ETHX=$(ip -o link show | awk -F': ' '{print $2}' | grep eth)
   MODEL="$(readConfigKey "model" "${USER_CONFIG_FILE}")"
   ARCPATCH="$(readConfigKey "arc.patch" "${USER_CONFIG_FILE}")"
   NICPORTS="$(readConfigKey "${MODEL}.ports" "${S_FILE}" 2>/dev/null)"
+  ETHN=$(echo ${ETHX} | wc -w)
   if [ "${ARCPATCH}" == "true" ]; then
-    ETHN="$(echo ${ETHX} | wc -w)"
     MACS=($(generateMacAddress "${MODEL}" "${ETHN}" "true"))
     for I in $(seq 1 ${ETHN}); do
       eval MAC${I}="${MACS[$((${I} - 1))]}"
       writeConfigKey "eth$((${I} - 1))" "${MACS[$((${I} - 1))]}" "${USER_CONFIG_FILE}"
     done
   elif [ "${ARCPATCH}" == "false" ]; then
-    ETHN="$(echo ${ETHX} | wc -w)"
     MACS=($(generateMacAddress "${MODEL}" "${ETHN}" "false"))
     for I in $(seq 1 ${ETHN}); do
       eval MAC${I}="${MACS[$((${I} - 1))]}"
@@ -20,19 +19,19 @@ function getnet() {
     done
   elif [ "${ARCPATCH}" == "user" ]; then
     # User Mac
-    for ETH in ${ETHX}; do
+    for N in ${ETHX}; do
       while true; do
-        MAC="$(cat /sys/class/net/${ETH}/address | sed 's/://g' | tr '[:lower:]' '[:upper:]')"
+        MAC="$(cat /sys/class/net/${N}/address | sed 's/://g' | tr '[:lower:]' '[:upper:]')"
         dialog --backtitle "$(backtitle)" --title "Mac Setting" \
           --inputbox "Type a custom MAC for ${ETH} (Eq. 001132abc123)." 7 50 "${MAC}"\
           2>"${TMP_PATH}/resp"
         [ $? -ne 0 ] && break
         MAC=$(cat "${TMP_PATH}/resp")
-        [ -z "${MAC}" ] && MAC="$(readConfigKey "${ETH}" "${USER_CONFIG_FILE}")"
-        [ -z "${MAC}" ] && MAC="$(cat /sys/class/net/${ETH}/address 2>/dev/null | sed 's/://g' | tr '[:lower:]' '[:upper:]')"
+        [ -z "${MAC}" ] && MAC="$(readConfigKey "${N}" "${USER_CONFIG_FILE}")"
+        [ -z "${MAC}" ] && MAC="$(cat /sys/class/net/${N}/address 2>/dev/null | sed 's/://g' | tr '[:lower:]' '[:upper:]')"
         MAC="$(echo "${MAC}" | tr '[:lower:]' '[:upper:]')"
         if [ ${#MAC} -eq 12 ]; then
-          writeConfigKey "${ETH}" "${MAC}" "${USER_CONFIG_FILE}"
+          writeConfigKey "${N}" "${MAC}" "${USER_CONFIG_FILE}"
           break
         else
           dialog --backtitle "$(backtitle)" --title "Mac Setting" --msgbox "Invalid MAC - Try again!" 5 50

files/initrd/opt/arc/include/update.sh

@@ -319,8 +319,8 @@ function updateModules() {
 ###############################################################################
 # Update Configs
 function updateConfigs() {
-  local ARCKEY="$(readConfigKey "arc.key" "${USER_CONFIG_FILE}")"
   [ -f "${MODEL_CONFIG_PATH}/VERSION" ] && local CONFIGSVERSION="$(cat "${MODEL_CONFIG_PATH}/VERSION")" || CONFIGSVERSION="0.0.0"
+  local USERID="$(readConfigKey "arc.userid" "${USER_CONFIG_FILE}")"
   if [ -z "${1}" ]; then
     idx=0
     while [ ${idx} -le 5 ]; do # Loop 5 times, if successful, break
@@ -362,6 +362,7 @@ function updateConfigs() {
         dialog --backtitle "$(backtitle)" --title "Update Configs" \
           --infobox "Update successful!" 3 50
         sleep 2
+        [ -z "${USERID}" ] && checkHardwareID || true
       else
         return 1
       fi
@@ -446,7 +447,7 @@ function dependenciesUpdate() {
   BUILDDONE="$(readConfigKey "arc.builddone" "${USER_CONFIG_FILE}")"
   FAILED="false"
   dialog --backtitle "$(backtitle)" --title "Update Dependencies" --aspect 18 \
-    --infobox "Updating Dependencies..." 0 0
+    --infobox "Updating Dependencies..." 3 40
   sleep 2
   updateAddons
   [ $? -ne 0 ] && FAILED="true"
@@ -462,11 +463,11 @@ function dependenciesUpdate() {
   [ $? -ne 0 ] && FAILED="true"
   if [ "${FAILED}" == "true" ]; then
     dialog --backtitle "$(backtitle)" --title "Update Dependencies" --aspect 18 \
-      --infobox "Update failed!\nTry again later." 0 0
+      --infobox "Update failed! Try again later." 3 40
     sleep 3
   elif [ "${FAILED}" == "false" ]; then
     dialog --backtitle "$(backtitle)" --title "Update Dependencies" --aspect 18 \
-      --infobox "Update successful!" 0 0
+      --infobox "Update successful!" 3 40
     writeConfigKey "arc.builddone" "false" "${USER_CONFIG_FILE}"
     BUILDDONE="$(readConfigKey "arc.builddone" "${USER_CONFIG_FILE}")"
     sleep 3

files/initrd/opt/arc/init.sh

@@ -38,7 +38,6 @@ initConfigKey "arc" "{}" "${USER_CONFIG_FILE}"
 initConfigKey "arc.builddone" "false" "${USER_CONFIG_FILE}"
 initConfigKey "arc.confdone" "false" "${USER_CONFIG_FILE}"
 initConfigKey "arc.dynamic" "false" "${USER_CONFIG_FILE}"
-initConfigKey "arc.key" "" "${USER_CONFIG_FILE}"
 initConfigKey "arc.offline" "false" "${USER_CONFIG_FILE}"
 initConfigKey "arc.patch" "false" "${USER_CONFIG_FILE}"
 initConfigKey "arc.version" "${ARC_VERSION}" "${USER_CONFIG_FILE}"
@@ -96,16 +95,16 @@ if arrayExistItem "sortnetif:" $(readConfigMap "addons" "${USER_CONFIG_FILE}");
   _sort_netif "$(readConfigKey "addons.sortnetif" "${USER_CONFIG_FILE}")"
 fi
 # Read/Write IP/Mac to config
-ETHX="$(ls /sys/class/net 2>/dev/null | grep eth)"
-for ETH in ${ETHX}; do
-  MACR="$(cat /sys/class/net/${ETH}/address 2>/dev/null | sed 's/://g' | tr '[:lower:]' '[:upper:]')"
+ETHX=$(ip -o link show | awk -F': ' '{print $2}' | grep eth)
+for N in ${ETHX}; do
+  MACR="$(cat /sys/class/net/${N}/address 2>/dev/null | sed 's/://g' | tr '[:lower:]' '[:upper:]')"
   IPR="$(readConfigKey "network.${MACR}" "${USER_CONFIG_FILE}")"
-  if [ -n "${IPR}" ]; then
+  if [ -n "${IPR}" ] && [ "1" = "$(cat /sys/class/net/${N}/carrier 2>/dev/null)" ]; then
     IFS='/' read -r -a IPRA <<<"${IPR}"
-    ip addr flush dev ${ETH}
-    ip addr add ${IPRA[0]}/${IPRA[1]:-"255.255.255.0"} dev ${ETH}
+    ip addr flush dev ${N}
+    ip addr add ${IPRA[0]}/${IPRA[1]:-"255.255.255.0"} dev ${N}
     if [ -n "${IPRA[2]}" ]; then
-      ip route add default via ${IPRA[2]} dev ${ETH}
+      ip route add default via ${IPRA[2]} dev ${N}
     fi
     if [ -n "${IPRA[3]:-${IPRA[2]}}" ]; then
       sed -i "/nameserver ${IPRA[3]:-${IPRA[2]}}/d" /etc/resolv.conf
@@ -113,11 +112,11 @@ for ETH in ${ETHX}; do
     fi
     sleep 1
   fi
-  [ "${ETH::3}" == "eth" ] && ethtool -s ${ETH} wol g 2>/dev/null || true
-  # [ "${ETH::3}" == "eth" ] && ethtool -K ${ETH} rxhash off 2>/dev/null || true
-  initConfigKey "${ETH}" "${MACR}" "${USER_CONFIG_FILE}"
+  [ "${N::3}" == "eth" ] && ethtool -s ${N} wol g 2>/dev/null || true
+  # [ "${N::3}" == "eth" ] && ethtool -K ${N} rxhash off 2>/dev/null || true
+  initConfigKey "${N}" "${MACR}" "${USER_CONFIG_FILE}"
 done
-ETHN="$(echo ${ETHX} | wc -w)"
+ETHN=$(echo ${ETHX} | wc -w)
 writeConfigKey "device.nic" "${ETHN}" "${USER_CONFIG_FILE}"
 # No network devices
 echo
@@ -156,7 +155,7 @@ elif [ "${ARCMODE}" == "update" ]; then
 elif [ "${BUILDDONE}" == "true" ] && [ "${ARCMODE}" == "dsm" ]; then
   echo -e "\033[1;34mStarting DSM Mode...\033[0m"
   if [ -f "${ARC_PATH}/boot.sh" ]; then
-    boot.sh && exit 0
+    exec boot.sh && exit 0
   else
     echo -e "\033[1;31mError: Can't find Arc System Files...\033[0m"
   fi
@@ -172,18 +171,18 @@ IPCON=""
 echo
 [ ! -f /var/run/dhcpcd/pid ] && /etc/init.d/S41dhcpcd restart >/dev/null 2>&1 || true
 sleep 3
-for ETH in ${ETHX}; do
+for N in ${ETHX}; do
   COUNT=0
-  DRIVER=$(ls -ld /sys/class/net/${ETH}/device/driver 2>/dev/null | awk -F '/' '{print $NF}')
+  DRIVER=$(ls -ld /sys/class/net/${N}/device/driver 2>/dev/null | awk -F '/' '{print $NF}')
   while true; do
-    if ethtool ${ETH} 2>/dev/null | grep 'Link detected' | grep -q 'no'; then
+    if [ "0" = "$(cat /sys/class/net/${N}/carrier 2>/dev/null)" ]; then
       echo -e "\r${DRIVER}: \033[1;37mNOT CONNECTED\033[0m"
       break
     fi
     COUNT=$((${COUNT} + 1))
-    IP="$(getIP ${ETH})"
+    IP="$(getIP ${N})"
     if [ -n "${IP}" ]; then
-      SPEED=$(ethtool ${ETH} 2>/dev/null | grep "Speed:" | awk '{print $2}')
+      SPEED=$(ethtool ${N} 2>/dev/null | grep "Speed:" | awk '{print $2}')
       if [[ "${IP}" =~ ^169\.254\..* ]]; then
         echo -e "\r${DRIVER} (${SPEED}): \033[1;37mLINK LOCAL (No DHCP server found.)\033[0m"
       else
@@ -192,7 +191,7 @@ for ETH in ${ETHX}; do
       fi
       break
     fi
-    if ! ip link show ${ETH} 2>/dev/null | grep -q 'UP'; then
+    if [ -z "$(cat /sys/class/net/${N}}/carrier 2>/dev/null)" ]; then
       echo -e "\r${DRIVER}: \033[1;37mDOWN\033[0m"
       break
     fi

img-gen-n.sh

@@ -37,8 +37,8 @@ sudo mount ${LOOPX}p3 "/tmp/p3"
 
 [[ ! -f "brx/bzImage-arc" || ! -f "brx/initrd-arc" ]] && return 1
 
-ARC_BUILD="`date +'%y%m%d'`-dev"
-ARC_VERSION="13.11"
+ARC_BUILD="`date +'%y%m%d'`"
+ARC_VERSION="13.37.dev"
 ARC_BRANCH="next"
 echo "${ARC_BUILD}" >files/p1/ARC-BUILD
 echo "${ARC_VERSION}" >files/p1/ARC-VERSION

img-gen-s.sh

@@ -37,8 +37,8 @@ sudo mount ${LOOPX}p3 "/tmp/p3"
 
 [[ ! -f "brs/bzImage-arc" || ! -f "brs/initrd-arc" ]] && return 1
 
-ARC_BUILD="`date +'%y%m%d'`-dev"
-ARC_VERSION="13.11"
+ARC_BUILD="`date +'%y%m%d'`"
+ARC_VERSION="13.37.dev"
 ARC_BRANCH="stable"
 echo "${ARC_BUILD}" >files/p1/ARC-BUILD
 echo "${ARC_VERSION}" >files/p1/ARC-VERSION