tree: reformate Part 7

Signed-off-by: AuxXxilium <info@auxxxilium.tech>

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

@@ -53,8 +53,8 @@ function addonSelection() {
     fi
     echo -e "${ADDON} \"${DESC}\" ${ACT}" >>"${TMP_PATH}/opts"
   done <<<$(availableAddons "${PLATFORM}")
-  dialog --backtitle "$(backtitle)" --title "Loader Addons" --aspect 18 \
-    --checklist "Select Loader Addons to include.\nPlease read Wiki before choosing anything.\nSelect with SPACE, Confirm with ENTER!" 0 0 0 \
+  dialog --backtitle "$(backtitle)" --title "DSM Addons" --aspect 18 \
+    --checklist "Select DSM Addons to include.\nPlease read Wiki before choosing anything.\nSelect with SPACE, Confirm with ENTER!" 0 0 0 \
     --file "${TMP_PATH}/opts" 2>"${TMP_PATH}/resp"
   [ $? -ne 0 ] && return 1
   resp=$(cat ${TMP_PATH}/resp)
@@ -66,8 +66,8 @@ function addonSelection() {
     writeConfigKey "addons.\"${ADDON}\"" "" "${USER_CONFIG_FILE}"
   done
   ADDONSINFO="$(readConfigEntriesArray "addons" "${USER_CONFIG_FILE}")"
-  dialog --backtitle "$(backtitle)" --title "Addons" \
-    --msgbox "Loader Addons selected:\n${ADDONSINFO}" 0 0
+  dialog --backtitle "$(backtitle)" --title "DSM Addons" \
+    --msgbox "DSM Addons selected:\n${ADDONSINFO}" 0 0
 }
 
 ###############################################################################
@@ -1852,7 +1852,7 @@ function formatdisks() {
   ) 2>&1 | dialog --backtitle "$(backtitle)" --colors --title "Format Disks" \
     --progressbox "Formatting ..." 20 100
   dialog --backtitle "$(backtitle)" --colors --title "Format Disks" \
-    --msgbox "Formatting is complete." 0 0
+    --msgbox "Formatting is complete." 3 25
   return
 }
 

files/initrd/opt/arc/arc.sh

@@ -124,7 +124,7 @@ function backtitle() {
 # Model Selection
 function arcModel() {
   dialog --backtitle "$(backtitle)" --title "Model" --title "Model" \
-    --infobox "Reading Models..." 0 0
+    --infobox "Reading Models..." 3 25
   # Loop menu
   RESTRICT=1
   PS="$(readConfigEntriesArray "platforms" "${P_FILE}" | sort)"
@@ -309,10 +309,18 @@ function arcVersion() {
     fi
   done <<<$(readConfigMap "addons" "${USER_CONFIG_FILE}")
   # Reset Modules
+  echo "$(lsmod | awk '{print $1}' | sort)" >>"${TMP_PATH}/lsmod"
+  cp -f "${ARC_PATH}/include/modulelist" "${TMP_PATH}/modulelist.user"
+  echo -e "\n\n# User Modules" >>"${TMP_PATH}/modulelist.user"
   writeConfigKey "modules" "{}" "${USER_CONFIG_FILE}"
   while read -r ID DESC; do
     writeConfigKey "modules.\"${ID}\"" "" "${USER_CONFIG_FILE}"
+    if [ -n "$(grep -w "${ID}" "${TMP_PATH}/lsmod")" ] && [ -z "$(grep -w "${ID}" "${TMP_PATH}/modulelist.user")" ]; then
+      echo "N ${ID}.ko" >>"${TMP_PATH}/modulelist.user"
+    fi
   done <<<$(getAllModules "${PLATFORM}" "${KVERP}")
+  [ ! -d "${USER_UP_PATH}" ] && mkdir -p "${USER_UP_PATH}"
+  mv -f "${TMP_PATH}/modulelist.user" "${USER_UP_PATH}/modulelist"
   if [ "${CUSTOM}" = "false" ]; then
     if [ "${ONLYVERSION}" != "true" ]; then
       arcPatch
@@ -438,18 +446,21 @@ function arcSettings() {
   PLATFORM="$(readConfigKey "platform" "${USER_CONFIG_FILE}")"
   # Get Network Config for Loader
   dialog --backtitle "$(backtitle)" --colors --title "Network Config" \
-    --infobox "Loading Network Config..." 3 40
+    --infobox "Loading Network Config..." 3 30
   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 "Loading Storage Map..." 3 40
+      --infobox "Loading Storage Map..." 3 30
     sleep 2
     getmapSelection
   fi
   if [ "${CUSTOM}" = "false" ]; then
+    dialog --backtitle "$(backtitle)" --colors --title "DSM Addons" \
+      --infobox "Loading Addons Table..." 3 30
+    sleep 2
     # Add Arc Addons
     writeConfigKey "addons.cpuinfo" "" "${USER_CONFIG_FILE}"
     # Select Addons

files/initrd/opt/arc/include/modulelist

@@ -22,17 +22,9 @@ N nct6683.ko
 N nct6775.ko
 
 # rndis
-F mii.ko
-F cdc_ether.ko
-F rndis_host.ko
-
-# iwlwifi
-N libarc4.ko
-N cfg80211.ko
-N mac80211.ko
-N iwlwifi.ko
-N iwlmvm.ko
-N iwldvm.ko
+N mii.ko
+N cdc_ether.ko
+N rndis_host.ko
 
 ## i915
 #N dmabuf.ko