modulelist: revert

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

.github/workflows/grub.yml

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2023 AuxXxilium <https://github.com/AuxXxilium>
+# Copyright (C) 2025 AuxXxilium <https://github.com/AuxXxilium>
 #
 # This is free software, licensed under the MIT License.
 # See /LICENSE for more information.
@@ -33,7 +33,7 @@ jobs:
 
       - name: Make Grub
         run: |
-          rm -f grub.img.gz
+          rm -f "files/initrd/opt/arc/grub.img.gz"
           . scripts/grub.sh "grub-2.12" "i386-pc i386-efi x86_64-efi" "ARC"
 
       - name: Check and Push

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

@@ -1377,21 +1377,24 @@ function backupMenu() {
   while true; do
     if [ -n "${USERID}" ] && [ "${ARCOFFLINE}" != "true" ] && [ "${CONFDONE}" = "true" ]; then
       dialog --backtitle "$(backtitle)" --title "Backup" --cancel-label "Exit" --menu "Choose an Option" 0 0 0 \
-        1 "Restore Arc Config from DSM" \
-        2 "Restore Hardware Key from DSM" \
-        3 "Restore Arc Config from Online" \
-        4 "Backup Arc Config to Online" \
+        1 "Restore Arc Config (from DSM)" \
+        2 "Restore Hardware Key (local)" \
+        3 "Backup Hardware Key (local)" \
+        4 "Restore Arc Config (from Online)" \
+        5 "Backup Arc Config (to Online)" \
         2>"${TMP_PATH}/resp"
     elif [ -n "${USERID}" ] && [ "${ARCOFFLINE}" != "true" ]; then
       dialog --backtitle "$(backtitle)" --title "Backup" --cancel-label "Exit" --menu "Choose an Option" 0 0 0 \
-        1 "Restore Arc Config from DSM" \
-        2 "Restore Hardware Key from DSM" \
-        3 "Restore Arc Config from Online" \
+        1 "Restore Arc Config (from DSM)" \
+        2 "Restore Hardware Key (local)" \
+        3 "Backup Hardware Key (local)" \
+        4 "Restore Arc Config (from Online)" \
         2>"${TMP_PATH}/resp"
     else
       dialog --backtitle "$(backtitle)" --title "Backup" --cancel-label "Exit" --menu "Choose an Option" 0 0 0 \
-        1 "Restore Arc Config from DSM" \
-        2 "Restore Hardware Key from DSM" \
+        1 "Restore Arc Config (from DSM)" \
+        2 "Restore Hardware Key (local)" \
+        3 "Backup Hardware Key (local)" \
         2>"${TMP_PATH}/resp"
     fi
     [ $? -ne 0 ] && break
@@ -1451,33 +1454,40 @@ function backupMenu() {
         rm -f "${HOME}/.initialized" && exec init.sh
         ;;
       2)
-        DSMROOTS="$(findDSMRoot)"
-        if [ -z "${DSMROOTS}" ]; then
-          dialog --backtitle "$(backtitle)" --title "Restore Encryption Key" \
-            --msgbox "No DSM system partition(md0) found!\nPlease insert all disks before continuing." 0 0
-          return
-        fi
-        mkdir -p "${TMP_PATH}/mdX"
-        for I in ${DSMROOTS}; do
-          # fixDSMRootPart "${I}"
-          mount -t ext4 "${I}" "${TMP_PATH}/mdX"
-          if [ -f "${TMP_PATH}/mdX/usr/arc/backup/p2/machine.key" ]; then
-            cp -f "${TMP_PATH}/mdX/usr/arc/backup/p2/machine.key" "${PART2_PATH}/machine.key"
-            dialog --backtitle "$(backtitle)" --title "Restore Encryption Key" --aspect 18 \
-              --msgbox "Encryption Key restore successful!" 0 0
-            break
-          fi
-        done
-        umount "${TMP_PATH}/mdX"
-        if [ -f "${PART2_PATH}/machine.key" ]; then
+        dialog --backtitle "$(backtitle)" --title "Restore Encryption Key" \
+          --msgbox "Upload the machine.key file to ${PART3_PATH}/users\nand press OK after the upload is done." 0 0
+        [ $? -ne 0 ] && return 1
+        if [ -f "${PART3_PATH}/users/machine.key" ]; then
+          mv -f "${PART3_PATH}/users/machine.key" "${PART2_PATH}/machine.key"
           dialog --backtitle "$(backtitle)" --title "Restore Encryption Key" --aspect 18 \
             --msgbox "Encryption Key restore successful!" 0 0
         else
-          dialog --backtitle "$(backtitle)" --title "Restore Encryption Key" --aspect 18 \
-            --msgbox "No Encryption Key found!" 0 0
+          dialog --backtitle "$(backtitle)" --title "Restore Encryption Key" \
+            --msgbox "File not found!" 0 0
+          return 1
         fi
+        return
         ;;
       3)
