Merge pull request #1475 from AuxXxilium/dev

Dev
AuxXxilium · May 11, 2024 · cfcbb81 · cfcbb81
2 parents 529435e + cc9d6fa
commit cfcbb81
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/files/initrd/opt/arc/arc.sh b/files/initrd/opt/arc/arc.sh
@@ -448,20 +448,20 @@ function arcSettings() {
   PLATFORM="$(readConfigKey "platform" "${USER_CONFIG_FILE}")"
   # Get Network Config for Loader
   dialog --backtitle "$(backtitle)" --colors --title "Network Config" \
-    --infobox "Generating Network Config..." 3 30
+    --infobox "Generating Network Config..." 3 35
   sleep 2
   getnet
   # Select Portmap for Loader
   getmap
   if [[ "${DT}" = "false" && $(lspci -d ::106 | wc -l) -gt 0 ]]; then
     dialog --backtitle "$(backtitle)" --colors --title "Storage Map" \
-      --infobox "Generating Storage Map..." 3 30
+      --infobox "Generating Storage Map..." 3 35
     sleep 2
     getmapSelection
   fi
   if [ "${CUSTOM}" = "false" ]; then
     dialog --backtitle "$(backtitle)" --colors --title "DSM Addons" \
-      --infobox "Loading Addons Table..." 3 30
+      --infobox "Loading Addons Table..." 3 35
     # Add Arc Addons
     writeConfigKey "addons.cpuinfo" "" "${USER_CONFIG_FILE}"
     # Select Addons
@@ -977,7 +977,6 @@ else
         echo "b \"DSM Addons \" "                                                             >>"${TMP_PATH}/menu"
         echo "d \"DSM Modules \" "                                                            >>"${TMP_PATH}/menu"
         echo "e \"DSM Version \" "                                                            >>"${TMP_PATH}/menu"
-        echo "N \"DSM Network Mode \" "                                                       >>"${TMP_PATH}/menu"
         echo "S \"DSM Storage Map \" "                                                        >>"${TMP_PATH}/menu"
         echo "P \"DSM StoragePanel \" "                                                       >>"${TMP_PATH}/menu"
         echo "p \"Arc Patch Settings \" "                                                     >>"${TMP_PATH}/menu"
@@ -1020,7 +1019,7 @@ else
         echo "= \"\Z4========== DSM ==========\Zn \" "                                        >>"${TMP_PATH}/menu"
         echo "s \"Allow DSM Downgrade \" "                                                    >>"${TMP_PATH}/menu"
         echo "t \"Change DSM Password \" "                                                    >>"${TMP_PATH}/menu"
-        if [ "${MODEL}" = "SA6400" ]; then
+        if [ "${PLATFORM}" = "epyc7002" ]; then
           echo "K \"Kernel: \Z4${KERNEL}\Zn \" "                                              >>"${TMP_PATH}/menu"
         fi
         if [ "${DT}" = "true" ]; then
@@ -1084,7 +1083,6 @@ else
       b) addonMenu; NEXT="b" ;;
       d) modulesMenu; NEXT="d" ;;
       e) ONLYVERSION="true" && arcVersion; NEXT="e" ;;
-      N) networkMenu; NEXT="N" ;;
       S) storageMenu; NEXT="S" ;;
       P) storagepanelMenu; NEXT="P" ;;
       p) ONLYPATCH="true" && arcPatch; NEXT="p" ;;

diff --git a/files/initrd/opt/arc/boot.sh b/files/initrd/opt/arc/boot.sh
@@ -161,7 +161,7 @@ CMDLINE['netif_num']="${NIC}"
 if [ "${MACSYS}" = "hardware" ]; then
   CMDLINE['skip_vender_mac_interfaces']="0,1,2,3,4,5,6,7"
 elif [ "${MACSYS}" = "custom" ]; then
-  CMDLINE['skip_vender_mac_interfaces']="$(seq -s, $((${NIC} + 1)) 7)"
+  CMDLINE['skip_vender_mac_interfaces']="$(seq -s, ${NIC} 7)"
 fi
 
 # Read user cmdline

diff --git a/files/initrd/opt/arc/init.sh b/files/initrd/opt/arc/init.sh
@@ -101,10 +101,10 @@ for ETH in ${ETHX}; do
       sleep 2
     fi
     /etc/init.d/S41dhcpcd restart >/dev/null 2>&1 || true
-    echo
   fi
   NIC=$((${NIC} + 1))
 done
+echo
 # Write NIC Amount to config
 writeConfigKey "device.nic" "${NIC}" "${USER_CONFIG_FILE}"
 # No network devices