+        dialog --backtitle "$(backtitle)" --title "Backup Encryption Key" \
+          --msgbox "To backup the Encryption Key press OK." 0 0
+        [ $? -ne 0 ] && return 1
+        
+        if [ -f "${PART2_PATH}/machine.key" ]; then
+          cp -f "${PART2_PATH}/machine.key" "/var/www/data/machine.key"
+          URL="http://${IPCON}${HTTPPORT:+:$HTTPPORT}/machine.key"
+          MSG="Please use ${URL} to download the machine.key file."
+        else
+          MSG="File not found!"
+        fi
+        dialog --backtitle "$(backtitle)" --colors --title "Backup Encryption Key" \
+          --msgbox "${MSG}" 0 0
+        if [ "${MSG}" = "File not found!" ]; then
+          return 1
+        fi
+        return
+        ;;
+      4)
         [ -f "${USER_CONFIG_FILE}" ] && mv -f "${USER_CONFIG_FILE}" "${USER_CONFIG_FILE}.bak"
         HWID="$(genHWID)"
         if curl -skL "https://arc.auxxxilium.tech?cdown=${HWID}" -o "${USER_CONFIG_FILE}" 2>/dev/null; then
@@ -1509,14 +1519,16 @@ function backupMenu() {
         sleep 2
         rm -f "${HOME}/.initialized" && exec init.sh
         ;;
-      4)
+      5)
         HWID="$(genHWID)"
         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
+          return 1
         fi
+        return
         ;;
       *)
         break
@@ -1542,11 +1554,12 @@ function updateMenu() {
       1)
         # Ask for Tag
         TAG="$(curl -m 10 -skL "https://api.github.com/repos/AuxXxilium/arc/releases" | jq -r ".[].tag_name" | grep -v "dev" | sort -rV | head -1)"
-        OLD="$(cat ${PART1_PATH}/ARC-VERSION)"
+        OLD="${ARC_VERSION}"
         dialog --clear --backtitle "$(backtitle)" --title "Update Loader" \
           --menu "Current: ${OLD} -> Which Version?" 7 50 0 \
           1 "Latest ${TAG}" \
           2 "Select Version" \
+          3 "Upload .zip File" \
         2>"${TMP_PATH}/opts"
         [ $? -ne 0 ] && break
         opts=$(cat ${TMP_PATH}/opts)
@@ -1558,6 +1571,25 @@ function updateMenu() {
           2>"${TMP_PATH}/input"
           TAG=$(cat "${TMP_PATH}/input")
           [ -z "${TAG}" ] && return 1
+        elif [ ${opts} -eq 3 ]; then
+          mkdir -p "${PART3_PATH}/users"
+          dialog --backtitle "$(backtitle)" --title "Update Loader" \
+            --msgbox "Upload the update-*.zip File to ${PART3_PATH}/users\nand press OK after upload is done." 0 0
+          [ $? -ne 0 ] && return 1
+          UPDATEFOUND="false"
+          for UPDATEFILE in "${PART3_PATH}/users/update-*.zip"; do
+            if [ -e "${UPDATEFILE}" ]; then
+              mv -f "${UPDATEFILE}" "${TMP_PATH}/update.zip"
+              TAG="zip"
+              UPDATEFOUND="true"
+              break
+            fi
+          done
+          if [ "${UPDATEFOUND}" = "false" ]; then
+            dialog --backtitle "$(backtitle)" --title "Update Loader" \
+              --msgbox "File not found!" 0 0
+            return 1
+          fi
         fi
         updateLoader "${TAG}"
         ;;
@@ -1571,7 +1603,7 @@ function updateMenu() {
       4)
         dialog --backtitle "$(backtitle)" --title "Switch Arc Branch" \
           --menu "Choose a Branch" 0 0 0 \
-          1 "evolution - New Evolution System" \
+          1 "evo - New Evolution System" \
           3 "dev - Development System" \
           2>"${TMP_PATH}/opts"
         [ $? -ne 0 ] && break
@@ -2686,14 +2718,9 @@ function greplogs() {
 
   if [ -n "$(ls -A ${TMP_PATH}/logs 2>/dev/null)" ]; then
     tar -czf "${TMP_PATH}/logs.tar.gz" -C "${TMP_PATH}" logs
-    if [ -z "${SSH_TTY}" ]; then # web
-      mv -f "${TMP_PATH}/logs.tar.gz" "/var/www/data/logs.tar.gz"
-      URL="http://${IPCON}${HTTPPORT:+:$HTTPPORT}/logs.tar.gz"
-      MSG+="Please via ${URL} to download the logs,\nAnd go to Github or Discord to create an issue and upload the logs."
-    else
-      sz -be -B 536870912 "${TMP_PATH}/logs.tar.gz"
-      MSG+="Please go to Github or Discord to create an issue and upload the logs."
-    fi
+    mv -f "${TMP_PATH}/logs.tar.gz" "/var/www/data/logs.tar.gz"
+    URL="http://${IPCON}${HTTPPORT:+:$HTTPPORT}/logs.tar.gz"
+    MSG+="Please via ${URL} to download the logs,\nAnd go to Github or Discord to create an issue and upload the logs."
   fi
   dialog --backtitle "$(backtitle)" --colors --title "Grep Logs" \
     --msgbox "${MSG}" 0 0
@@ -2706,17 +2733,11 @@ function getbackup() {
   if [ -d "${PART1_PATH}/dsmbackup" ]; then
     rm -f "${TMP_PATH}/dsmconfig.tar.gz" >/dev/null
     tar -czf "${TMP_PATH}/dsmconfig.tar.gz" -C "${PART1_PATH}" dsmbackup
-    if [ -z "${SSH_TTY}" ]; then # web
-      cp -f "${TMP_PATH}/dsmconfig.tar.gz" "/var/www/data/dsmconfig.tar.gz"
-      chmod 644 "/var/www/data/dsmconfig.tar.gz"
-      URL="http://${IPCON}${HTTPPORT:+:$HTTPPORT}/dsmconfig.tar.gz"
-      dialog --backtitle "$(backtitle)" --colors --title "DSM Config" \
-        --msgbox "Please via ${URL}\nto download the dsmconfig and unzip it and back it up in order by file name." 0 0
-    else
-      sz -be -B 536870912 "${TMP_PATH}/dsmconfig.tar.gz"
-      dialog --backtitle "$(backtitle)" --colors --title "DSM Config" \
-        --msgbox "Please unzip it and back it up in order by file name." 0 0
-    fi
+    cp -f "${TMP_PATH}/dsmconfig.tar.gz" "/var/www/data/dsmconfig.tar.gz"
+    chmod 644 "/var/www/data/dsmconfig.tar.gz"
+    URL="http://${IPCON}${HTTPPORT:+:$HTTPPORT}/dsmconfig.tar.gz"
+    dialog --backtitle "$(backtitle)" --colors --title "DSM Config" \
+      --msgbox "Please via ${URL}\nto download the dsmconfig and unzip it and back it up in order by file name." 0 0
   else
     MSG=""
     MSG+="\Z1No dsmbackup found!\Zn\n\n"

files/initrd/opt/arc/arc.sh

@@ -23,7 +23,7 @@ function backtitle() {
   BACKTITLE="${ARC_TITLE}$([ -n "${NEWTAG}" ] && [ -n "${ARC_VERSION}" ] && [ ${ARC_VERSION//[!0-9]/} -lt ${NEWTAG//[!0-9]/} ] && echo " > ${NEWTAG}") | "
   BACKTITLE+="${MODEL:-(Model)} | "
   BACKTITLE+="${PRODUCTVER:-(Version)} | "
-  BACKTITLE+="${IPCON:-(IP)} | "
+  BACKTITLE+="${IPCON:-(no IP)} | "
   BACKTITLE+="Patch: ${ARCPATCH} | "
   BACKTITLE+="Config: ${CONFDONE} | "
   BACKTITLE+="Build: ${BUILDDONE} | "
@@ -108,13 +108,13 @@ elif [ "${ARCMODE}" = "config" ]; then
         done
 
         if [ "${PLATFORM}" = "epyc7002" ]; then
-          write_menu_with_color "K" "Kernel" "${KERNEL}"
+          write_menu_value "K" "Kernel" "${KERNEL}"
         fi
 
         if [ "${DT}" = "true" ]; then
-          write_menu_with_color "H" "Hotplug/SortDrives" "${HDDSORT}"
+          write_menu_value "H" "Hotplug/SortDrives" "${HDDSORT}"
         else
-          write_menu_with_color "h" "USB as Internal" "${USBMOUNT}"
+          write_menu_value "h" "USB as Internal" "${USBMOUNT}"
         fi
       else
         write_menu "4" "\Z1Show Arc DSM Options\Zn"
@@ -122,12 +122,12 @@ elif [ "${ARCMODE}" = "config" ]; then
 
       if [ "${BOOTOPTS}" = "true" ]; then
         write_menu "6" "\Z1Hide Boot Options\Zn"
-        write_menu_with_color "m" "Boot Kernelload" "${KERNELLOAD}"
-        write_menu_with_color "E" "eMMC Boot Support" "${EMMCBOOT}"
+        write_menu_value "m" "Boot Kernelload" "${KERNELLOAD}"
+        write_menu_value "E" "eMMC Boot Support" "${EMMCBOOT}"
         if [ "${DIRECTBOOT}" = "false" ]; then
-          write_menu_with_color "i" "Boot IP Waittime" "${BOOTIPWAIT}"
+          write_menu_value "i" "Boot IP Waittime" "${BOOTIPWAIT}"
         fi
-        write_menu_with_color "q" "Directboot" "${DIRECTBOOT}"
+        write_menu_value "q" "Directboot" "${DIRECTBOOT}"
       else
         write_menu "6" "\Z1Show Boot Options\Zn"
       fi
@@ -143,7 +143,7 @@ elif [ "${ARCMODE}" = "config" ]; then
         write_menu "M" "Mount DSM Storage Pool"
         write_menu "l" "Edit User Config"
         write_menu "s" "Allow Downgrade Version"
-        write_menu_with_color "O" "Official Driver Priority" "${ODP}"
+        write_menu_value "O" "Official Driver Priority" "${ODP}"
       else
         write_menu "7" "\Z1Show DSM Options\Zn"
       fi
@@ -151,7 +151,7 @@ elif [ "${ARCMODE}" = "config" ]; then
 
     if [ "${LOADEROPTS}" = "true" ]; then
       write_menu "8" "\Z1Hide Loader Options\Zn"
-      write_menu_with_color "c" "Offline Mode" "${ARCOFFLINE}"
+      write_menu_value "c" "Offline Mode" "${ARCOFFLINE}"
       write_menu "D" "StaticIP for Loader/DSM"
       write_menu "f" "Bootscreen Options"
       write_menu "U" "Change Loader Password"
@@ -160,9 +160,9 @@ elif [ "${ARCMODE}" = "config" ]; then
       write_menu "L" "Grep Logs from dbgutils"
       write_menu "B" "Grep DSM Config from Backup"
       write_menu "=" "\Z1== Edit with caution! ==\Zn"
-      write_menu_with_color "W" "RD Compression" "${RD_COMPRESSED}"
-      write_menu_with_color "X" "Sata DOM" "${SATADOM}"
-      write_menu_with_color "u" "LKM Version" "${LKM}"
+      write_menu_value "W" "RD Compression" "${RD_COMPRESSED}"
+      write_menu_value "X" "Sata DOM" "${SATADOM}"
+      write_menu_value "u" "LKM Version" "${LKM}"
       write_menu "C" "Clone Loader to another Disk"
       write_menu "n" "Grub Bootloader Config"
       write_menu "y" "Choose a Keymap for Loader"

files/initrd/opt/arc/boot.sh

@@ -48,6 +48,8 @@ PRODUCTVER="$(readConfigKey "productver" "${USER_CONFIG_FILE}")"
 BUILDNUM="$(readConfigKey "buildnum" "${USER_CONFIG_FILE}")"
 SMALLNUM="$(readConfigKey "smallnum" "${USER_CONFIG_FILE}")"
 LKM="$(readConfigKey "lkm" "${USER_CONFIG_FILE}")"
+KERNEL="$(readConfigKey "kernel" "${USER_CONFIG_FILE}")"
+KVER="$(readConfigKey "platforms.${PLATFORM}.productvers.\"${PRODUCTVER}\".kver" "${P_FILE}")"
 CPU="$(echo $(cat /proc/cpuinfo 2>/dev/null | grep 'model name' | uniq | awk -F':' '{print $2}'))"
 RAMTOTAL="$(awk '/MemTotal:/ {printf "%.0f\n", $2 / 1024 / 1024 + 0.5}' /proc/meminfo 2>/dev/null)"
 VENDOR="$(dmesg 2>/dev/null | grep -i "DMI:" | head -1 | sed 's/\[.*\] DMI: //i')"
@@ -61,9 +63,7 @@ BUILDDONE="$(readConfigKey "arc.builddone" "${USER_CONFIG_FILE}")"
 
 # Build Sanity Check
 [ "${BUILDDONE}" = "false" ] && die "Loader build not completed!"
-if [ -z "${MODELID}" ] || [ "${MODELID}" != "${MODEL}" ]; then
-  die "Loader build not completed! Model mismatch!"
-fi
+[[ -z "${MODELID}" || "${MODELID}" != "${MODEL}" ]] && die "Loader build not completed! Model mismatch!"
 # HardwareID Check
 if [ "${ARCPATCH}" = "true" ]; then
   HARDWAREID="$(readConfigKey "arc.hardwareid" "${USER_CONFIG_FILE}")"
@@ -83,7 +83,7 @@ if [ "${DSMINFO}" = "true" ]; then
   echo -e "Model: \033[1;37m${MODELID:-${MODEL}}\033[0m"
   echo -e "Platform: \033[1;37m${PLATFORM}\033[0m"
   echo -e "Version: \033[1;37m${PRODUCTVER} (${BUILDNUM}$([ ${SMALLNUM:-0} -ne 0 ] && echo "u${SMALLNUM}"))\033[0m"
-  echo -e "Kernel: \033[1;37m${KVER}\033[0m"
+  echo -e "Kernel: \033[1;37m${KVER} (${KERNEL})\033[0m"
   echo -e "LKM: \033[1;37m${LKM}\033[0m"
   echo
 fi
@@ -124,9 +124,15 @@ if checkBIOS_VT_d && [ $(echo "${KVER:-4}" | cut -d'.' -f1) -lt 5 ]; then
 fi
 
 # Read necessary variables
-readData
+VID="$(readConfigKey "vid" "${USER_CONFIG_FILE}")"
+PID="$(readConfigKey "pid" "${USER_CONFIG_FILE}")"
 SN="$(readConfigKey "sn" "${USER_CONFIG_FILE}")"
+KERNELPANIC="$(readConfigKey "kernelpanic" "${USER_CONFIG_FILE}")"
+DT="$(readConfigKey "platforms.${PLATFORM}.dt" "${P_FILE}")"
+KVER="$(readConfigKey "platforms.${PLATFORM}.productvers.\"${PRODUCTVER}\".kver" "${P_FILE}")"
+EMMCBOOT="$(readConfigKey "emmcboot" "${USER_CONFIG_FILE}")"
 MODBLACKLIST="$(readConfigKey "modblacklist" "${USER_CONFIG_FILE}")"
+ARCPATCH="$(readConfigKey "arc.patch" "${USER_CONFIG_FILE}")"
 
 declare -A CMDLINE
 

files/initrd/opt/arc/evo.sh

@@ -23,7 +23,7 @@ function backtitle() {
   BACKTITLE="${ARC_TITLE}$([ -n "${NEWTAG}" ] && [ -n "${ARC_VERSION}" ] && [ ${ARC_VERSION//[!0-9]/} -lt ${NEWTAG//[!0-9]/} ] && echo " > ${NEWTAG}") | "
   BACKTITLE+="${MODEL:-(Model)} | "
   BACKTITLE+="${PRODUCTVER:-(Version)} | "
-  BACKTITLE+="${IPCON:-(IP)} | "
+  BACKTITLE+="${IPCON:-(no IP)} | "
   BACKTITLE+="Patch: ${ARCPATCH} | "
   BACKTITLE+="Config: ${CONFDONE} | "
   BACKTITLE+="Build: ${BUILDDONE} | "
@@ -44,22 +44,21 @@ function advancedMenu() {
     if [ "${CONFDONE}" = "true" ]; then
       if [ "${BOOTOPTS}" = "true" ]; then
         write_menu "6" "\Z1Hide Boot Options\Zn"
-        write_menu_with_color "m" "Kernelload" "${KERNELLOAD}"
-        write_menu_with_color "E" "eMMC Boot Support" "${EMMCBOOT}"
+        write_menu_value "m" "Kernelload" "${KERNELLOAD}"
+        write_menu_value "E" "eMMC Boot Support" "${EMMCBOOT}"
         if [ "${DIRECTBOOT}" = "false" ]; then
-          write_menu_with_color "i" "Boot IP Waittime" "${BOOTIPWAIT}"
+          write_menu_value "i" "Boot IP Waittime" "${BOOTIPWAIT}"
         fi
-        write_menu_with_color "q" "Directboot" "${DIRECTBOOT}"
-        write_menu_with_color "W" "RD Compression" "${RD_COMPRESSED}"
-        write_menu_with_color "X" "Sata DOM" "${SATADOM}"
-        write_menu_with_color "u" "LKM Version" "${LKM}"
+        write_menu_value "q" "Directboot" "${DIRECTBOOT}"
+        write_menu_value "W" "RD Compression" "${RD_COMPRESSED}"
+        write_menu_value "X" "Sata DOM" "${SATADOM}"
+        write_menu_value "u" "LKM Version" "${LKM}"
       else
         write_menu "6" "\Z1Show Boot Options\Zn"
       fi
 
       if [ "${DSMOPTS}" = "true" ]; then
         write_menu "7" "\Z1Hide DSM Options\Zn"
-        write_menu "=" "\Z4===== DSM =====\Zn"
         write_menu "j" "Cmdline"
         write_menu "k" "Synoinfo"
         write_menu "N" "Add new User"
@@ -76,7 +75,6 @@ function advancedMenu() {
 
     if [ "${LOADEROPTS}" = "true" ]; then
       write_menu "8" "\Z1Hide Loader Options\Zn"
-      write_menu "=" "\Z4===== Loader =====\Zn"
       write_menu "D" "StaticIP for Loader/DSM"
       write_menu "f" "Bootscreen Options"
       write_menu "U" "Change Loader Password"
@@ -93,8 +91,8 @@ function advancedMenu() {
       write_menu "8" "\Z1Show Loader Options\Zn"
     fi
 
-    dialog --clear --default-item ${NEXT} --backtitle "$(backtitle)" --title "Arc Config" --colors \
-          --cancel-label "Exit" \
+    dialog --clear --default-item ${NEXT} --backtitle "$(backtitle)" --title "Evo UI Advanced" --colors \
+          --cancel-label "Back" \
           --menu "" 0 0 0 --file "${TMP_PATH}/menu" \
           2>"${TMP_PATH}/resp"
     RET=$?
@@ -212,18 +210,18 @@ elif [ "${ARCMODE}" = "config" ]; then
     rm -f "${TMP_PATH}/menu" "${TMP_PATH}/resp" >/dev/null 2>&1 || true
     write_menu "=" "\Z4===== Main =====\Zn"
     if [ -z "${USERID}" ] && [ "${ARCOFFLINE}" = "false" ]; then
-      write_menu_with_color "0" "HardwareID" "${HARDWAREID}"
+      write_menu_value "0" "HardwareID" "${HARDWAREID}"
     fi
 
-    write_menu_with_color "1" "Model" "${MODEL}"
+    write_menu_value "1" "Model" "${MODEL}"
 
     if [ "${CONFDONE}" = "true" ]; then
-      write_menu_with_color "e" "Version" "${PRODUCTVER}"
-      write_menu_with_color "=" "DT" "${DT}"
-      write_menu_with_color "=" "Platform" "${PLATFORM}"
+      write_menu_value "e" "Version" "${PRODUCTVER}"
+      write_menu_value "=" "DT" "${DT}"
+      write_menu_value "=" "Platform" "${PLATFORM}"
 
       if [ -n "${USERID}" ] && [ "${ARCOFFLINE}" = "false" ]; then
-        write_menu_with_color "p" "Arc Patch" "${ARCPATCH}"
+        write_menu_value "p" "Arc Patch" "${ARCPATCH}"
       elif [ "${ARCOFFLINE}" = "false" ]; then
         write_menu "p" "Arc Patch: \Z4Register HardwareID first\Zn"
       else
@@ -235,7 +233,7 @@ elif [ "${ARCMODE}" = "config" ]; then
         if [ ${CPUINFO} -gt 24 ]; then
           write_menu "=" "Custom Kernel should be used for this CPU"
         fi
-        write_menu_with_color "K" "Kernel" "${KERNEL}"
+        write_menu_value "K" "Kernel" "${KERNEL}"
       fi
 
       write_menu "b" "Addons"
@@ -243,29 +241,29 @@ elif [ "${ARCMODE}" = "config" ]; then
       for addon in "cpufreqscaling" "storagepanel" "sequentialio"; do
         if readConfigMap "addons" "${USER_CONFIG_FILE}" | grep -q "${addon}"; then
           case "${addon}" in
-            "cpufreqscaling") write_menu_with_color "g" "Scaling Governor" "${GOVERNOR}" ;;
-            "storagepanel") write_menu_with_color "P" "StoragePanel" "${STORAGEPANEL:-auto}" ;;
-            "sequentialio") write_menu_with_color "Q" "SequentialIO" "${SEQUENTIALIO}" ;;
+            "cpufreqscaling") write_menu_value "g" "Scaling Governor" "${GOVERNOR}" ;;
+            "storagepanel") write_menu_value "P" "StoragePanel" "${STORAGEPANEL:-auto}" ;;
+            "sequentialio") write_menu_value "Q" "SequentialIO" "${SEQUENTIALIO}" ;;
           esac
         fi
       done
 
       write_menu "d" "Modules"
-      write_menu_with_color "O" "Official Driver Priority" "${ODP}"
+      write_menu_value "O" "Official Driver Priority" "${ODP}"
 
       if [ "${DT}" = "false" ] && [ ${SATACONTROLLER} -gt 0 ]; then
-        write_menu_with_color "S" "PortMap" "${REMAP}"
-        write_menu_with_color "=" "Mapping" "${PORTMAP}"
+        write_menu_value "S" "PortMap" "${REMAP}"
+        write_menu_value "=" "Mapping" "${PORTMAP}"
       fi
 
       if [ "${DT}" = "true" ]; then
-        write_menu_with_color "H" "Hotplug/SortDrives" "${HDDSORT}"
+        write_menu_value "H" "Hotplug/SortDrives" "${HDDSORT}"
       else
-        write_menu_with_color "h" "USB as Internal" "${USBMOUNT}"
+        write_menu_value "h" "USB as Internal" "${USBMOUNT}"
       fi
     fi
 
-    write_menu_with_color "c" "Offline Mode" "${ARCOFFLINE}"
+    write_menu_value "c" "Offline Mode" "${ARCOFFLINE}"
     write_menu "9" "Advanced Options"
     write_menu "=" "\Z4===== Diag =====\Zn"
     write_menu "a" "Sysinfo"

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

@@ -3,6 +3,7 @@
 . "${ARC_PATH}/include/consts.sh"
 . "${ARC_PATH}/include/configFile.sh"
 . "${ARC_PATH}/include/addons.sh"
+. "${ARC_PATH}/include/modules.sh"
 
 ###############################################################################
 # Check loader disk
@@ -645,18 +646,14 @@ function systemCheck () {
   else
     AESSYS="true"
   fi
-  # Check for ACPI Support
-  if ! grep -q "^flags.*acpi.*" /proc/cpuinfo; then
-    ACPISYS="false"
-  else
-    ACPISYS="true"
-  fi
   # Check for CPU Frequency Scaling
-  CPUFREQUENCIES=$(ls -ltr /sys/devices/system/cpu/cpufreq/* 2>/dev/null | wc -l)
-  if [ ${CPUFREQUENCIES} -gt 1 ]; then
+  CPUFREQUENCIES=$(ls -l /sys/devices/system/cpu/cpufreq/*/* 2>/dev/null | wc -l)
+  if [ ${CPUFREQUENCIES} -gt 0 ]; then
     CPUFREQ="true"
+    ACPISYS="true"
   else
     CPUFREQ="false"
+    ACPISYS="false"
   fi
   # Check for Arc Patch
   arc_mode
@@ -809,6 +806,6 @@ function write_menu() {
   echo "$1 \"$2\" " >>"${TMP_PATH}/menu"
 }
     
-function write_menu_with_color() {
+function write_menu_value() {
   echo "$1 \"$2: \Z4${3:-none}\Zn\" " >>"${TMP_PATH}/menu"
 }

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

@@ -2,66 +2,66 @@
 # Update Loader
 function updateLoader() {
   CONFDONE="$(readConfigKey "arc.confdone" "${USER_CONFIG_FILE}")"
-  local ARC_BRANCH="$(readConfigKey "arc.branch" "${USER_CONFIG_FILE}")"
-  local ARCMODE="$(readConfigKey "arc.mode" "${USER_CONFIG_FILE}")"
-  local ARCCONF="$(readConfigKey "${MODEL:-SA6400}.serial" "${S_FILE}")"
   local TAG="${1}"
   [ -n "${ARCCONF}" ] && cp -f "${S_FILE}" "${TMP_PATH}/bak.yml"
-  if [ -z "${TAG}" ]; then
-    idx=0
-    while [ ${idx} -le 5 ]; do # Loop 5 times, if successful, break
-      if [ "${ARC_BRANCH}" = "dev" ]; then
-        local TAG="$(curl -m 10 -skL "https://api.github.com/repos/AuxXxilium/arc/releases" | jq -r ".[].tag_name" | grep "dev" | sort -rV | head -1)"
-      else
-        local TAG="$(curl -m 10 -skL "https://api.github.com/repos/AuxXxilium/arc/releases" | jq -r ".[].tag_name" | grep -v "dev" | sort -rV | head -1)"
-      fi
-      if [ -n "${TAG}" ]; then
-        break
-      fi
-      sleep 3
-      idx=$((${idx} + 1))
-    done
-  fi
-  if [ -n "${TAG}" ]; then
-    export URL="https://github.com/AuxXxilium/arc/releases/download/${TAG}/update-${TAG}-${ARC_BRANCH}.zip"
-    export TAG="${TAG}"
-    {
-      {
-        curl -kL "${URL}" -o ${TMP_PATH}/update.zip 2>&3 3>&-
-      } 3>&1 >&4 4>&- |
-      perl -C -lane '
-        BEGIN {$header = "Downloading $ENV{URL}...\n\n"; $| = 1}
-        $pcent = $F[0];
-        $_ = join "", unpack("x3 a7 x4 a9 x8 a9 x7 a*") if length > 20;
-        s/ /\xa0/g; # replacing space with nbsp as dialog squashes spaces
-        if ($. <= 3) {
-          $header .= "$_\n";
-          $/ = "\r" if $. == 2
-        } else {
-          print "XXX\n$pcent\n$header$_\nXXX"
-        }' 4>&- |
-      dialog --gauge "Download Update: ${TAG}..." 14 72 4>&-
-    } 4>&1
-    if [ -f "${TMP_PATH}/update.zip" ] && [ $(ls -s "${TMP_PATH}/update.zip" | cut -d' ' -f1) -gt 300000 ]; then
-      HASHURL="https://github.com/AuxXxilium/arc/releases/download/${TAG}/update-${TAG}-${ARC_BRANCH}.hash"
-      HASH="$(curl -skL "${HASHURL}" | awk '{print $1}')"
-      if [ "${HASH}" != "$(sha256sum "${TMP_PATH}/update.zip" | awk '{print $1}')" ]; then
-        dialog --backtitle "$(backtitle)" --title "Update Loader" --aspect 18 \
-          --infobox "Update failed - Hash mismatch!\nTry again later." 0 0
+  if [ "${TAG}" != "zip" ]; then
+    if [ -z "${TAG}" ]; then
+      idx=0
+      while [ ${idx} -le 5 ]; do # Loop 5 times, if successful, break
+        if [ "${ARC_BRANCH}" = "dev" ]; then
+          TAG="$(curl -m 10 -skL "https://api.github.com/repos/AuxXxilium/arc/releases" | jq -r ".[].tag_name" | grep "dev" | sort -rV | head -1)"
+        else
+          TAG="$(curl -m 10 -skL "https://api.github.com/repos/AuxXxilium/arc/releases" | jq -r ".[].tag_name" | grep -v "dev" | sort -rV | head -1)"
+        fi
+        if [ -n "${TAG}" ]; then
+          break
+        fi
         sleep 3
-        exec reboot
-      else
-        rm -rf "/mnt/update"
-        mkdir -p "${TMP_PATH}/update"
-        dialog --backtitle "$(backtitle)" --title "Update Loader" \
-          --infobox "Updating Loader..." 3 50
-        if unzip -oq "${TMP_PATH}/update.zip" -d "${TMP_PATH}/update"; then
-          cp -rf "${TMP_PATH}/update"/* "/mnt"
-          rm -rf "${TMP_PATH}/update"
-          rm -f "${TMP_PATH}/update.zip"
+        idx=$((${idx} + 1))
+      done
+    fi
+    if [ -n "${TAG}" ]; then
+      export URL="https://github.com/AuxXxilium/arc/releases/download/${TAG}/update-${TAG}-${ARC_BRANCH}.zip"
+      export TAG="${TAG}"
+      {
+        {
+          curl -kL "${URL}" -o ${TMP_PATH}/update.zip 2>&3 3>&-
+        } 3>&1 >&4 4>&- |
+        perl -C -lane '
+          BEGIN {$header = "Downloading $ENV{URL}...\n\n"; $| = 1}
+          $pcent = $F[0];
+          $_ = join "", unpack("x3 a7 x4 a9 x8 a9 x7 a*") if length > 20;
+          s/ /\xa0/g; # replacing space with nbsp as dialog squashes spaces
+          if ($. <= 3) {
+            $header .= "$_\n";
+            $/ = "\r" if $. == 2
+          } else {
+            print "XXX\n$pcent\n$header$_\nXXX"
+          }' 4>&- |
+        dialog --gauge "Download Update: ${TAG}..." 14 72 4>&-
+      } 4>&1
+    fi
+    if [ -f "${TMP_PATH}/update.zip" ] && [ $(ls -s "${TMP_PATH}/update.zip" | cut -d' ' -f1) -gt 300000 ]; then
+      if [ "${TAG}" != "zip" ]; then
+        HASHURL="https://github.com/AuxXxilium/arc/releases/download/${TAG}/update-${TAG}-${ARC_BRANCH}.hash"
+        HASH="$(curl -skL "${HASHURL}" | awk '{print $1}')"
+        if [ "${HASH}" != "$(sha256sum "${TMP_PATH}/update.zip" | awk '{print $1}')" ]; then
+          dialog --backtitle "$(backtitle)" --title "Update Loader" --aspect 18 \
+            --infobox "Update failed - Hash mismatch!\nTry again later." 0 0
+          sleep 3
+          exec reboot
         fi
       fi
-      if [ "$(cat "${PART1_PATH}/ARC-VERSION")" = "${TAG}" ]; then
+      rm -rf "/mnt/update"
+      mkdir -p "${TMP_PATH}/update"
+      dialog --backtitle "$(backtitle)" --title "Update Loader" \
+        --infobox "Updating Loader..." 3 50
+      if unzip -oq "${TMP_PATH}/update.zip" -d "${TMP_PATH}/update"; then
+        cp -rf "${TMP_PATH}/update"/* "/mnt"
+        rm -rf "${TMP_PATH}/update"
+        rm -f "${TMP_PATH}/update.zip"
+      fi
+      if [ "$(cat "${PART1_PATH}/ARC-VERSION")" = "${TAG}" ] || [ "${TAG}" = "zip" ]; then
         dialog --backtitle "$(backtitle)" --title "Update Loader" \
         --infobox "Update Loader successful!" 3 50
         sleep 2

scripts/grub.sh

@@ -29,7 +29,7 @@ done
 popd
 
 rm -f grub.img
-dd if=/dev/zero of=grub.img bs=1M seek=2048 count=0
+dd if=/dev/zero of=grub.img bs=1M seek=1000 count=0
 echo -e "n\np\n1\n\n+50M\nn\np\n2\n\n+50M\nn\np\n3\n\n\na\n1\nw\nq\n" | fdisk grub.img
 fdisk -l grub.img