Merge pull request #6004 from AuxXxilium/dev

Dev

.github/workflows/build.yml

@@ -32,14 +32,6 @@ on:
         description: "pre release"
         default: false
         type: boolean
-      minimal:
-        description: "minimal"
-        default: true
-        type: boolean
-      extended:
-        description: "extended"
-        default: false
-        type: boolean
       clean:
         description: "clean"
         default: false
@@ -60,7 +52,7 @@ jobs:
           releases_keep_latest: 1
           delete_workflows: false
           delete_tags: true
-          gh_token: ${{ secrets.GITHUB_TOKEN }}
+          gh_token: ${{ secrets.BUILD_TOKEN }}
 
       # Install Dependencies
       - name: Install Dependencies
@@ -94,8 +86,7 @@ jobs:
           getOffline "files/p3/configs"
           getLKMs "files/p3/lkms"
           getTheme "files/p1/boot/grub"
-          getBuildrootx "brx" 
-          getBuildroots "brs"
+          getBuildroot "evo" "br"
 
           # Export Dependencies Version to env
           echo "ADDONTAG=${ADDONTAG}" >> $GITHUB_ENV
@@ -105,32 +96,30 @@ jobs:
           echo "CUSTOMTAG=${CUSTOMTAG}" >> $GITHUB_ENV
           echo "LKMTAG=${LKMTAG}" >> $GITHUB_ENV
           echo "THEMETAG=${THEMETAG}" >> $GITHUB_ENV
-          echo "BRXTAG=${BRXTAG}" >> $GITHUB_ENV
-          echo "BRSTAG=${BRSTAG}" >> $GITHUB_ENV
+          echo "BRTAG=${BRTAG}" >> $GITHUB_ENV
           echo "BUILD_TIME=$(date +'%Y-%m-%d %H:%M')" >> $GITHUB_ENV
 
           echo "OK"
 
        # Build incremental
-      - name: Build extended Image
-        if: ${{ inputs.extended }}
+      - name: Build Image
         run: |
           . scripts/func.sh
 
           # Modify Source File
-          ARC_BUILD="`date +'%y%m%d'`"
+          ARC_BUILD="$(date +'%y%m%d')"
           ARC_VERSION="${{ inputs.version }}"
-          ARC_BRANCH="extended"
-          echo "${ARC_BUILD}" >files/p1/ARC-BUILD
-          echo "${ARC_VERSION}" >files/p1/ARC-VERSION
-          echo "${ARC_BRANCH}" >files/p1/ARC-BRANCH
+          ARC_BRANCH="evo"
+          echo "${ARC_BUILD}" > "files/p1/ARC-BUILD"
           echo "ARC_BUILD=${ARC_BUILD}" >> $GITHUB_ENV
+          echo "${ARC_VERSION}" > "files/p1/ARC-VERSION"
           echo "ARC_VERSION=${ARC_VERSION}" >> $GITHUB_ENV
+          echo "${ARC_BRANCH}" > "files/p1/ARC-BRANCH"
           echo "ARC_BRANCH=${ARC_BRANCH}" >> $GITHUB_ENV
 
           echo "Create Arc Image"
-          IMAGE_FILE="arc_create.img"
-          gzip -dc "grub.img.gz" >"${IMAGE_FILE}"
+          IMAGE_FILE="arc.img"
+          gzip -dc "files/initrd/opt/arc/grub.img.gz" >"${IMAGE_FILE}"
           fdisk -l "${IMAGE_FILE}"
           
           LOOPX=$(sudo losetup -f)
@@ -142,11 +131,11 @@ jobs:
           sudo mount ${LOOPX}p1 "/tmp/p1"
           sudo mount ${LOOPX}p3 "/tmp/p3"
 
-          [ ! -f "brx/bzImage-arc" ] || [ ! -f "brx/initrd-arc" ] && return 1
+          [ ! -f "br/bzImage-arc" ] || [ ! -f "br/initrd-arc" ] && return 1
           
           echo "Repack initrd"
-          cp -f "brx/bzImage-arc" "files/p3/bzImage-arc"
-          repackInitrd "brx/initrd-arc" "files/initrd" "files/p3/initrd-arc"
+          cp -f "br/bzImage-arc" "files/p3/bzImage-arc"
+          repackInitrd "br/initrd-arc" "files/initrd" "files/p3/initrd-arc"
 
           echo "Copying files"
           sudo cp -rf "files/p1/"* "/tmp/p1"
@@ -161,12 +150,7 @@ jobs:
 
           sudo losetup --detach ${LOOPX}
 
-          # Resize Image
-          resizeImg "${IMAGE_FILE}" "+1024M" "arc.img" 2>/dev/null
-          rm -f "${IMAGE_FILE}"
-
           echo "Image Converter"
-          IMAGE_FILE="arc.img"
           qemu-img convert -p -f raw -O vmdk ${IMAGE_FILE} arc-dyn.vmdk
           qemu-img convert -p -f raw -o subformat=monolithicFlat -O vmdk ${IMAGE_FILE} arc.vmdk
 
@@ -178,93 +162,7 @@ jobs:
           convertova "${IMAGE_FILE}" "arc.ova"
 
       # Zip image and generate checksum
-      - name: Pack extended Image
-        if: ${{ inputs.extended }}
-        run: |
-          if [ -n "${{ env.ARC_VERSION }}" ]; then
-            zip -9 "arc-${{ env.ARC_VERSION }}-${{ env.ARC_BRANCH }}.img.zip" arc.img
-            zip -9 "arc-${{ env.ARC_VERSION }}-${{ env.ARC_BRANCH }}.vmdk-dyn.zip" arc-dyn.vmdk
-            zip -9 "arc-${{ env.ARC_VERSION }}-${{ env.ARC_BRANCH }}.vmdk-flat.zip" arc.vmdk arc-flat.vmdk
-            zip -9 "arc-${{ env.ARC_VERSION }}-${{ env.ARC_BRANCH }}.vhd.zip" arc.vhd arc.vmc
-            zip -9 "arc-${{ env.ARC_VERSION }}-${{ env.ARC_BRANCH }}.ova.zip" arc.ova
-            (cd files && zip -r ../update-${{ env.ARC_VERSION }}-${{ env.ARC_BRANCH }}.zip ./p1 ./p3)
-            sha256sum update-${{ env.ARC_VERSION }}-${{ env.ARC_BRANCH }}.zip >"update-${{ env.ARC_VERSION }}-${{ env.ARC_BRANCH }}.hash"
-          fi
-
-      # Cleanup
-      - name: Cleanup
-        run: |
-          rm -rf "arc.img" "arc.vmdk" "arc-dyn.vmdk" "arc-flat.vmdk" "arc.vhd" "arc.ova" "arc.vmc" 2>/dev/null
-
-       # Build incremental
-      - name: Build minimal Image
-        if: ${{ inputs.minimal }}
-        run: |
-          . scripts/func.sh
-
-          # Modify Source File
-          ARC_BUILD="`date +'%y%m%d'`"
-          ARC_VERSION="${{ inputs.version }}"
-          ARC_BRANCH="minimal"
-          echo "${ARC_BUILD}" >files/p1/ARC-BUILD
-          echo "${ARC_VERSION}" >files/p1/ARC-VERSION
-          echo "${ARC_BRANCH}" >files/p1/ARC-BRANCH
-          echo "ARC_BUILD=${ARC_BUILD}" >> $GITHUB_ENV
-          echo "ARC_VERSION=${ARC_VERSION}" >> $GITHUB_ENV
-          echo "ARC_BRANCH=${ARC_BRANCH}" >> $GITHUB_ENV
-
-          echo "Create Arc Image"
-          IMAGE_FILE="arc_create.img"
-          gzip -dc "grub.img.gz" >"${IMAGE_FILE}"
-          fdisk -l "${IMAGE_FILE}"
-          
-          LOOPX=$(sudo losetup -f)
-          sudo losetup -P "${LOOPX}" "${IMAGE_FILE}"
-
-          echo "Mounting Image File"
-          mkdir -p "/tmp/p1"
-          mkdir -p "/tmp/p3"
-          sudo mount ${LOOPX}p1 "/tmp/p1"
-          sudo mount ${LOOPX}p3 "/tmp/p3"
-
-          [ ! -f "brs/bzImage-arc" ] || [ ! -f "brs/initrd-arc" ] && return 1
-          
-          echo "Repack initrd"
-          cp -f "brs/bzImage-arc" "files/p3/bzImage-arc"
-          repackInitrd "brs/initrd-arc" "files/initrd" "files/p3/initrd-arc"
-
-          echo "Copying files"
-          sudo cp -rf "files/p1/"* "/tmp/p1"
-          sudo cp -rf "files/p3/"* "/tmp/p3"
-          sudo sync
-
-          echo "Unmount image file"
-          sudo umount "/tmp/p1"
-          sudo umount "/tmp/p3"
-          rmdir "/tmp/p1"
-          rmdir "/tmp/p3"
-
-          sudo losetup --detach ${LOOPX}
-
-          # Resize Image
-          resizeImg "${IMAGE_FILE}" "+1024M" "arc.img" 2>/dev/null
-          rm -f "${IMAGE_FILE}"
-
-          echo "Image Converter"
-          IMAGE_FILE="arc.img"
-          qemu-img convert -p -f raw -O vmdk ${IMAGE_FILE} arc-dyn.vmdk
-          qemu-img convert -p -f raw -o subformat=monolithicFlat -O vmdk ${IMAGE_FILE} arc.vmdk
-
-          echo "Create Arc vhd"
-          createvmc "arc.vmc"
-          qemu-img convert -p -f raw -O vpc ${IMAGE_FILE} arc.vhd
-
-          echo "Create Arc ova"
-          convertova "${IMAGE_FILE}" "arc.ova"
-
-      # Zip image and generate checksum
-      - name: Pack minimal Image
-        if: ${{ inputs.minimal }}
+      - name: Pack Image
         run: |
           if [ -n "${{ env.ARC_VERSION }}" ]; then
             zip -9 "arc-${{ env.ARC_VERSION }}-${{ env.ARC_BRANCH }}.img.zip" arc.img
@@ -290,12 +188,9 @@ jobs:
               - ${{ inputs.notice }}
 
             ### Information:
-              - Changelog is available in my Discord
               - Discord Account for Arc Patch needed
-
-            ### Versions:
-              ${{ inputs.minimal && '- minimal: Full Image, all dependencies are included (reduced size, faster boot)' || '' }}
-              ${{ inputs.extended && '- extended: Full Image, all dependencies are included (new features to test)' || '' }}
+              - Changelog is available in my Discord
+              - Based on VisionZ Evolution Code Base
 
             ### Dependencies:
               - Addons: ${{ env.ADDONTAG }}
@@ -304,8 +199,7 @@ jobs:
               - Patches: ${{ env.PATCHTAG }}
               - Custom: ${{ env.CUSTOMTAG }}
               - LKMs: ${{ env.LKMTAG }}
-              ${{ inputs.minimal && format('- Buildroot minimal: {0}', env.BRSTAG) || '' }}
-              ${{ inputs.extended && format('- Buildroot extended: {0}', env.BRXTAG) || '' }}
+              - Basesystem: ${{ env.BRTAG }}
 
             ### Release
               - ${{ env.BUILD_TIME }}

.github/workflows/custom.yml

@@ -161,64 +161,41 @@ jobs:
 
           cp -f "${IMAGE_FILE}" "arc.img"
 
-          if [ "${{ env.FORMAT }}" = "dyn" ]; then
+      # Zip image and generate checksum
+      - name: Convert & Pack
+        run: |
+          rm -rf arc-*.zip 2>/dev/null
+          if [ "${{ env.FORMAT }}" = "img" ]; then
+            zip -9 "arc-${{ env.MODEL }}-${{ env.VERSION }}.img.zip" arc.img
+          elif [ "${{ env.FORMAT }}" = "dyn" ]; then
             echo "Image Converter -> dyn"
             qemu-img convert arc.img -O vmdk -o adapter_type=lsilogic,compat6 arc-dyn.vmdk
+            zip -9 "arc-${{ env.MODEL }}-${{ env.VERSION }}.vmdk-dyn.zip" arc-dyn.vmdk
           elif [ "${{ env.FORMAT }}" = "flat" ]; then
             echo "Image Converter -> flat"
             qemu-img convert arc.img -O vmdk -o adapter_type=lsilogic,subformat=monolithicFlat,compat6 arc.vmdk
+            zip -9 "arc-${{ env.MODEL }}-${{ env.VERSION }}.vmdk-flat.zip" arc.vmdk arc-flat.vmdk
           elif [ "${{ env.FORMAT }}" = "vhdx" ]; then
             echo "Image Converter -> vhdx"
             qemu-img convert arc.img -O vhdx -o subformat=dynamic arc.vhdx
+            zip -9 "arc-${{ env.MODEL }}-${{ env.VERSION }}.vhdx.zip" arc.vhdx
           elif [ "${{ env.FORMAT }}" = "ova" ]; then
             echo "Image Converter -> ova"
             convertova "arc.img" "arc.ova"
-          fi
-
-      # Zip image and generate checksum
-      - name: Pack
-        run: |
-          if [ "${{ env.FORMAT }}" = "img" ]; then
-            zip -9 "arc-${{ env.MODEL }}-${{ env.VERSION }}.img.zip" arc.img
-            UPLOAD="$(curl -k -F "file=@arc-${{ env.MODEL }}-${{ env.VERSION }}.img.zip" "https://file.io")"
-            if ! echo "${UPLOAD}" | grep -oP '"link":\s*"\K[^"]+'; then
-              echo "Upload failed"
-              exit 1
-            fi
-          elif [ "${{ env.FORMAT }}" = "dyn" ]; then
-            zip -9 "arc-${{ env.MODEL }}-${{ env.VERSION }}.vmdk-dyn.zip" arc-dyn.vmdk
-            UPLOAD="$(curl -k -F "file=@arc-${{ env.MODEL }}-${{ env.VERSION }}.vmdk-dyn.zip" "https://file.io")"
-            if ! echo "${UPLOAD}" | grep -oP '"link":\s*"\K[^"]+'; then
-              echo "Upload failed"
-              exit 1
-            fi
-          elif [ "${{ env.FORMAT }}" = "flat" ]; then
-            zip -9 "arc-${{ env.MODEL }}-${{ env.VERSION }}.vmdk-flat.zip" arc.vmdk arc-flat.vmdk
-            UPLOAD="$(curl -k -F "file=@arc-${{ env.MODEL }}-${{ env.VERSION }}.vmdk-flat.zip" "https://file.io")"
-            if ! echo "${UPLOAD}" | grep -oP '"link":\s*"\K[^"]+'; then
-              echo "Upload failed"
-              exit 1
-            fi
-          elif [ "${{ env.FORMAT }}" = "vhdx" ]; then
-            zip -9 "arc-${{ env.MODEL }}-${{ env.VERSION }}.vhdx.zip" arc.vhdx
-            UPLOAD="$(curl -k -F "file=@arc-${{ env.MODEL }}-${{ env.VERSION }}.vhdx.zip" "https://file.io")"
-            if ! echo "${UPLOAD}" | grep -oP '"link":\s*"\K[^"]+'; then
-              echo "Upload failed"
-              exit 1
-            fi
-          elif [ "${{ env.FORMAT }}" = "ova" ]; then
             zip -9 "arc-${{ env.MODEL }}-${{ env.VERSION }}.ova.zip" arc.ova
-            UPLOAD="$(curl -k -F "file=@arc-${{ env.MODEL }}-${{ env.VERSION }}.ova.zip" "https://file.io")"
-            if ! echo "${UPLOAD}" | grep -oP '"link":\s*"\K[^"]+'; then
-              echo "Upload failed"
-              exit 1
-            fi
           fi
 
           EMAIL=$(curl -s -H "Authorization: token ${{ secrets.ACTION }}" "https://api.github.com/users/${{ github.event.issue.user.login }}" | jq -r '.email')
-          FIOURL="$(echo "${UPLOAD}" | grep -oP '"link":\s*"\K[^"]+')"
           echo "EMAIL=${EMAIL}" >> $GITHUB_ENV
-          echo "FIOURL=${FIOURL}" >> $GITHUB_ENV
+
+      # Upload artifact
+      - name: Upload to Artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: arc-${{ env.MODEL }}-${{ env.VERSION }}-${{ github.run_id }}
+          path: |
+            arc-*.zip
+          retention-days: 1
 
       - name: Send mail
         if: success() && env.EMAIL != 'null'
@@ -232,7 +209,12 @@ jobs:
           to: ${{ env.EMAIL }}
           from: ${{ secrets.MAIL_USERNAME }}
           body: |
-            ${{ env.FIOURL }}
+            Hi @${{ github.event.issue.user.login }}.  
+            arc-${{ env.MODEL }}-${{ env.VERSION }} is ready to download:
+            > ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
+
+            If this isn't working, do not use customized Versions!
+            ----
 
       - name: Update Comment Success
         if: success()
@@ -244,10 +226,10 @@ jobs:
           update-mode: replace
           body: |
             Hi @${{ github.event.issue.user.login }}.  
-            arc-${{ env.MODEL }}-${{ env.VERSION }} is ready to download: ${{ env.FIOURL }}
+            arc-${{ env.MODEL }}-${{ env.VERSION }} is ready to download:
             > ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
 
-            If this will not work, do not use customized Versions!
+            If this isn't working, do not use customized Versions!
             ----
 
       - name: Update Comment Fail
@@ -260,10 +242,8 @@ jobs:
           update-mode: replace
           body: |
             Hi @${{ github.event.issue.user.login }}.  
-            arc-${{ env.MODEL }}-${{ env.PRODUCTVER }}-${{ env.VERSION }} failed to build and package, please try again.  
+            arc-${{ env.MODEL }}-${{ env.PRODUCTVER }}-${{ env.VERSION }} failed to build and package, please try again later.  
             > ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }} 
-
-            If this will not work, do not use customized Versions!
             ----
 
       - name: Close Issues

.github/workflows/grub.yml

@@ -28,8 +28,8 @@ jobs:
           sudo timedatectl set-timezone "Europe/Berlin"
 
           sudo apt update
-          sudo apt install -y autoconf automake autopoint gettext build-essential bison flex libtool dosfstools e2fsprogs
-          sudo apt install -y libfreetype6-dev unifont fonts-dejavu libfuse-dev liblzma-dev libzfslinux-dev
+          sudo apt install -y autoconf automake autopoint build-essential pkg-config bison flex gettext gawk libtool dosfstools e2fsprogs
+          sudo apt install -y libfreetype6-dev unifont fonts-dejavu libfuse-dev libzfslinux-dev liblzma-dev libdevmapper-dev
 
       - name: Make Grub
         run: |
@@ -40,6 +40,7 @@ jobs:
         if: success() && inputs.push == true
         run: |
           if [ -f "grub.img.gz" ]; then
+            mv -f "grub.img.gz" "files/initrd/opt/arc/grub.img.gz"
             echo "Git push ..."
             git pull
             status=$(git status -s | grep -E 'grub.img.gz' | awk '{printf " %s", $2}')

Taskfile.yaml

@@ -3,17 +3,11 @@
 version: "3"
 
 tasks:
-  build-ext:
+  build-evo:
     cmds:
       - git reset --hard
       - git pull
-      - ./img-ext.sh
-
-  build-min:
-    cmds:
-      - git reset --hard
-      - git pull
-      - ./img-min.sh
+      - ./img-gen.sh evo
 
   compile-kpatch:
     dir: kpatch

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

@@ -1,3 +1,230 @@
+###############################################################################
+# Read Data
+function readData() {
+  # Get DSM Data from Config
+  MODEL="$(readConfigKey "model" "${USER_CONFIG_FILE}")"
+  MODELID="$(readConfigKey "modelid" "${USER_CONFIG_FILE}")"
+  LKM="$(readConfigKey "lkm" "${USER_CONFIG_FILE}")"
+  if [ -n "${MODEL}" ]; then
+    DT="$(readConfigKey "platforms.${PLATFORM}.dt" "${P_FILE}")"
+    PRODUCTVER="$(readConfigKey "productver" "${USER_CONFIG_FILE}")"
+    PLATFORM="$(readConfigKey "platform" "${USER_CONFIG_FILE}")"
+  fi
+
+  # Get Arc Data from Config
+  ARCPATCH="$(readConfigKey "arc.patch" "${USER_CONFIG_FILE}")"
+  HARDWAREID="$(genHWID)"
+  USERID="$(readConfigKey "arc.userid" "${USER_CONFIG_FILE}")"
+  ARCCONF="$(readConfigKey "${MODEL:-SA6400}.serial" "${S_FILE}")"
+  EXTERNALCONTROLLER="$(readConfigKey "device.externalcontroller" "${USER_CONFIG_FILE}")"
+  SATACONTROLLER="$(readConfigKey "device.satacontroller" "${USER_CONFIG_FILE}")"
+  SCSICONTROLLER="$(readConfigKey "device.scsicontroller" "${USER_CONFIG_FILE}")"
+  RAIDCONTROLLER="$(readConfigKey "device.raidcontroller" "${USER_CONFIG_FILE}")"
+  SASCONTROLLER="$(readConfigKey "device.sascontroller" "${USER_CONFIG_FILE}")"
+
+  # Advanced Config
+  if [ "${CONFDONE}" = "true" ]; then
+    BOOTIPWAIT="$(readConfigKey "bootipwait" "${USER_CONFIG_FILE}")"
+    DIRECTBOOT="$(readConfigKey "directboot" "${USER_CONFIG_FILE}")"
+    EMMCBOOT="$(readConfigKey "emmcboot" "${USER_CONFIG_FILE}")"
+    HDDSORT="$(readConfigKey "hddsort" "${USER_CONFIG_FILE}")"
+    USBMOUNT="$(readConfigKey "usbmount" "${USER_CONFIG_FILE}")"
+    KERNEL="$(readConfigKey "kernel" "${USER_CONFIG_FILE}")"
+    KERNELLOAD="$(readConfigKey "kernelload" "${USER_CONFIG_FILE}")"
+    KERNELPANIC="$(readConfigKey "kernelpanic" "${USER_CONFIG_FILE}")"
+    GOVERNOR="$(readConfigKey "governor" "${USER_CONFIG_FILE}")"
+    STORAGEPANEL="$(readConfigKey "addons.storagepanel" "${USER_CONFIG_FILE}")"
+    SEQUENTIALIO="$(readConfigKey "addons.sequentialio" "${USER_CONFIG_FILE}")"
+    ODP="$(readConfigKey "odp" "${USER_CONFIG_FILE}")"
+    RD_COMPRESSED="$(readConfigKey "rd-compressed" "${USER_CONFIG_FILE}")"
+    SATADOM="$(readConfigKey "satadom" "${USER_CONFIG_FILE}")"
+    REMAP="$(readConfigKey "arc.remap" "${USER_CONFIG_FILE}")"
+    if [ "${REMAP}" = "acports" ] || [ "${REMAP}" = "maxports" ]; then
+      PORTMAP="$(readConfigKey "cmdline.SataPortMap" "${USER_CONFIG_FILE}")"
+      DISKMAP="$(readConfigKey "cmdline.DiskIdxMap" "${USER_CONFIG_FILE}")"
+    elif [ "${REMAP}" = "remap" ]; then
+      PORTMAP="$(readConfigKey "cmdline.sata_remap" "${USER_CONFIG_FILE}")"
+    elif [ "${REMAP}" = "ahci" ]; then
+      PORTMAP="$(readConfigKey "cmdline.ahci_remap" "${USER_CONFIG_FILE}")"
+    elif [ "${REMAP}" = "user" ]; then
+      PORTMAP="user"
+    fi
+    if [[ "${REMAP}" = "acports" || "${REMAP}" = "maxports" ]]; then
+      SPORTMAP="SataPortMap: ${PORTMAP} | ${DISKMAP}"
+    elif [ "${REMAP}" = "remap" ]; then
+      SPORTMAP="SataRemap: ${PORTMAP}"
+    elif [ "${REMAP}" = "ahci" ]; then
+      SPORTMAP="AHCIRemap: ${PORTMAP}"
+    elif [ "${REMAP}" = "user" ]; then
+      SPORTMAP=""
+      [ -n "${PORTMAP}" ] && SPORTMAP+="SataPortMap: ${PORTMAP}"
+      [ -n "${DISKMAP}" ] && SPORTMAP+="DiskIdxMap: ${DISKMAP}"
+      [ -n "${PORTREMAP}" ] && SPORTMAP+="SataRemap: ${PORTREMAP}"
+      [ -n "${AHCIPORTREMAP}" ] && SPORTMAP+="AHCIRemap: ${AHCIPORTREMAP}"
+    fi
+  fi
+
+  # Get Config/Build Status
+  ARC_BRANCH="$(readConfigKey "arc.branch" "${USER_CONFIG_FILE}")"
+  CONFDONE="$(readConfigKey "arc.confdone" "${USER_CONFIG_FILE}")"
+  BUILDDONE="$(readConfigKey "arc.builddone" "${USER_CONFIG_FILE}")"
+}
+
+###############################################################################
+# Advanced Menu
+function advancedMenu() {
+  NEXT="a"
+  while true; do
+    rm -f "${TMP_PATH}/menu" "${TMP_PATH}/resp" >/dev/null 2>&1 || true
+    write_menu "=" "\Z4===== System ====\Zn"
+
+    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}"
+        if [ "${DIRECTBOOT}" = "false" ]; then
+          write_menu_with_color "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}"
+      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"
+        write_menu "t" "Change User Password"
+        write_menu "J" "Reset Network Config"
+        write_menu "T" "Disable all scheduled Tasks"
+        write_menu "M" "Mount DSM Storage Pool"
+        write_menu "l" "Edit User Config"
+        write_menu "s" "Allow Downgrade Version"
+      else
+        write_menu "7" "\Z1Show DSM Options\Zn"
+      fi
+    fi
+
+    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"
+      write_menu "Z" "Change Loader Ports"
+      write_menu "w" "Reset Loader to Defaults"
+      write_menu "L" "Grep Logs from dbgutils"
+      write_menu "B" "Grep DSM Config from Backup"
+      write_menu "=" "\Z1== Edit with caution! ==\Zn"
+      write_menu "C" "Clone Loader to another Disk"
+      write_menu "n" "Grub Bootloader Config"
+      write_menu "y" "Choose a Keymap for Loader"
+      write_menu "F" "\Z1Formate Disks\Zn"
+    else
+      write_menu "8" "\Z1Show Loader Options\Zn"
+    fi
+
+    dialog --clear --default-item ${NEXT} --backtitle "$(backtitle)" --title "Arc Config" --colors \
+          --cancel-label "Exit" \
+          --menu "" 0 0 0 --file "${TMP_PATH}/menu" \
+          2>"${TMP_PATH}/resp"
+    RET=$?
+    case ${RET} in
+      0)
+        resp=$(cat ${TMP_PATH}/resp)
+        [ -z "${resp}" ] && return
+        case ${resp} in
+          # DSM Section
+          7) [ "${DSMOPTS}" = "true" ] && DSMOPTS='false' || DSMOPTS='true'
+            DSMOPTS="${DSMOPTS}"
+            NEXT="7"
+            ;;
+          j) cmdlineMenu; NEXT="j" ;;
+          k) synoinfoMenu; NEXT="k" ;;
+          l) editUserConfig; NEXT="l" ;;
+          s) downgradeMenu; NEXT="s" ;;
+          t) resetPassword; NEXT="t" ;;
+          N) addNewDSMUser; NEXT="N" ;;
+          J) resetDSMNetwork; NEXT="J" ;;
+          M) mountDSM; NEXT="M" ;;
+          T) disablescheduledTasks; NEXT="T" ;;
+          B) getbackup; NEXT="B" ;;
+          # Loader Section
+          8) [ "${LOADEROPTS}" = "true" ] && LOADEROPTS='false' || LOADEROPTS='true'
+            LOADEROPTS="${LOADEROPTS}"
+            NEXT="8"
+            ;;
+          D) staticIPMenu; NEXT="D" ;;
+          f) bootScreen; NEXT="f" ;;
+          Z) loaderPorts; NEXT="Z" ;;
+          U) loaderPassword; NEXT="U" ;;
+          L) greplogs; NEXT="L" ;;
+          w) resetLoader; NEXT="w" ;;
+          C) cloneLoader; NEXT="C" ;;
+          n) editGrubCfg; NEXT="n" ;;
+          y) keymapMenu; NEXT="y" ;;
+          F) formatDisks; NEXT="F" ;;
+          6) [ "${BOOTOPTS}" = "true" ] && BOOTOPTS='false' || BOOTOPTS='true'
+            BOOTOPTS="${BOOTOPTS}"
+            NEXT="6"
+            ;;
+          m) [ "${KERNELLOAD}" = "kexec" ] && KERNELLOAD='power' || KERNELLOAD='kexec'
+            writeConfigKey "kernelload" "${KERNELLOAD}" "${USER_CONFIG_FILE}"
+            NEXT="m"
+            ;;
+          E) [ "${EMMCBOOT}" = "true" ] && EMMCBOOT='false' || EMMCBOOT='true'
+            if [ "${EMMCBOOT}" = "false" ]; then
+              writeConfigKey "emmcboot" "false" "${USER_CONFIG_FILE}"
+              deleteConfigKey "synoinfo.disk_swap" "${USER_CONFIG_FILE}"
+              deleteConfigKey "synoinfo.supportraid" "${USER_CONFIG_FILE}"
+              deleteConfigKey "synoinfo.support_emmc_boot" "${USER_CONFIG_FILE}"
+              deleteConfigKey "synoinfo.support_install_only_dev" "${USER_CONFIG_FILE}"
+            elif [ "${EMMCBOOT}" = "true" ]; then
+              writeConfigKey "emmcboot" "true" "${USER_CONFIG_FILE}"
+              writeConfigKey "synoinfo.disk_swap" "no" "${USER_CONFIG_FILE}"
+              writeConfigKey "synoinfo.supportraid" "no" "${USER_CONFIG_FILE}"
+              writeConfigKey "synoinfo.support_emmc_boot" "yes" "${USER_CONFIG_FILE}"
+              writeConfigKey "synoinfo.support_install_only_dev" "yes" "${USER_CONFIG_FILE}"
+            fi
+            writeConfigKey "arc.builddone" "false" "${USER_CONFIG_FILE}"
+            BUILDDONE="$(readConfigKey "arc.builddone" "${USER_CONFIG_FILE}")"
+            NEXT="E"
+            ;;
+          W) RD_COMPRESSED=$([ "${RD_COMPRESSED}" = "true" ] && echo 'false' || echo 'true')
+            writeConfigKey "rd-compressed" "${RD_COMPRESSED}" "${USER_CONFIG_FILE}"
+            writeConfigKey "arc.builddone" "false" "${USER_CONFIG_FILE}"
+            BUILDDONE="$(readConfigKey "arc.builddone" "${USER_CONFIG_FILE}")"
+            NEXT="W"
+            ;;
+          X) satadomMenu; NEXT="X" ;;
+          u) [ "${LKM}" = "prod" ] && LKM='dev' || LKM='prod'
+            writeConfigKey "lkm" "${LKM}" "${USER_CONFIG_FILE}"
+            writeConfigKey "arc.builddone" "false" "${USER_CONFIG_FILE}"
+            BUILDDONE="$(readConfigKey "arc.builddone" "${USER_CONFIG_FILE}")"
+            NEXT="u"
+            ;;
+          i) bootipwaittime; NEXT="i" ;;
+          q) [ "${DIRECTBOOT}" = "false" ] && DIRECTBOOT='true' || DIRECTBOOT='false'
+            grub-editenv ${USER_GRUBENVFILE} create
+            writeConfigKey "directboot" "${DIRECTBOOT}" "${USER_CONFIG_FILE}"
+            NEXT="q"
+            ;;
+        esac
+        ;;
+      *)
+        break
+        ;;
+    esac
+  done
+  return
+}
+
 ###############################################################################
 # Permits user edit the user config
 function editUserConfig() {
@@ -39,53 +266,41 @@ function addonSelection() {
   PRODUCTVER="$(readConfigKey "productver" "${USER_CONFIG_FILE}")"
   PLATFORM="$(readConfigKey "platform" "${USER_CONFIG_FILE}")"
   ARCCONF="$(readConfigKey "${MODEL}.serial" "${S_FILE}")"
+
   # read addons from user config
-  unset ADDONS
   declare -A ADDONS
   while IFS=': ' read -r KEY VALUE; do
     [ -n "${KEY}" ] && ADDONS["${KEY}"]="${VALUE}"
   done < <(readConfigMap "addons" "${USER_CONFIG_FILE}")
-  rm -f "${TMP_PATH}/opts" >/dev/null
+
+  rm -f "${TMP_PATH}/opts"
   touch "${TMP_PATH}/opts"
+
   while read -r ADDON DESC; do
     arrayExistItem "${ADDON}" "${!ADDONS[@]}" && ACT="on" || ACT="off"
-    if [[ "${ADDON}" = "amepatch" || "${ADDON}" = "arcdns" ]] && [ -z "${ARCCONF}" ]; then
-      continue
-    elif [ "${ADDON}" = "codecpatch" ] && [ -n "${ARCCONF}" ]; then
+    if { [[ "${ADDON}" = "amepatch" || "${ADDON}" = "arcdns" ]] && [ -z "${ARCCONF}" ]; } || { [ "${ADDON}" = "codecpatch" ] && [ -n "${ARCCONF}" ]; }; then
       continue
     else
       echo -e "${ADDON} \"${DESC}\" ${ACT}" >>"${TMP_PATH}/opts"
     fi
   done < <(availableAddons "${PLATFORM}")
-  if [ "${STEP}" = "addons" ]; then
-    dialog --backtitle "$(backtitlep)" --title "Addons" --colors --aspect 18 \
-      --checklist "Select Addons to include.\nAddons: \Z1System Addon\Zn | \Z4App Addon\Zn\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)
-  else
-    dialog --backtitle "$(backtitle)" --title "Addons" --colors --aspect 18 \
-      --checklist "Select Addons to include.\nAddons: \Z1System Addon\Zn | \Z4App Addon\Zn\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)
-  fi
-  unset ADDONS
+
+  dialog --backtitle "$(backtitle)" --title "Addons" --colors --aspect 18 \
+    --checklist "Select Addons to include.\nAddons: \Z1System Addon\Zn | \Z4App Addon\Zn\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")
+
   declare -A ADDONS
   writeConfigKey "addons" "{}" "${USER_CONFIG_FILE}"
   for ADDON in ${resp}; do
     ADDONS["${ADDON}"]=""
     writeConfigKey "addons.\"${ADDON}\"" "" "${USER_CONFIG_FILE}"
   done
+
   ADDONSINFO="$(readConfigEntriesArray "addons" "${USER_CONFIG_FILE}")"
-  if [ "${STEP}" = "addons" ]; then
-    dialog --backtitle "$(backtitlep)" --title "Addons" \
-      --msgbox "Addons selected:\n${ADDONSINFO}" 7 70
-  else
-    dialog --backtitle "$(backtitle)" --title "Addons" \
-      --msgbox "Addons selected:\n${ADDONSINFO}" 7 70
-  fi
-  return
+  dialog --backtitle "$(backtitle)" --title "Addons" \
+    --msgbox "Addons selected:\n${ADDONSINFO}" 7 70
 }
 
 ###############################################################################
@@ -709,23 +924,20 @@ function backupMenu() {
     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 HW Encryption Key from DSM" \
-        3 "Backup HW Encryption Key to DSM" \
-        4 "Restore Arc Config from Online" \
-        5 "Backup Arc Config to Online" \
+        2 "Restore Hardware Key from DSM" \
+        3 "Restore Arc Config from Online" \
+        4 "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 HW Encryption Key from DSM" \
-        3 "Backup HW Encryption Key to DSM" \
-        4 "Restore Arc Config from Online" \
+        2 "Restore Hardware Key from DSM" \
+        3 "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 HW Encryption Key from DSM" \
-        3 "Backup HW Encryption Key to DSM" \
+        2 "Restore Hardware Key from DSM" \
         2>"${TMP_PATH}/resp"
     fi
     [ $? -ne 0 ] && break
@@ -812,38 +1024,6 @@ function backupMenu() {
         fi
         ;;
       3)
-        BACKUPKEY="false"
-        DSMROOTS="$(findDSMRoot)"
-        if [ -z "${DSMROOTS}" ]; then
-          dialog --backtitle "$(backtitle)" --title "Backup Encrytion 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"
-            [ $? -ne 0 ] && continue
-            if [ -f "${PART2_PATH}/machine.key" ]; then
-              cp -f "${PART2_PATH}/machine.key" "${TMP_PATH}/mdX/usr/arc/backup/p2/machine.key"
-              BACKUPKEY="true"
-              sync
-            fi
-            umount "${TMP_PATH}/mdX"
-          done
-          rm -rf "${TMP_PATH}/mdX" >/dev/null
-        ) 2>&1 | dialog --backtitle "$(backtitle)" --title "Backup Encrytion Key" \
-          --progressbox "Backup Encryption Key ..." 20 70
-        if [ "${BACKUPKEY}" = "true" ]; then
-          dialog --backtitle "$(backtitle)" --title "Backup Encrytion Key"  \
-            --msgbox "Encryption Key backup successful!" 0 0
-        else
-          dialog --backtitle "$(backtitle)" --title "Backup Encrytion Key"  \
-            --msgbox "No Encryption Key found!" 0 0
-        fi
-        ;;
-      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
@@ -874,7 +1054,7 @@ function backupMenu() {
         sleep 2
         rm -f "${HOME}/.initialized" && exec init.sh
         ;;
-      5)
+      4)
         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
@@ -937,17 +1117,14 @@ function updateMenu() {
       4)
         dialog --backtitle "$(backtitle)" --title "Switch Arc Branch" \
           --menu "Choose a Branch" 0 0 0 \
-          1 "minimal - reduced size and faster boot" \
-          2 "extended - new features to test" \
-          3 "dev - Development only" \
+          1 "evolution - Stable System" \
+          3 "dev - Development System" \
           2>"${TMP_PATH}/opts"
         [ $? -ne 0 ] && break
         opts=$(cat ${TMP_PATH}/opts)
         if [ ${opts} -eq 1 ]; then
-          ARC_BRANCH="minimal"
+          ARC_BRANCH="stable"
         elif [ ${opts} -eq 2 ]; then
-          ARC_BRANCH="extended"
-        elif [ ${opts} -eq 3 ]; then
           ARC_BRANCH="dev"
         fi
         writeConfigKey "arc.branch" "${ARC_BRANCH}" "${USER_CONFIG_FILE}"
@@ -995,7 +1172,7 @@ function sysinfo() {
   GOVERNOR="$(readConfigKey "governor" "${USER_CONFIG_FILE}")"
   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) || true
+  ETHX=$(ls /sys/class/net/ 2>/dev/null | grep eth)
   ETHN=$(echo ${ETHX} | wc -w)
   ARC_BRANCH="$(readConfigKey "arc.branch" "${USER_CONFIG_FILE}")"
   HWID="$(genHWID)"
@@ -1040,7 +1217,7 @@ function sysinfo() {
   PATCHESVERSION="$(cat "${PATCH_PATH}/VERSION")"
   TIMEOUT=5
   # Print System Informations
-  TEXT="\n\n\Z4> System: ${MACHINE} | ${BOOTSYS} | ${BUS}\Zn"
+  TEXT="\n\Z4> System: ${MACHINE} | ${BOOTSYS} | ${BUS}\Zn"
   TEXT+="\n  Vendor: \Zb${VENDOR}\Zn"
   TEXT+="\n  CPU: \Zb${CPU}\Zn"
   if [ $(lspci -d ::300 | wc -l) -gt 0 ]; then
@@ -1286,7 +1463,7 @@ function uploadDiag () {
 # Shows Networkdiag to user
 function networkdiag() {
   (
-  ETHX=$(ls /sys/class/net/ 2>/dev/null | grep eth) || true
+  ETHX=$(ls /sys/class/net/ 2>/dev/null | grep eth)
   for N in ${ETHX}; do
     echo
     DRIVER=$(ls -ld /sys/class/net/${N}/device/driver 2>/dev/null | awk -F '/' '{print $NF}')
@@ -1364,12 +1541,12 @@ function credits() {
   TEXT+="\n"
   TEXT+="\n\Z4>> Developer:\Zn"
   TEXT+="\n   Arc Loader: \ZbAuxXxilium / Fulcrum\Zn"
+  TEXT+="\n   Arc Evo Base: \ZbVisionZ\Zn"
   TEXT+="\n"
   TEXT+="\n\Z4>> Based on:\Zn"
   TEXT+="\n   Redpill: \ZbTTG / Pocopico\Zn"
   TEXT+="\n   ARPL/RR: \Zbfbelavenuto / wjz304\Zn"
-  TEXT+="\n   Others: \Zb007revad / more...\Zn"
-  TEXT+="\n   System: \ZbBuildroot\Zn"
+  TEXT+="\n   Others: \Zb007revad / PeterSuh-Q3 / more...\Zn"
   TEXT+="\n   DSM: \ZbSynology Inc.\Zn"
   TEXT+="\n"
   TEXT+="\n\Z4>> Note:\Zn"
@@ -1390,7 +1567,7 @@ function credits() {
 ###############################################################################
 # Setting Static IP for Loader
 function staticIPMenu() {
-  ETHX=$(ls /sys/class/net/ 2>/dev/null | grep eth) || true
+  ETHX=$(ls /sys/class/net/ 2>/dev/null | grep eth)
   IPCON=""
   for N in ${ETHX}; do
     MACR="$(cat /sys/class/net/${N}/address 2>/dev/null | sed 's/://g')"
@@ -1678,7 +1855,7 @@ function loaderPorts() {
   MSG="Modify Ports (0-65535) (Leave empty for default):"
   unset HTTPPORT DUFSPORT TTYDPORT
   [ -f "/etc/arc.conf" ] && source "/etc/arc.conf" 2>/dev/null
-  local HTTP=${HTTPPORT:-8080}
+  local HTTP=${HTTPPORT:-80}
   local DUFS=${DUFSPORT:-7304}
   local TTYD=${TTYDPORT:-7681}
   while true; do
@@ -1687,7 +1864,7 @@ function loaderPorts() {
       2>"${TMP_PATH}/resp"
     RET=$?
     case ${RET} in
-    0) # ok-button
+    0)
       HTTP=$(sed -n '1p' "${TMP_PATH}/resp" 2>/dev/null)
       DUFS=$(sed -n '2p' "${TMP_PATH}/resp" 2>/dev/null)
       TTYD=$(sed -n '3p' "${TMP_PATH}/resp" 2>/dev/null)
@@ -1699,7 +1876,7 @@ function loaderPorts() {
         [ $? -eq 0 ] && continue || break
       fi
       rm -f "/etc/arc.conf"
-      [ "${HTTPPORT:-8080}" != "8080" ] && echo "HTTP_PORT=${HTTPPORT}" >>"/etc/arc.conf"
+      [ "${HTTPPORT:-80}" != "80" ] && echo "HTTP_PORT=${HTTPPORT}" >>"/etc/arc.conf"
       [ "${DUFSPORT:-7304}" != "7304" ] && echo "DUFS_PORT=${DUFSPORT}" >>"/etc/arc.conf"
       [ "${TTYDPORT:-7681}" != "7681" ] && echo "TTYD_PORT=${TTYDPORT}" >>"/etc/arc.conf"
       RDXZ_PATH="${TMP_PATH}/rdxz_tmp"
@@ -1754,7 +1931,7 @@ function loaderPorts() {
         --msgbox "${MSG}" 0 0
       rm -f "${TMP_PATH}/restartS.sh"
       {
-        [ ! "${HTTP:-8080}" = "${HTTPPORT:-8080}" ] && echo "/etc/init.d/S90thttpd restart"
+        [ ! "${HTTP:-80}" = "${HTTPPORT:-80}" ] && echo "/etc/init.d/S90thttpd restart"
         [ ! "${DUFS:-7304}" = "${DUFSPORT:-7304}" ] && echo "/etc/init.d/S99dufs restart"
         [ ! "${TTYD:-7681}" = "${TTYDPORT:-7681}" ] && echo "/etc/init.d/S99ttyd restart"
       } >"${TMP_PATH}/restartS.sh"
@@ -1784,19 +1961,25 @@ function disablescheduledTasks {
     for I in ${DSMROOTS}; do
       # fixDSMRootPart "${I}"
       mount -t ext4 "${I}" "${TMP_PATH}/mdX"
-      [ $? -ne 0 ] && continue
+      if [ $? -ne 0 ]; then
+        continue
+      fi
       if [ -f "${TMP_PATH}/mdX/usr/syno/etc/esynoscheduler/esynoscheduler.db" ]; then
-        echo "UPDATE task SET enable = 0;" | sqlite3 ${TMP_PATH}/mdX/usr/syno/etc/esynoscheduler/esynoscheduler.db
+        echo "UPDATE task SET enable = 0;" | sqlite3 "${TMP_PATH}/mdX/usr/syno/etc/esynoscheduler/esynoscheduler.db"
         sync
-        echo "true" >${TMP_PATH}/isEnable
+        echo "true" > "${TMP_PATH}/isEnable"
       fi
       umount "${TMP_PATH}/mdX"
     done
     rm -rf "${TMP_PATH}/mdX"
   ) 2>&1 | dialog --backtitle "$(backtitle)" --title "Scheduled Tasks" \
     --progressbox "Modifying..." 20 100
-  [ "$(cat ${TMP_PATH}/isEnable 2>/dev/null)" = "true" ] && MSG="Disable all scheduled tasks successful." || MSG="Disable all scheduled tasks failed."
-  dialog --backtitle "$(backtitle)" --title Scheduled Tasks \
+  if [ "$(cat ${TMP_PATH}/isEnable 2>/dev/null)" = "true" ]; then
+    MSG="Disable all scheduled tasks successful."
+  else
+    MSG="Disable all scheduled tasks failed."
+  fi
+  dialog --backtitle "$(backtitle)" --title "Scheduled Tasks" \
     --msgbox "${MSG}" 0 0
   return
 }
@@ -2129,7 +2312,7 @@ function rebootMenu() {
     echo -e "recovery \"DSM: Recovery Mode\"" >>"${TMP_PATH}/opts"
     echo -e "junior \"DSM: Reinstall Mode\"" >>"${TMP_PATH}/opts"
   fi
-  echo -e "bios \"System: BIOS/UEFI\"" >>"${TMP_PATH}/opts"
+  echo -e "uefi \"System: UEFI\"" >>"${TMP_PATH}/opts"
   echo -e "poweroff \"System: Shutdown\"" >>"${TMP_PATH}/opts"
   echo -e "shell \"System: Shell Cmdline\"" >>"${TMP_PATH}/opts"
   dialog --backtitle "$(backtitle)" --title "Power Menu" \
@@ -2238,8 +2421,8 @@ function governorSelection () {
   touch "${TMP_PATH}/opts"
   # Selectable CPU governors
   [ "${PLATFORM}" = "epyc7002" ] && echo -e "schedutil \"use schedutil to scale frequency *\"" >>"${TMP_PATH}/opts"
-  [ "${PLATFORM}" != "epyc7002" ] && echo -e "ondemand \"use ondemand to scale frequency\"" >>"${TMP_PATH}/opts"
   [ "${PLATFORM}" != "epyc7002" ] && echo -e "conservative \"use conservative to scale frequency *\"" >>"${TMP_PATH}/opts"
+  [ "${PLATFORM}" != "epyc7002" ] && echo -e "ondemand \"use ondemand to scale frequency\"" >>"${TMP_PATH}/opts"
   echo -e "performance \"always run at max frequency\"" >>"${TMP_PATH}/opts"
   echo -e "powersave \"always run at lowest frequency\"" >>"${TMP_PATH}/opts"
   dialog --backtitle "$(backtitle)" --title "CPU Frequency Scaling" \
@@ -2363,7 +2546,7 @@ function getpatfiles() {
   VALID="false"
   if [ ! -f "${DSM_FILE}" ] && [ "${ARCOFFLINE}" = "false" ]; then
     rm -f ${USER_UP_PATH}/*.tar
-    dialog --backtitle "$(backtitlep)" --colors --title "DSM Boot Files" \
+    dialog --backtitle "$(backtitle)" --colors --title "DSM Boot Files" \
       --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"
@@ -2372,7 +2555,7 @@ function getpatfiles() {
     fi
   elif [ ! -f "${DSM_FILE}" ] && [ "${ARCOFFLINE}" = "true" ]; then
     rm -f ${USER_UP_PATH}/*.tar
-    dialog --backtitle "$(backtitlep)" --colors --title "DSM Boot Files" \
+    dialog --backtitle "$(backtitle)" --colors --title "DSM Boot Files" \
       --msgbox "Please upload the DSM Boot File to ${USER_UP_PATH}.\nUse ${IPCON}:7304 to upload and press OK after it's finished.\nLink: https://github.com/AuxXxilium/arc-dsm/blob/main/files/${MODEL}/${PRODUCTVER}/${PAT_HASH}.tar" 8 120
     [ $? -ne 0 ] && VALID="false"
     if [ -f "${DSM_FILE}" ]; then
@@ -2383,7 +2566,7 @@ function getpatfiles() {
   fi
   mkdir -p "${UNTAR_PAT_PATH}"
   if [ "${VALID}" = "true" ]; then
-    dialog --backtitle "$(backtitlep)" --title "DSM Boot Files" --aspect 18 \
+    dialog --backtitle "$(backtitle)" --title "DSM Boot Files" --aspect 18 \
       --infobox "Copying DSM Boot Files..." 3 40
     tar -xf "${DSM_FILE}" -C "${UNTAR_PAT_PATH}" 2>/dev/null
     copyDSMFiles "${UNTAR_PAT_PATH}" 2>/dev/null
@@ -2409,7 +2592,7 @@ function genHardwareID() {
       writeConfigKey "arc.userid" "${USERID}" "${USER_CONFIG_FILE}"
       writeConfigKey "bootscreen.hwidinfo" "true" "${USER_CONFIG_FILE}"
       dialog --backtitle "$(backtitle)" --title "HardwareID" \
-        --msgbox "HardwareID: ${HWID}\nYour HardwareID is registered to UserID: ${USERID}!" 6 70
+        --msgbox "HardwareID: ${HWID}\nYour HardwareID is registered to UserID: ${USERID}!\nMake sure you select Arc Patch while configure." 7 70
       break
     else
       USERID=""

files/initrd/opt/arc/boot.sh

@@ -9,7 +9,6 @@ set -e
 rm -rf "${PART1_PATH}/logs" >/dev/null 2>&1 || true
 
 BUILDDONE="$(readConfigKey "arc.builddone" "${USER_CONFIG_FILE}")"
-[ "${BUILDDONE}" = "false" ] && die "Loader build not completed!"
 ARC_BRANCH="$(readConfigKey "arc.branch" "${USER_CONFIG_FILE}")"
 
 # Get Loader Disk Bus
@@ -59,6 +58,27 @@ DSMINFO="$(readConfigKey "bootscreen.dsminfo" "${USER_CONFIG_FILE}")"
 SYSTEMINFO="$(readConfigKey "bootscreen.systeminfo" "${USER_CONFIG_FILE}")"
 DISKINFO="$(readConfigKey "bootscreen.diskinfo" "${USER_CONFIG_FILE}")"
 HWIDINFO="$(readConfigKey "bootscreen.hwidinfo" "${USER_CONFIG_FILE}")"
+GOVERNOR="$(readConfigKey "governor" "${USER_CONFIG_FILE}")"
+USBMOUNT="$(readConfigKey "usbmount" "${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
+# HardwareID Check
+if [ "${ARCPATCH}" = "true" ]; then
+  HARDWAREID="$(readConfigKey "arc.hardwareid" "${USER_CONFIG_FILE}")"
+  HWID="$(genHWID)"
+  if [ "${HARDWAREID}" != "${HWID}" ]; then
+    echo "\033[1;31m*** HardwareID does not match! - Loader can't boot to DSM! You need to reconfigure your Loader - Rebooting to Config Mode! ***\033[0m"
+    writeConfigKey "arc.patch" "false" "${USER_CONFIG_FILE}"
+    writeConfigKey "arc.hardwareid" "" "${USER_CONFIG_FILE}"
+    writeConfigKey "arc.userid" "" "${USER_CONFIG_FILE}"
+    sleep 5
+    rebootTo "config"
+  fi
+fi
 
 if [ "${DSMINFO}" = "true" ]; then
   echo -e "\033[1;37mDSM:\033[0m"
@@ -73,6 +93,8 @@ if [ "${SYSTEMINFO}" = "true" ]; then
   echo -e "Vendor: \033[1;37m${VENDOR}\033[0m"
   echo -e "CPU: \033[1;37m${CPU}\033[0m"
   echo -e "Memory: \033[1;37m${RAMTOTAL}GB\033[0m"
+  echo -e "Governor: \033[1;37m${GOVERNOR}\033[0m"
+  [ "${USBMOUNT}" = "true" ] && echo -e "USB Mount: \033[1;37m${USBMOUNT}\033[0m"
   echo
 fi
 if [ "${DISKINFO}" = "true" ]; then
@@ -109,34 +131,33 @@ 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}")"
-GOVERNOR="$(readConfigKey "governor" "${USER_CONFIG_FILE}")"
-USBMOUNT="$(readConfigKey "usbmount" "${USER_CONFIG_FILE}")"
 EMMCBOOT="$(readConfigKey "emmcboot" "${USER_CONFIG_FILE}")"
 MODBLACKLIST="$(readConfigKey "modblacklist" "${USER_CONFIG_FILE}")"
 ARCPATCH="$(readConfigKey "arc.patch" "${USER_CONFIG_FILE}")"
 
-# HardwareID Check
-if [ "${ARCPATCH}" = "true" ]; then
-  HARDWAREID="$(readConfigKey "arc.hardwareid" "${USER_CONFIG_FILE}")"
-  HWID="$(genHWID)"
-  if [ "${HARDWAREID}" != "${HWID}" ]; then
-    echo "\033[1;31m*** HardwareID does not match! - Loader can't boot to DSM! You need to reconfigure your Loader - Rebooting to Config Mode! ***\033[0m"
-    writeConfigKey "arc.patch" "false" "${USER_CONFIG_FILE}"
-    writeConfigKey "arc.hardwareid" "" "${USER_CONFIG_FILE}"
-    writeConfigKey "arc.userid" "" "${USER_CONFIG_FILE}"
-    sleep 5
-    rebootTo "config"
-  fi
-fi
-
 declare -A CMDLINE
 
 # Automated Cmdline
-CMDLINE["syno_hw_version"]="${MODELID:-${MODEL}}"
+CMDLINE["syno_hw_version"]="${MODELID}"
 CMDLINE["vid"]="${VID:-"0x46f4"}" # Sanity check
 CMDLINE["pid"]="${PID:-"0x0001"}" # Sanity check
 CMDLINE["sn"]="${SN}"
 
+# NIC Cmdline
+ETHX=$(ls /sys/class/net/ 2>/dev/null | grep eth)
+ETHM=$(readConfigKey "${MODEL}.ports" "${S_FILE}" 2>/dev/null)
+ETHN=$(echo "${ETHX}" | wc -w)
+ETHM=${ETHM:-${ETHN}}
+NIC=0
+for N in ${ETHX}; do
+  MAC=$(readConfigKey "${N}" "${USER_CONFIG_FILE}")
+  MAC=${MAC:-$(cat /sys/class/net/${N}/address 2>/dev/null | tr '[:upper:]' '[:lower:]')}
+  NIC=$((NIC + 1))
+  CMDLINE["mac${NIC}"]="${MAC}"
+  [ ${NIC} -ge ${ETHM} ] && break
+done
+CMDLINE["netif_num"]="${NIC}"
+
 # Boot Cmdline
 if grep -q "force_junior" /proc/cmdline; then
   CMDLINE["force_junior"]=""
@@ -159,13 +180,14 @@ if [ $(echo "${KVER:-4}" | cut -d'.' -f1) -lt 5 ]; then
     SIZE=$((${SZ:-0} * ${SS:-0} / 1024 / 1024 + 10))
     # Read SATADoM type
     SATADOM="$(readConfigKey "satadom" "${USER_CONFIG_FILE}")"
-    CMDLINE["synoboot_satadom"]="${SATADOM:-2}"
-    CMDLINE["dom_szmax"]="${SIZE}"
+    CMDLINE['synoboot_satadom']="${SATADOM:-2}"
+    CMDLINE['dom_szmax']="${SIZE}"
   fi
-  CMDLINE['elevator']="elevator"
+  CMDLINE["elevator"]="elevator"
 else
   CMDLINE["split_lock_detect"]="off"
 fi
+
 if [ "${DT}" = "true" ]; then
   CMDLINE["syno_ttyS0"]="serial,0x3f8"
   CMDLINE["syno_ttyS1"]="serial,0x2f8"
@@ -177,35 +199,33 @@ fi
 
 CMDLINE["HddHotplug"]="1"
 CMDLINE["vender_format_version"]="2"
-CMDLINE["skip_vender_mac_interfaces"]="0,1,2,3,4,5,6,7"
-CMDLINE["earlyprintk"]=""
-CMDLINE["earlycon"]="uart8250,io,0x3f8,115200n8"
-CMDLINE["console"]="ttyS0,115200n8"
-CMDLINE["consoleblank"]="600"
+CMDLINE['skip_vender_mac_interfaces']="0,1,2,3,4,5,6,7"
+CMDLINE['earlyprintk']=""
+CMDLINE['earlycon']="uart8250,io,0x3f8,115200n8"
+CMDLINE['console']="ttyS0,115200n8"
+CMDLINE['consoleblank']="600"
 # CMDLINE['no_console_suspend']="1"
-CMDLINE["root"]="/dev/md0"
-CMDLINE["loglevel"]="15"
-CMDLINE["log_buf_len"]="32M"
-CMDLINE["rootwait"]=""
+CMDLINE['root']="/dev/md0"
+CMDLINE['loglevel']="15"
+CMDLINE['log_buf_len']="32M"
+CMDLINE['rootwait']=""
 CMDLINE['panic']="${KERNELPANIC:-0}"
-# CMDLINE['intremap']="off" # no need
-# CMDLINE['amd_iommu_intr']="legacy" # no need
-# CMDLINE['split_lock_detect']="off" # check KVER
+# CMDLINE['intremap']="off" # workaround for mlx5_core througput issues from linux mailing list (need more testing)
+# CMDLINE['amd_iommu_intr']="legacy" # workaround for mlx5_core througput issues from linux mailing list (need more testing)
 CMDLINE['pcie_aspm']="off"
 # CMDLINE['intel_pstate']="disable"
 # CMDLINE['amd_pstate']="disable"
-# CMDLINE['nox2apic']=""  # check platform
 # CMDLINE['nomodeset']=""
-CMDLINE["modprobe.blacklist"]="${MODBLACKLIST}"
+CMDLINE['modprobe.blacklist']="${MODBLACKLIST}"
+
 if [ "${USBMOUNT}" = "true" ]; then
   CMDLINE['usbinternal']=""
 fi
-if [ "${GOVERNOR}" = "ondemand" ] || [ "${GOVERNOR}" = "conservative" ] || [ "${GOVERNOR}" = "schedutil" ]; then
-  CMDLINE["governor"]="${GOVERNOR}"
-fi
-if [ $(cat /proc/cpuinfo | grep Intel | wc -l) -gt 0 ]; then
-  CMDLINE["intel_pstate"]="disable"
+
+if [ -n "${GOVERNOR}" ]; then
+  CMDLINE['governor']="${GOVERNOR}"
 fi
+
 if echo "apollolake geminilake purley" | grep -wq "${PLATFORM}"; then
   CMDLINE["nox2apic"]=""
 fi
@@ -219,11 +239,11 @@ fi
 # fi
 if [ "${DT}" = "true" ] && ! echo "epyc7002 purley broadwellnkv2" | grep -wq "${PLATFORM}"; then
   if ! echo "${CMDLINE['modprobe.blacklist']}" | grep -q "mpt3sas"; then
-    [ ! "${CMDLINE['modprobe.blacklist']}" = "" ] && CMDLINE["modprobe.blacklist"]+=","
-    CMDLINE["modprobe.blacklist"]+="mpt3sas"
+    [ ! "${CMDLINE['modprobe.blacklist']}" = "" ] && CMDLINE['modprobe.blacklist']+=","
+    CMDLINE['modprobe.blacklist']+="mpt3sas"
   fi
 #else
-#  CMDLINE['scsi_mod.scan']="sync"  # TODO: kernel panic caused by vmware scsi? (add to cmdline)
+#  CMDLINE['scsi_mod.scan']="sync"  # TODO: redpill panic of vmware scsi? (add to cmdline)
 fi
 
 # CMDLINE['kvm.ignore_msrs']="1"
@@ -237,20 +257,6 @@ if echo "purley broadwellnkv2" | grep -wq "${PLATFORM}"; then
   CMDLINE["SASmodel"]="1"
 fi
 
-# NIC Cmdline
-ETHX=$(ls /sys/class/net/ 2>/dev/null | grep eth) || true
-ETHM=$(readConfigKey "${MODEL}.ports" "${S_FILE}" 2>/dev/null)
-ETHN=$(echo ${ETHX} | wc -w)
-[ -z "${ETHM}" ] && ETHM="${ETHN}"
-NIC=0
-for N in ${ETHX}; do
-  MAC="$(readConfigKey "${N}" "${USER_CONFIG_FILE}")"
-  [ -z "${MAC}" ] && MAC="$(cat /sys/class/net/${N}/address 2>/dev/null | tr '[:upper:]' '[:lower:]')" || NIC=$((NIC + 1))
-  [ ${NIC} -le ${ETHM} ] && CMDLINE["mac${NIC}"]="${MAC}"
-  [ ${NIC} -ge ${ETHM} ] && break
-done
-CMDLINE["netif_num"]="${NIC}"
-
 # Read user network settings
 while IFS=': ' read -r KEY VALUE; do
   [ -n "${KEY}" ] && CMDLINE["network.${KEY}"]="${VALUE}"
@@ -293,8 +299,10 @@ elif [ "${DIRECTBOOT}" = "false" ]; then
     echo -e "\033[1;37mDetected ${ETHN} NIC:\033[0m"
   fi
   echo
+
   [ ! -f /var/run/dhcpcd/pid ] && /etc/init.d/S41dhcpcd restart >/dev/null 2>&1 || true
-  sleep 3
+  sleep 2
+
   for N in ${ETHX}; do
     COUNT=0
     DRIVER=$(ls -ld /sys/class/net/${N}/device/driver 2>/dev/null | awk -F '/' '{print $NF}')
@@ -337,6 +345,9 @@ elif [ "${DIRECTBOOT}" = "false" ]; then
     [ -f "${TMP_PATH}/qrcode_boot.png" ] && echo | fbv -acufi "${TMP_PATH}/qrcode_boot.png" >/dev/null 2>/dev/null || true
   fi
 
+  # Wait for boot interrupt
+  _bootwait
+
   for T in $(busybox w 2>/dev/null | grep -v 'TTY' | awk '{print $2}'); do
     if [ -w "/dev/${T}" ]; then
       [ -n "${IPCON}" ] && echo -e "Use \033[1;34mhttp://${IPCON}:5000\033[0m or try \033[1;34mhttp://find.synology.com/ \033[0mto find DSM and proceed.\n\n\033[1;37mThis interface will not be operational. Wait a few minutes - Network will be unreachable until DSM boot.\033[0m\n" >"/dev/${T}" 2>/dev/null \
@@ -359,7 +370,7 @@ elif [ "${DIRECTBOOT}" = "false" ]; then
     echo -e "\033[1;33mWarning, running kexec with --noefi param, strange things will happen!!\033[0m"
     KEXECARGS+=" --noefi"
   fi
-  kexec ${KEXECARGS} -l "${MOD_ZIMAGE_FILE}" --initrd "${MOD_RDGZ_FILE}" --command-line="${CMDLINE_LINE}" >"${LOG_FILE}" 2>&1 || dieLog
+  kexec ${KEXECARGS} -l "${MOD_ZIMAGE_FILE}" --initrd "${MOD_RDGZ_FILE}" --command-line="${CMDLINE_LINE} kexecboot" >"${LOG_FILE}" 2>&1 || dieLog
 
   echo -e "\033[1;37mBooting DSM...\033[0m"
   [ "${KERNELLOAD}" = "kexec" ] && kexec -e || poweroff

files/initrd/opt/arc/evo.sh

@@ -0,0 +1,940 @@
+#!/usr/bin/env bash
+
+###############################################################################
+# Overlay Init Section
+[[ -z "${ARC_PATH}" || ! -d "${ARC_PATH}/include" ]] && ARC_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" 2>/dev/null && pwd)"
+
+. "${ARC_PATH}/include/functions.sh"
+. "${ARC_PATH}/arc-functions.sh"
+. "${ARC_PATH}/include/addons.sh"
+. "${ARC_PATH}/include/modules.sh"
+. "${ARC_PATH}/include/update.sh"
+. "${ARC_PATH}/include/storage.sh"
+. "${ARC_PATH}/include/network.sh"
+
+# Get Keymap and Timezone and check System
+onlineCheck
+KEYMAP="$(readConfigKey "keymap" "${USER_CONFIG_FILE}")"
+ARCOFFLINE="$(readConfigKey "arc.offline" "${USER_CONFIG_FILE}")"
+systemCheck
+ARCMODE="$(readConfigKey "arc.mode" "${USER_CONFIG_FILE}")"
+readData
+
+###############################################################################
+# Mounts backtitle dynamically
+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+="Patch: ${ARCPATCH} | "
+  BACKTITLE+="Config: ${CONFDONE} | "
+  BACKTITLE+="Build: ${BUILDDONE} | "
+  BACKTITLE+="${MACHINE}(${BUS}) | "
+  [ -n "${KEYMAP}" ] && BACKTITLE+="KB: ${KEYMAP}"
+  [ "${ARCOFFLINE}" = "true" ] && BACKTITLE+=" | Offline"
+  echo "${BACKTITLE}"
+}
+
+###############################################################################
+# Model Selection
+function arcModel() {
+  [ "${ARCOFFLINE}" != "true" ] && checkHardwareID || true
+  dialog --backtitle "$(backtitle)" --title "Model" \
+    --infobox "Reading Models..." 3 25
+  ARCCONF="$(readConfigKey "${MODEL:-SA6400}.serial" "${S_FILE}")"
+  ARCMODE="$(readConfigKey "arc.mode" "${USER_CONFIG_FILE}")"
+  # Loop menu
+  RESTRICT=1
+  PS="$(readConfigEntriesArray "platforms" "${P_FILE}" | sort)"
+  echo -n "" >"${TMP_PATH}/modellist"
+  while read -r P; do
+    PM="$(readConfigEntriesArray "${P}" "${D_FILE}" | sort)"
+    while read -r M; do
+      echo "${M} ${P}" >>"${TMP_PATH}/modellist"
+    done < <(echo "${PM}")
+  done < <(echo "${PS}")
+  if [ "${ARCMODE}" = "config" ]; then
+    while true; do
+      echo -n "" >"${TMP_PATH}/menu"
+      while read -r M A; do
+        COMPATIBLE=1
+        DT="$(readConfigKey "platforms.${A}.dt" "${P_FILE}")"
+        FLAGS="$(readConfigArray "platforms.${A}.flags" "${P_FILE}")"
+        ARCCONFM="$(readConfigKey "${M}.serial" "${S_FILE}")"
+        ARC=""
+        BETA=""
+        [ -n "${ARCCONFM}" ] && ARC="x" || ARC=""
+        [ "${DT}" = "true" ] && DTS="x" || DTS=""
+        IGPU=""
+        IGPUS=""
+        IGPUID="$(lspci -nd ::300 2>/dev/null | grep "8086" | cut -d' ' -f3 | sed 's/://g')"
+        if [ -n "${IGPUID}" ]; then grep -iq "${IGPUID}" ${ARC_PATH}/include/i915ids && IGPU="all" || IGPU="epyc7002"; else IGPU=""; fi
+        if [[ "${A}" = "apollolake" || "${A}" = "geminilake" ]] && [ "${IGPU}" = "all" ]; then
+          IGPUS="+"
+        elif [ "${A}" = "epyc7002" ] && [[ "${IGPU}" = "epyc7002" || "${IGPU}" = "all" ]]; then
+          IGPUS="x"
+        else
+          IGPUS=""
+        fi
+        [ "${DT}" = "true" ] && HBAS="" || HBAS="x"
+        [ "${M}" = "SA6400" ] && HBAS="x"
+        [ "${DT}" = "false" ] && USBS="int/ext" || USBS="ext"
+        M_2_CACHE="x"
+        [[ "${M}" = "DS220+" ||  "${M}" = "DS224+" ]] && M_2_CACHE=""
+        [[ "${M}" = "DS220+" || "${M}" = "DS224+" || "${DT}" = "false" ]] && M_2_STORAGE="" || M_2_STORAGE="+"
+        # Check id model is compatible with CPU
+        if [ ${RESTRICT} -eq 1 ]; then
+          for F in ${FLAGS}; do
+            if ! grep -q "^flags.*${F}.*" /proc/cpuinfo; then
+              COMPATIBLE=0
+            fi
+          done
+          if [ "${A}" != "epyc7002" ] && [ "${DT}" = "true" ] && [ "${EXTERNALCONTROLLER}" = "true" ]; then
+            COMPATIBLE=0
+          fi
+          if [ "${A}" != "epyc7002" ] && [ ${SATACONTROLLER} -eq 0 ] && [ "${EXTERNALCONTROLLER}" = "false" ]; then
+            COMPATIBLE=0
+          fi
+          if [ "${A}" = "epyc7002" ] && [[ ${SCSICONTROLLER} -ne 0 || ${RAIDCONTROLLER} -ne 0 ]]; then
+            COMPATIBLE=0
+          fi
+          if [ "${A}" != "epyc7002" ] && [ ${NVMEDRIVES} -gt 0 ] && [ "${BUS}" = "usb" ] && [ ${SATADRIVES} -eq 0 ] && [ "${EXTERNALCONTROLLER}" = "false" ]; then
+            COMPATIBLE=0
+          elif [ "${A}" != "epyc7002" ] && [ ${NVMEDRIVES} -gt 0 ] && [ "${BUS}" = "sata" ] && [ ${SATADRIVES} -eq 1 ] && [ "${EXTERNALCONTROLLER}" = "false" ]; then
+            COMPATIBLE=0
+          fi
+          [ -z "$(grep -w "${M}" "${S_FILE}")" ] && COMPATIBLE=0
+        fi
+        [ -n "$(grep -w "${M}" "${S_FILE}")" ] && BETA="Arc" || BETA="Syno"
+        [ -z "$(grep -w "${A}" "${P_FILE}")" ] && COMPATIBLE=0
+        if [ -n "${ARCCONF}" ]; then
+          [ ${COMPATIBLE} -eq 1 ] && echo -e "${M} \"\t$(printf "\Zb%-15s\Zn \Zb%-5s\Zn \Zb%-5s\Zn \Zb%-5s\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%-5s\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")
+      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%-5s\Zn \Zb%-5s\Zn \Zb%-10s\Zn \Zb%-12s\Zn \Zb%-10s\Zn \Zb%-10s\Zn" "Model" "Platform" "DT" "Arc" "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%-5s\Zn \Zb%-5s\Zn \Zb%-10s\Zn \Zb%-12s\Zn \Zb%-10s\Zn \Zb%-10s\Zn" "Model" "Platform" "DT" "iGPU" "HBA" "M.2 Cache" "M.2 Volume" "USB Mount" "Source")"
+      [ -n "${ARCCONF}" ] && TITLEMSG="Arc Model" || TITLEMSG="Model"
+      dialog --backtitle "$(backtitle)" --title "${TITLEMSG}" --colors \
+        --cancel-label "Show all" --help-button --help-label "Exit" \
+        --extra-button --extra-label "Info" \
+        --menu "${MSG}" 0 115 0 \
+        --file "${TMP_PATH}/menu" 2>"${TMP_PATH}/resp"
+      RET=$?
+      case ${RET} in
+        0)
+          resp=$(cat ${TMP_PATH}/resp)
+          [ -z "${resp}" ] && return
+          break
+          ;;
+        1)
+          [ ${RESTRICT} -eq 1 ] && RESTRICT=0 || RESTRICT=1
+          ;;
+        3)
+          resp=$(cat ${TMP_PATH}/resp)
+          PLATFORM="$(grep -w "${resp}" "${TMP_PATH}/modellist" | awk '{print $2}' | head -n 1)"
+          dialog --backtitle "$(backtitle)" --colors \
+            --title "Platform Info" --textbox "./informations/${PLATFORM}.yml" 70 80
+          ;;
+        *)
+          return 
+          break
+          ;;
+      esac
+    done
+  fi
+  # Reset Model Config if changed
+  if [ "${ARCMODE}" = "config" ] && [ "${MODEL}" != "${resp}" ]; then
+    MODEL="${resp}"
+    writeConfigKey "addons" "{}" "${USER_CONFIG_FILE}"
+    writeConfigKey "arc.remap" "" "${USER_CONFIG_FILE}"
+    writeConfigKey "buildnum" "" "${USER_CONFIG_FILE}"
+    writeConfigKey "cmdline" "{}" "${USER_CONFIG_FILE}"
+    writeConfigKey "emmcboot" "false" "${USER_CONFIG_FILE}"
+    writeConfigKey "hddsort" "false" "${USER_CONFIG_FILE}"
+    writeConfigKey "kernel" "official" "${USER_CONFIG_FILE}"
+    writeConfigKey "odp" "false" "${USER_CONFIG_FILE}"
+    writeConfigKey "model" "${MODEL}" "${USER_CONFIG_FILE}"
+    writeConfigKey "paturl" "" "${USER_CONFIG_FILE}"
+    writeConfigKey "pathash" "" "${USER_CONFIG_FILE}"
+    writeConfigKey "platform" "${PLATFORM}" "${USER_CONFIG_FILE}"
+    writeConfigKey "productver" "" "${USER_CONFIG_FILE}"
+    writeConfigKey "ramdisk-hash" "" "${USER_CONFIG_FILE}"
+    writeConfigKey "smallnum" "" "${USER_CONFIG_FILE}"
+    writeConfigKey "sn" "" "${USER_CONFIG_FILE}"
+    writeConfigKey "zimage-hash" "" "${USER_CONFIG_FILE}"
+  fi
+  PLATFORM="$(grep -w "${MODEL}" "${TMP_PATH}/modellist" | awk '{print $2}' | head -1)"
+  writeConfigKey "platform" "${PLATFORM}" "${USER_CONFIG_FILE}"
+  writeConfigKey "arc.builddone" "false" "${USER_CONFIG_FILE}"
+  writeConfigKey "arc.confdone" "false" "${USER_CONFIG_FILE}"
+  writeConfigKey "arc.patch" "false" "${USER_CONFIG_FILE}"
+  # Read Platform Data
+  ARCPATCH="$(readConfigKey "arc.patch" "${USER_CONFIG_FILE}")"
+  BUILDDONE="$(readConfigKey "arc.builddone" "${USER_CONFIG_FILE}")"
+  CONFDONE="$(readConfigKey "arc.confdone" "${USER_CONFIG_FILE}")"
+  EMMCBOOT="$(readConfigKey "emmcboot" "${USER_CONFIG_FILE}")"
+  HDDSORT="$(readConfigKey "hddsort" "${USER_CONFIG_FILE}")"
+  KERNEL="$(readConfigKey "kernel" "${USER_CONFIG_FILE}")"
+  ODP="$(readConfigKey "odp" "${USER_CONFIG_FILE}")"
+  arcVersion
+}
+
+###############################################################################
+# Arc Version Section
+function arcVersion() {
+  # Read Model Config
+  MODEL="$(readConfigKey "model" "${USER_CONFIG_FILE}")"
+  PLATFORM="$(readConfigKey "platform" "${USER_CONFIG_FILE}")"
+  DT="$(readConfigKey "platforms.${PLATFORM}.dt" "${P_FILE}")"
+  PRODUCTVER="$(readConfigKey "productver" "${USER_CONFIG_FILE}")"
+  ARCMODE="$(readConfigKey "arc.mode" "${USER_CONFIG_FILE}")"
+  # Get PAT Data from Config
+  PAT_URL_CONF="$(readConfigKey "paturl" "${USER_CONFIG_FILE}")"
+  PAT_HASH_CONF="$(readConfigKey "pathash" "${USER_CONFIG_FILE}")"
+  # Check for Custom Build
+  if [ "${ARCMODE}" = "config" ] && [ "${ARCRESTORE}" != "true" ]; then
+    # Select Build for DSM
+    ITEMS="$(readConfigEntriesArray "platforms.${PLATFORM}.productvers" "${P_FILE}" | sort -r)"
+    dialog --clear --no-items --nocancel --title "DSM Version" --backtitle "$(backtitle)" \
+      --no-items --menu "Select DSM Version" 7 30 0 ${ITEMS} \
+    2>"${TMP_PATH}/resp"
+    [ $? -ne 0 ] && return
+    resp=$(cat ${TMP_PATH}/resp)
+    [ -z "${resp}" ] && return
+    if [ "${PRODUCTVER}" != "${resp}" ]; then
+      PRODUCTVER="${resp}"
+      writeConfigKey "productver" "${PRODUCTVER}" "${USER_CONFIG_FILE}"
+      # Reset Config if changed
+      writeConfigKey "buildnum" "" "${USER_CONFIG_FILE}"
+      writeConfigKey "paturl" "" "${USER_CONFIG_FILE}"
+      writeConfigKey "pathash" "" "${USER_CONFIG_FILE}"
+      writeConfigKey "ramdisk-hash" "" "${USER_CONFIG_FILE}"
+      writeConfigKey "smallnum" "" "${USER_CONFIG_FILE}"
+      writeConfigKey "zimage-hash" "" "${USER_CONFIG_FILE}"
+    fi
+    dialog --backtitle "$(backtitle)" --title "Version" \
+    --infobox "Reading DSM Build..." 3 25
+    PAT_URL=""
+    PAT_HASH=""
+    URLVER=""
+    while true; do
+      PVS="$(readConfigEntriesArray "${PLATFORM}.\"${MODEL}\"" "${D_FILE}" | sort -r)"
+      echo -n "" >"${TMP_PATH}/versions"
+      while read -r V; do
+        if [ "${V:0:3}" != "${PRODUCTVER}" ] || [ "${V}" = "${PREV}" ]; then
+          continue
+        else
+          echo "${V}" >>"${TMP_PATH}/versions"
+        fi
+        PREV="${V}"
+      done < <(echo "${PVS}")
+      DSMPVS="$(cat ${TMP_PATH}/versions)"
+      dialog --backtitle "$(backtitle)" --colors --title "DSM Build" \
+      --no-items --menu "Select DSM Build" 0 0 0 ${DSMPVS} \
+      2>${TMP_PATH}/resp
+      RET=$?
+      [ ${RET} -ne 0 ] && return
+      PV=$(cat ${TMP_PATH}/resp)
+      PAT_URL="$(readConfigKey "${PLATFORM}.\"${MODEL}\".\"${PV}\".url" "${D_FILE}")"
+      PAT_HASH="$(readConfigKey "${PLATFORM}.\"${MODEL}\".\"${PV}\".hash" "${D_FILE}")"
+      writeConfigKey "productver" "${PV:0:3}" "${USER_CONFIG_FILE}"
+      if [ -n "${PAT_URL}" ] && [ -n "${PAT_HASH}" ]; then
+        VALID="true"
+        break
+      fi
+    done
+    if [ -z "${PAT_URL}" ] || [ -z "${PAT_HASH}" ]; then
+      while true; do
+        MSG="Failed to get PAT Data.\n"
+        MSG+="Please manually fill in the URL and Hash of PAT.\n"
+        MSG+="You will find these Data at: https://github.com/AuxXxilium/arc-dsm/blob/main/webdata.txt"
+        dialog --backtitle "$(backtitle)" --colors --title "Arc Build" --default-button "OK" \
+          --form "${MSG}" 11 120 2 "Url" 1 1 "${PAT_URL}" 1 8 110 0 "Hash" 2 1 "${PAT_HASH}" 2 8 110 0 \
+          2>"${TMP_PATH}/resp"
+        RET=$?
+        [ ${RET} -ne 0 ] && return
+        PAT_URL="$(cat "${TMP_PATH}/resp" | sed -n '1p')"
+        PAT_HASH="$(cat "${TMP_PATH}/resp" | sed -n '2p')"
+        [ -n "${PAT_URL}" ] && [ -n "${PAT_HASH}" ] && VALID="true" && break
+      done
+    fi
+    if [ "${PAT_URL}" != "${PAT_URL_CONF}" ] || [ "${PAT_HASH}" != "${PAT_HASH_CONF}" ]; then
+      writeConfigKey "paturl" "${PAT_URL}" "${USER_CONFIG_FILE}"
+      writeConfigKey "pathash" "${PAT_HASH}" "${USER_CONFIG_FILE}"
+      rm -f "${ORI_ZIMAGE_FILE}" "${ORI_RDGZ_FILE}" "${MOD_ZIMAGE_FILE}" "${MOD_RDGZ_FILE}" >/dev/null 2>&1 || true
+      rm -f "${PART1_PATH}/grub_cksum.syno" "${PART1_PATH}/GRUB_VER" >/dev/null 2>&1 || true
+      rm -f "${USER_UP_PATH}/"*.tar >/dev/null 2>&1 || true
+    fi
+    if [ "${ONLYVERSION}" != "true" ]; then
+      MSG="Do you want to try Automated Mode?\nIf yes, Loader will configure, build and boot DSM."
+      dialog --backtitle "$(backtitle)" --colors --title "Automated Mode" \
+        --yesno "${MSG}" 6 55
+      if [ $? -eq 0 ]; then
+        writeConfigKey "arc.mode" "automated" "${USER_CONFIG_FILE}"
+      else
+        writeConfigKey "arc.mode" "config" "${USER_CONFIG_FILE}"
+      fi
+      ARCMODE="$(readConfigKey "arc.mode" "${USER_CONFIG_FILE}")"
+    fi
+  elif [ "${ARCMODE}" = "automated" ] || [ "${ARCRESTORE}" = "true" ]; then
+    VALID="true"
+  fi
+  # Change Config if Files are valid
+  if [ "${VALID}" = "true" ]; then
+    dialog --backtitle "$(backtitle)" --title "Arc Config" \
+      --infobox "Reconfiguring Cmdline, Modules and Synoinfo" 3 60
+    # Reset Synoinfo
+    writeConfigKey "synoinfo" "{}" "${USER_CONFIG_FILE}"
+    while IFS=': ' read -r KEY VALUE; do
+      writeConfigKey "synoinfo.\"${KEY}\"" "${VALUE}" "${USER_CONFIG_FILE}"
+    done < <(readConfigMap "platforms.${PLATFORM}.synoinfo" "${P_FILE}")
+    # Reset Modules
+    KVER="$(readConfigKey "platforms.${PLATFORM}.productvers.\"${PRODUCTVER}\".kver" "${P_FILE}")"
+    [ "${PLATFORM}" = "epyc7002" ] && KVERP="${PRODUCTVER}-${KVER}" || KVERP="${KVER}"
+    if [ -n "${PLATFORM}" ] && [ -n "${KVERP}" ]; then
+      writeConfigKey "modules" "{}" "${USER_CONFIG_FILE}"
+      mergeConfigModules "$(getAllModules "${PLATFORM}" "${KVERP}" | awk '{print $1}')" "${USER_CONFIG_FILE}"
+    fi
+    # Check Addons for Platform
+    ADDONS="$(readConfigKey "addons" "${USER_CONFIG_FILE}")"
+    DEVICENIC="$(readConfigKey "device.nic" "${USER_CONFIG_FILE}")"
+    ARCCONF="$(readConfigKey "${MODEL}.serial" "${S_FILE}")"
+    if [ "${ADDONS}" = "{}" ]; then
+      initConfigKey "addons.acpid" "" "${USER_CONFIG_FILE}"
+      initConfigKey "addons.cpuinfo" "" "${USER_CONFIG_FILE}"
+      initConfigKey "addons.storagepanel" "" "${USER_CONFIG_FILE}"
+      initConfigKey "addons.updatenotify" "" "${USER_CONFIG_FILE}"
+      if [ ${NVMEDRIVES} -gt 0 ]; then
+        if [ "${PLATFORM}" = "epyc7002" ] && [ ${SATADRIVES} -eq 0 ] && [ ${SASDRIVES} -eq 0 ]; then
+          initConfigKey "addons.nvmesystem" "" "${USER_CONFIG_FILE}"
+        elif [ "${MODEL}" = "DS918+" ] || [ "${MODEL}" = "DS1019+" ] || [ "${MODEL}" = "DS1621xs+" ] || [ "${MODEL}" = "RS1619xs+" ]; then
+          initConfigKey "addons.nvmecache" "" "${USER_CONFIG_FILE}"
+          initConfigKey "addons.nvmevolume" "" "${USER_CONFIG_FILE}"
+        else
+          initConfigKey "addons.nvmevolume" "" "${USER_CONFIG_FILE}"
+        fi
+      fi
+      if [ "${MACHINE}" = "Native" ]; then
+        initConfigKey "addons.cpufreqscaling" "" "${USER_CONFIG_FILE}"
+        initConfigKey "addons.powersched" "" "${USER_CONFIG_FILE}"
+        initConfigKey "addons.sensors" "" "${USER_CONFIG_FILE}"
+      fi
+      if [ "${PLATFORM}" = "apollolake" ] || [ "${PLATFORM}" = "geminilake" ]; then
+        if [ -n "${IGPUID}" ]; then grep -iq "${IGPUID}" ${ARC_PATH}/include/i915ids && IGPU="all" || IGPU="epyc7002"; else IGPU=""; fi
+        [ "${IGPU}"="all" ] && initConfigKey "addons.i915" "" "${USER_CONFIG_FILE}" || true
+      fi
+      if echo "${PAT_URL}" 2>/dev/null | grep -q "7.2.2"; then
+        initConfigKey "addons.allowdowngrade" "" "${USER_CONFIG_FILE}"
+      fi
+      if [ -n "${ARCCONF}" ]; then
+        initConfigKey "addons.arcdns" "" "${USER_CONFIG_FILE}"
+      fi
+      if [ ${SASDRIVES} -gt 0 ] && [ "${DT}" = "false" ]; then
+        initConfigKey "addons.smartctl" "" "${USER_CONFIG_FILE}"
+      fi
+    fi
+    while IFS=': ' read -r ADDON PARAM; do
+      [ -z "${ADDON}" ] && continue
+      if ! checkAddonExist "${ADDON}" "${PLATFORM}"; then
+        deleteConfigKey "addons.\"${ADDON}\"" "${USER_CONFIG_FILE}"
+      fi
+    done < <(readConfigMap "addons" "${USER_CONFIG_FILE}")
+    # Check for Only Version
+    if [ "${ONLYVERSION}" = "true" ]; then
+      writeConfigKey "arc.builddone" "false" "${USER_CONFIG_FILE}"
+      BUILDDONE="$(readConfigKey "arc.builddone" "${USER_CONFIG_FILE}")"
+      ONLYVERSION="false"
+      return
+    else
+      arcPatch
+    fi
+  else
+    dialog --backtitle "$(backtitle)" --title "Arc Config" --aspect 18 \
+      --infobox "Arc Config failed!\nExit." 4 40
+    writeConfigKey "arc.confdone" "false" "${USER_CONFIG_FILE}"
+    CONFDONE="$(readConfigKey "arc.confdone" "${USER_CONFIG_FILE}")"
+    sleep 5
+    return
+  fi
+}
+
+###############################################################################
+# Arc Patch Section
+function arcPatch() {
+  # Read Model Values
+  PLATFORM="$(readConfigKey "platform" "${USER_CONFIG_FILE}")"
+  MODEL="$(readConfigKey "model" "${USER_CONFIG_FILE}")"
+  ARCCONF="$(readConfigKey "${MODEL}.serial" "${S_FILE}")"
+  ARCMODE="$(readConfigKey "arc.mode" "${USER_CONFIG_FILE}")"
+  if [ "${ARCMODE}" = "automated" ] && [ "${ARCPATCH}" != "user" ]; then
+    if [ -n "${ARCCONF}" ]; then
+      generate_and_write_serial "true"
+    else
+      generate_and_write_serial "false"
+    fi
+  elif [ "${ARCMODE}" = "config" ]; then
+   if [ -n "${ARCCONF}" ]; then
+    dialog --clear --backtitle "$(backtitle)" \
+      --nocancel --title "SN/Mac Options" \
+      --menu "Choose an Option" 7 60 0 \
+      1 "Use Arc Patch (AME, QC, Push Notify and more)" \
+      2 "Use random SN/Mac (Reduced DSM Features)" \
+      3 "Use my own SN/Mac (Be sure your Data is valid)" \
+      2>"${TMP_PATH}/resp"
+    else
+      dialog --clear --backtitle "$(backtitle)" \
+        --nocancel --title "SN/Mac Options" \
+        --menu "Choose an Option" 7 60 0 \
+        2 "Use random SN/Mac (Reduced DSM Features)" \
+        3 "Use my own SN/Mac (Be sure your Data is valid)" \
+        2>"${TMP_PATH}/resp"
+    fi
+    
+    resp=$(cat "${TMP_PATH}/resp")
+    [ -z "${resp}" ] && return 1
+    
+    case ${resp} in
+      1)
+        generate_and_write_serial "true"
+        ;;
+      2)
+        generate_and_write_serial "false"
+        ;;
+      3)
+        while true; do
+          dialog --backtitle "$(backtitle)" --colors --title "Serial" \
+            --inputbox "Please enter a valid SN!" 7 50 "" \
+            2>"${TMP_PATH}/resp"
+          [ $? -ne 0 ] && break 2
+          SN="$(cat "${TMP_PATH}/resp" | tr '[:lower:]' '[:upper:]')"
+          [ -z "${SN}" ] && return
+          break
+        done
+        writeConfigKey "arc.patch" "user" "${USER_CONFIG_FILE}"
+        writeConfigKey "sn" "${SN}" "${USER_CONFIG_FILE}"
+        ;;
+    esac
+  fi
+
+  ARCPATCH="$(readConfigKey "arc.patch" "${USER_CONFIG_FILE}")"
+  arcSettings
+}
+
+###############################################################################
+# Arc Settings Section
+function arcSettings() {
+  MODEL="$(readConfigKey "model" "${USER_CONFIG_FILE}")"
+  PRODUCTVER="$(readConfigKey "productver" "${USER_CONFIG_FILE}")"
+  PLATFORM="$(readConfigKey "platform" "${USER_CONFIG_FILE}")"
+  KVER="$(readConfigKey "platforms.${PLATFORM}.productvers.\"${PRODUCTVER}\".kver" "${P_FILE}")"
+  ARCMODE="$(readConfigKey "arc.mode" "${USER_CONFIG_FILE}")"
+  PAT_URL="$(readConfigKey "paturl" "${USER_CONFIG_FILE}")"
+  PAT_HASH="$(readConfigKey "pathash" "${USER_CONFIG_FILE}")"
+  DT="$(readConfigKey "platforms.${PLATFORM}.dt" "${P_FILE}")"
+  
+  # Network Config for Loader
+  dialog --backtitle "$(backtitle)" --colors --title "Network Config" \
+    --infobox "Generating Network Config..." 3 40
+  sleep 2
+  getnet || return
+  
+  if [ "${ONLYPATCH}" = "true" ]; then
+    writeConfigKey "arc.builddone" "false" "${USER_CONFIG_FILE}"
+    ONLYPATCH="false"
+    return 0
+  fi
+  
+  # Select Portmap for Loader
+  if [ "${DT}" = "false" ] && [ ${SATADRIVES} -gt 0 ]; then
+    dialog --backtitle "$(backtitle)" --colors --title "Storage Map" \
+      --infobox "Generating Storage Map..." 3 40
+    sleep 2
+    getmapSelection || return
+  fi
+  
+  # Select Addons
+  if [ "${ARCMODE}" = "config" ]; then
+    dialog --backtitle "$(backtitle)" --colors --title "Addons" \
+      --infobox "Loading Addons Table..." 3 40
+    addonSelection || return
+  fi
+  
+  # CPU Frequency Scaling & Governor
+  if readConfigMap "addons" "${USER_CONFIG_FILE}" | grep -q "cpufreqscaling"; then
+    if [ "${ARCMODE}" = "config" ] && [ "${MACHINE}" = "Native" ]; then
+      dialog --backtitle "$(backtitle)" --colors --title "CPU Frequency Scaling" \
+        --infobox "Generating Governor Table..." 3 40
+      governorSelection || return
+    elif [ "${ARCMODE}" = "automated" ] && [ "${MACHINE}" = "Native" ]; then
+      if [ "${PLATFORM}" = "epyc7002" ]; then
+        writeConfigKey "governor" "schedutil" "${USER_CONFIG_FILE}"
+      else
+        writeConfigKey "governor" "conservative" "${USER_CONFIG_FILE}"
+      fi
+    fi
+  fi
+  
+  # Warnings and Checks
+  if [ "${ARCMODE}" = "config" ]; then
+    [ "${DT}" = "true" ] && [ "${EXTERNALCONTROLLER}" = "true" ] && dialog --backtitle "$(backtitle)" --title "Arc Warning" --msgbox "WARN: You use a HBA/Raid Controller and selected a DT Model.\nThis is still an experimental." 6 70
+    DEVICENIC="$(readConfigKey "device.nic" "${USER_CONFIG_FILE}")"
+    MODELNIC="$(readConfigKey "${MODEL}.ports" "${S_FILE}" 2>/dev/null)"
+    [ ${DEVICENIC} -gt 8 ] && dialog --backtitle "$(backtitle)" --title "Arc Warning" --msgbox "WARN: You have more NIC (${DEVICENIC}) than 8 NIC.\nOnly 8 supported by DSM." 6 60
+    [ ${DEVICENIC} -gt ${MODELNIC} ] && [ "${ARCPATCH}" = "true" ] && dialog --backtitle "$(backtitle)" --title "Arc Warning" --msgbox "WARN: You have more NIC (${DEVICENIC}) than supported by Model (${MODELNIC}).\nOnly the first ${MODELNIC} are used by Arc Patch." 6 80
+    [ "${AESSYS}" = "false" ] && dialog --backtitle "$(backtitle)" --title "Arc Warning" --msgbox "WARN: Your System doesn't support Hardware encryption in DSM. (AES)" 5 70
+    [[ "${CPUFREQ}" = "false" || "${ACPISYS}" = "false" ]] && readConfigMap "addons" "${USER_CONFIG_FILE}" | grep -q "cpufreqscaling" && dialog --backtitle "$(backtitle)" --title "Arc Warning" --msgbox "WARN: It is possible that CPU Frequency Scaling is not working properly with your System." 6 80
+  fi
+  
+  # eMMC Boot Support
+  EMMCBOOT="$(readConfigKey "emmcboot" "${USER_CONFIG_FILE}")"
+  if [ "${EMMCBOOT}" = "true" ]; then
+    writeConfigKey "modules.mmc_block" "" "${USER_CONFIG_FILE}"
+    writeConfigKey "modules.mmc_core" "" "${USER_CONFIG_FILE}"
+  else
+    deleteConfigKey "modules.mmc_block" "${USER_CONFIG_FILE}"
+    deleteConfigKey "modules.mmc_core" "${USER_CONFIG_FILE}"
+  fi
+  
+  # Final Config Check
+  if [ -n "${PLATFORM}" ] && [ -n "${MODEL}" ] && [ -n "${KVER}" ] && [ -n "${PAT_URL}" ] && [ -n "${PAT_HASH}" ]; then
+    writeConfigKey "arc.confdone" "true" "${USER_CONFIG_FILE}"
+    CONFDONE="$(readConfigKey "arc.confdone" "${USER_CONFIG_FILE}")"
+    if [ "${ARCMODE}" = "config" ]; then
+      dialog --clear --backtitle "$(backtitle)" --title "Config done" \
+        --no-cancel --menu "Build now?" 7 40 0 \
+        1 "Yes - Build Arc Loader now" \
+        2 "No - I want to make changes" \
+      2>"${TMP_PATH}/resp"
+      resp=$(cat ${TMP_PATH}/resp)
+      [ -z "${resp}" ] && return
+      [ ${resp} -eq 1 ] && arcSummary || dialog --clear --no-items --backtitle "$(backtitle)"
+    else
+      make
+    fi
+  else
+    dialog --backtitle "$(backtitle)" --title "Config failed" --msgbox "ERROR: Config failed!\nExit." 6 40
+    return 1
+  fi
+}
+
+###############################################################################
+# Show Summary of Config
+function arcSummary() {
+  MODEL="$(readConfigKey "model" "${USER_CONFIG_FILE}")"
+  PRODUCTVER="$(readConfigKey "productver" "${USER_CONFIG_FILE}")"
+  PLATFORM="$(readConfigKey "platform" "${USER_CONFIG_FILE}")"
+  DT="$(readConfigKey "platforms.${PLATFORM}.dt" "${P_FILE}")"
+  KVER="$(readConfigKey "platforms.${PLATFORM}.productvers.\"${PRODUCTVER}\".kver" "${P_FILE}")"
+  PAT_URL="$(readConfigKey "paturl" "${USER_CONFIG_FILE}")"
+  PAT_HASH="$(readConfigKey "pathash" "${USER_CONFIG_FILE}")"
+  ARCPATCH="$(readConfigKey "arc.patch" "${USER_CONFIG_FILE}")"
+  ADDONSINFO="$(readConfigEntriesArray "addons" "${USER_CONFIG_FILE}")"
+  REMAP="$(readConfigKey "arc.remap" "${USER_CONFIG_FILE}")"
+  
+  # Read remap configurations
+  PORTMAP="$(readConfigKey "cmdline.SataPortMap" "${USER_CONFIG_FILE}")"
+  DISKMAP="$(readConfigKey "cmdline.DiskIdxMap" "${USER_CONFIG_FILE}")"
+  PORTREMAP="$(readConfigKey "cmdline.sata_remap" "${USER_CONFIG_FILE}")"
+  AHCIPORTREMAP="$(readConfigKey "cmdline.ahci_remap" "${USER_CONFIG_FILE}")"
+  
+  DIRECTBOOT="$(readConfigKey "directboot" "${USER_CONFIG_FILE}")"
+  KERNELLOAD="$(readConfigKey "kernelload" "${USER_CONFIG_FILE}")"
+  HDDSORT="$(readConfigKey "hddsort" "${USER_CONFIG_FILE}")"
+  NIC="$(readConfigKey "device.nic" "${USER_CONFIG_FILE}")"
+  EXTERNALCONTROLLER="$(readConfigKey "device.externalcontroller" "${USER_CONFIG_FILE}")"
+  HARDDRIVES="$(readConfigKey "device.harddrives" "${USER_CONFIG_FILE}")"
+  DRIVES="$(readConfigKey "device.drives" "${USER_CONFIG_FILE}")"
+  EMMCBOOT="$(readConfigKey "emmcboot" "${USER_CONFIG_FILE}")"
+  KERNEL="$(readConfigKey "kernel" "${USER_CONFIG_FILE}")"
+  
+  # Check for user-defined remap values
+  if [ "${DT}" = "false" ] && [ "${REMAP}" = "user" ] && [ -z "${PORTMAP}${DISKMAP}${PORTREMAP}${AHCIPORTREMAP}" ]; then
+    dialog --backtitle "$(backtitle)" --title "Arc Error" \
+      --msgbox "ERROR: You selected Portmap: User and not set any values. -> Can't build Loader!\nGo need to go Cmdline Options and add your Values." 6 80
+    return 1
+  fi
+  
+  # Print Summary
+  SUMMARY="\Z4> DSM Information\Zn"
+  SUMMARY+="\n>> Model: \Zb${MODEL}\Zn"
+  SUMMARY+="\n>> Version: \Zb${PRODUCTVER}\Zn"
+  SUMMARY+="\n>> Platform: \Zb${PLATFORM}\Zn"
+  SUMMARY+="\n>> DT: \Zb${DT}\Zn"
+  SUMMARY+="\n>> PAT URL: \Zb${PAT_URL}\Zn"
+  SUMMARY+="\n>> PAT Hash: \Zb${PAT_HASH}\Zn"
+  [ "${MODEL}" = "SA6400" ] && SUMMARY+="\n>> Kernel: \Zb${KERNEL}\Zn"
+  SUMMARY+="\n>> Kernel Version: \Zb${KVER}\Zn"
+  SUMMARY+="\n"
+  SUMMARY+="\n\Z4> Arc Information\Zn"
+  SUMMARY+="\n>> Arc Patch: \Zb${ARCPATCH}\Zn"
+  [ -n "${PORTMAP}" ] && SUMMARY+="\n>> SataPortmap: \Zb${PORTMAP}\Zn"
+  [ -n "${DISKMAP}" ] && SUMMARY+="\n>> DiskIdxMap: \Zb${DISKMAP}\Zn"
+  [ -n "${PORTREMAP}" ] && SUMMARY+="\n>> SataRemap: \Zb${PORTREMAP}\Zn"
+  [ -n "${AHCIPORTREMAP}" ] && SUMMARY+="\n>> AhciRemap: \Zb${AHCIPORTREMAP}\Zn"
+  [ "${DT}" = "true" ] && SUMMARY+="\n>> Sort Drives: \Zb${HDDSORT}\Zn"
+  SUMMARY+="\n>> Directboot: \Zb${DIRECTBOOT}\Zn"
+  SUMMARY+="\n>> eMMC Boot: \Zb${EMMCBOOT}\Zn"
+  SUMMARY+="\n>> Kernelload: \Zb${KERNELLOAD}\Zn"
+  SUMMARY+="\n>> Addons: \Zb${ADDONSINFO}\Zn"
+  SUMMARY+="\n"
+  SUMMARY+="\n\Z4> Device Information\Zn"
+  SUMMARY+="\n>> NIC: \Zb${NIC}\Zn"
+  SUMMARY+="\n>> Total Disks: \Zb${DRIVES}\Zn"
+  SUMMARY+="\n>> Internal Disks: \Zb${HARDDRIVES}\Zn"
+  SUMMARY+="\n>> Additional Controller: \Zb${EXTERNALCONTROLLER}\Zn"
+  SUMMARY+="\n"
+  
+  dialog --backtitle "$(backtitle)" --colors --title "Config Summary" \
+    --extra-button --extra-label "Cancel" --msgbox "${SUMMARY}" 0 0
+  
+  RET=$?
+  case ${RET} in
+    0)
+      make
+      ;;
+    3|255)
+      return 0
+      ;;
+  esac
+}
+
+###############################################################################
+# Building Loader
+function make() {
+  # Read Model Config
+  MODEL="$(readConfigKey "model" "${USER_CONFIG_FILE}")"
+  PLATFORM="$(readConfigKey "platform" "${USER_CONFIG_FILE}")"
+  PRODUCTVER="$(readConfigKey "productver" "${USER_CONFIG_FILE}")"
+  DT="$(readConfigKey "platforms.${PLATFORM}.dt" "${P_FILE}")"
+  CONFDONE="$(readConfigKey "arc.confdone" "${USER_CONFIG_FILE}")"
+  PAT_URL="$(readConfigKey "paturl" "${USER_CONFIG_FILE}")"
+  PAT_HASH="$(readConfigKey "pathash" "${USER_CONFIG_FILE}")"
+  # Check for Arc Patch
+  ARCCONF="$(readConfigKey "${MODEL}.serial" "${S_FILE}")"
+  ARCPATCH="$(readConfigKey "arc.patch" "${USER_CONFIG_FILE}")"
+  if [ -z "${ARCCONF}" ] || [ "${ARCPATCH}" = "false" ]; then
+    deleteConfigKey "addons.amepatch" "${USER_CONFIG_FILE}"
+    deleteConfigKey "addons.arcdns" "${USER_CONFIG_FILE}"
+  fi
+  # Max Memory for DSM
+  RAMCONFIG="$((${RAMTOTAL} * 1024 * 2))"
+  writeConfigKey "synoinfo.mem_max_mb" "${RAMCONFIG}" "${USER_CONFIG_FILE}"
+  if [ -n "${IPCON}" ]; then
+    getpatfiles
+  else
+    dialog --backtitle "$(backtitle)" --title "Build Loader" --aspect 18 \
+      --infobox "Could not build Loader!\nNetwork Connection needed." 4 40
+    # Set Build to false
+    writeConfigKey "arc.builddone" "false" "${USER_CONFIG_FILE}"
+    BUILDDONE="$(readConfigKey "arc.builddone" "${USER_CONFIG_FILE}")"
+    sleep 2
+    return
+  fi
+  if [ -f "${ORI_ZIMAGE_FILE}" ] && [ -f "${ORI_RDGZ_FILE}" ] && [ "${CONFDONE}" = "true" ] && [ -n "${PAT_URL}" ] && [ -n "${PAT_HASH}" ]; then
+    (
+      livepatch
+      sleep 3
+    ) 2>&1 | dialog --backtitle "$(backtitle)" --colors --title "Build Loader" \
+      --progressbox "Patching DSM Files..." 20 70
+  else
+    dialog --backtitle "$(backtitle)" --title "Build Loader" --aspect 18 \
+      --infobox "Configuration issue found.\nCould not build Loader!\nExit." 5 40
+    # Set Build to false
+    writeConfigKey "arc.builddone" "false" "${USER_CONFIG_FILE}"
+    BUILDDONE="$(readConfigKey "arc.builddone" "${USER_CONFIG_FILE}")"
+    sleep 2
+    return
+  fi
+  if [ -f "${ORI_ZIMAGE_FILE}" ] && [ -f "${ORI_RDGZ_FILE}" ] && [ -f "${MOD_ZIMAGE_FILE}" ] && [ -f "${MOD_RDGZ_FILE}" ]; then
+    MODELID="$(echo ${MODEL} | sed 's/d$/D/; s/rp$/RP/; s/rp+/RP+/')"
+    writeConfigKey "modelid" "${MODELID}" "${USER_CONFIG_FILE}"
+    writeConfigKey "arc.version" "${ARC_VERSION}" "${USER_CONFIG_FILE}"
+    arcFinish
+  else
+    dialog --backtitle "$(backtitle)" --title "Build Loader" --aspect 18 \
+      --infobox "Could not build Loader!\nExit." 4 40
+    # Set Build to false
+    writeConfigKey "arc.builddone" "false" "${USER_CONFIG_FILE}"
+    BUILDDONE="$(readConfigKey "arc.builddone" "${USER_CONFIG_FILE}")"
+    sleep 2
+    return
+  fi
+}
+
+###############################################################################
+# Finish Building Loader
+function arcFinish() {
+  rm -f "${LOG_FILE}" >/dev/null 2>&1 || true
+  MODELID="$(readConfigKey "modelid" "${USER_CONFIG_FILE}")"
+  ARCMODE="$(readConfigKey "arc.mode" "${USER_CONFIG_FILE}")"
+  
+  if [ -n "${MODELID}" ]; then
+    writeConfigKey "arc.builddone" "true" "${USER_CONFIG_FILE}"
+    BUILDDONE="$(readConfigKey "arc.builddone" "${USER_CONFIG_FILE}")"
+  
+    if [ "${ARCMODE}" = "automated" ] || [ "${UPDATEMODE}" = "true" ]; then
+      boot
+    else
+      # Ask for Boot
+      dialog --clear --backtitle "$(backtitle)" --title "Build done" \
+        --no-cancel --menu "Boot now?" 7 40 0 \
+        1 "Yes - Boot DSM now" \
+        2 "No - I want to make changes" \
+      2>"${TMP_PATH}/resp"
+      resp=$(cat "${TMP_PATH}/resp")
+      [ "${resp}" -eq 1 ] && boot || return
+    fi
+  fi
+}
+
+###############################################################################
+# Calls boot.sh to boot into DSM Reinstall Mode
+function juniorboot() {
+  BUILDDONE="$(readConfigKey "arc.builddone" "${USER_CONFIG_FILE}")"
+  MODEL="$(readConfigKey "model" "${USER_CONFIG_FILE}")"
+  MODELID="$(readConfigKey "modelid" "${USER_CONFIG_FILE}")"
+  ARCMODE="$(readConfigKey "arc.mode" "${USER_CONFIG_FILE}")"
+  if [[ "${BUILDDONE}" = "false" && "${ARCMODE}" != "automated" ]] || [ "${MODEL}" != "${MODELID}" ]; then
+    dialog --backtitle "$(backtitle)" --title "Alert" \
+      --yesno "Config changed, you need to rebuild the Loader?" 0 0
+    if [ $? -eq 0 ]; then
+      arcSummary
+    fi
+  else
+    dialog --backtitle "$(backtitle)" --title "Arc Boot" \
+      --infobox "Booting DSM Reinstall Mode...\nPlease stay patient!" 4 30
+    sleep 3
+    rebootTo junior
+  fi
+}
+
+###############################################################################
+# Calls boot.sh to boot into DSM kernel/ramdisk
+function boot() {
+  BUILDDONE="$(readConfigKey "arc.builddone" "${USER_CONFIG_FILE}")"
+  MODEL="$(readConfigKey "model" "${USER_CONFIG_FILE}")"
+  MODELID="$(readConfigKey "modelid" "${USER_CONFIG_FILE}")"
+  ARCMODE="$(readConfigKey "arc.mode" "${USER_CONFIG_FILE}")"
+  if [[ "${BUILDDONE}" = "false" && "${ARCMODE}" != "automated" ]] || [ "${MODEL}" != "${MODELID}" ]; then
+    dialog --backtitle "$(backtitle)" --title "Alert" \
+      --yesno "Config changed, you need to rebuild the Loader?" 0 0
+    if [ $? -eq 0 ]; then
+      arcSummary
+    fi
+  else
+    dialog --backtitle "$(backtitle)" --title "Arc Boot" \
+      --infobox "Booting DSM...\nPlease stay patient!" 4 25
+    sleep 2
+    exec reboot
+  fi
+}
+
+###############################################################################
+###############################################################################
+# Main loop
+if [ "${ARCMODE}" = "update" ]; then
+  if [ "${ARCOFFLINE}" != "true" ]; then
+    updateLoader
+  else
+    dialog --backtitle "$(backtitle)" --title "Arc Update" \
+      --infobox "Update is not possible in Offline Mode!" 5 40
+    sleep 3
+    exec reboot
+  fi
+elif [ "${ARCMODE}" = "automated" ]; then
+  if [ "${BUILDDONE}" = "false" ] || [ "${MODEL}" != "${MODELID}" ]; then
+    arcModel
+  else
+    make
+  fi
+elif [ "${ARCMODE}" = "config" ]; then
+  NEXT="1"
+  while true; do
+    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}"
+    fi
+
+    write_menu_with_color "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}"
+
+      if [ -n "${USERID}" ] && [ "${ARCOFFLINE}" = "false" ]; then
+        write_menu_with_color "p" "Arc Patch" "${ARCPATCH}"
+      elif [ "${ARCOFFLINE}" = "false" ]; then
+        write_menu "p" "Arc Patch: \Z4Register HardwareID first\Zn"
+      else
+        write_menu "p" "SN/Mac Options"
+      fi
+
+      if [ "${PLATFORM}" = "epyc7002" ]; then
+        CPUINFO="$(cat /proc/cpuinfo | wc -l)"
+        if [ ${CPUINFO} -gt 24 ]; then
+          write_menu "=" "Custom Kernel should be used for this CPU"
+        fi
+        write_menu_with_color "K" "Kernel" "${KERNEL}"
+      fi
+
+      write_menu "b" "Addons"
+
+      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}" ;;
+          esac
+        fi
+      done
+
+      write_menu "d" "Modules"
+      write_menu_with_color "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}"
+      fi
+
+      if [ "${DT}" = "true" ]; then
+        write_menu_with_color "H" "Hotplug/SortDrives" "${HDDSORT}"
+      else
+        write_menu_with_color "h" "USB as Internal" "${USBMOUNT}"
+      fi
+    fi
+
+    write_menu_with_color "c" "Offline Mode" "${ARCOFFLINE}"
+    write_menu "9" "Advanced Options"
+    write_menu "=" "\Z4===== Diag =====\Zn"
+    write_menu "a" "Sysinfo"
+    write_menu "A" "Networkdiag"
+    write_menu "=" "\Z4===== Misc =====\Zn"
+    write_menu "x" "Backup/Restore/Recovery"
+    [ "${ARCOFFLINE}" = "false" ] && write_menu "z" "Update Menu"
+    write_menu "I" "Power/Service Menu"
+    write_menu "V" "Credits"
+
+    if [ "${CONFDONE}" = "false" ]; then
+      EXTRA_LABEL="Config"
+    elif [ "${CONFDONE}" = "true" ]; then
+      EXTRA_LABEL="Build"
+    elif [ "${BUILDDONE}" = "true" ]; then
+      EXTRA_LABEL="Boot"
+    fi
+    if [ "$TERM" != "xterm-256color" ]; then
+      WEBCONFIG="Webconfig: http://${IPCON}${HTTPPORT:+:$HTTPPORT}"
+    else
+      WEBCONFIG=""
+    fi
+    dialog --clear --default-item ${NEXT} --backtitle "$(backtitle)" --title "Evo UI" --colors \
+          --cancel-label "Classic" --help-button --help-label "Exit" \
+          --extra-button --extra-label "${EXTRA_LABEL}" \
+          --menu "${WEBCONFIG}" 0 0 0 --file "${TMP_PATH}/menu" \
+          2>"${TMP_PATH}/resp"
+    RET=$?
+    case ${RET} in
+      0)
+        resp=$(cat ${TMP_PATH}/resp)
+        [ -z "${resp}" ] && return
+        case ${resp} in
+          0) genHardwareID; NEXT="0" ;;
+          1) arcModel; NEXT="2" ;;
+          b) addonMenu; NEXT="b" ;;
+          d) modulesMenu; NEXT="d" ;;
+          e) ONLYVERSION="true" && arcVersion; NEXT="e" ;;
+          p) ONLYPATCH="true" && checkHardwareID && arcPatch; NEXT="p" ;;
+          S) storageMenu; NEXT="S" ;;
+          g) governorMenu; NEXT="g" ;;
+          P) storagepanelMenu; NEXT="P" ;;
+          Q) sequentialIOMenu; NEXT="Q" ;;
+          K) KERNEL=$([ "${KERNEL}" = "official" ] && echo 'custom' || echo 'official')
+            writeConfigKey "kernel" "${KERNEL}" "${USER_CONFIG_FILE}"
+            dialog --backtitle "$(backtitle)" --title "Kernel" \
+              --infobox "Switching Kernel to ${KERNEL}! Stay patient..." 4 50
+            if [ "${ODP}" = "true" ]; then
+              ODP="false"
+              writeConfigKey "odp" "${ODP}" "${USER_CONFIG_FILE}"
+            fi
+            PLATFORM="$(readConfigKey "platform" "${USER_CONFIG_FILE}")"
+            PRODUCTVER="$(readConfigKey "productver" "${USER_CONFIG_FILE}")"
+            KVER="$(readConfigKey "platforms.${PLATFORM}.productvers.\"${PRODUCTVER}\".kver" "${P_FILE}")"
+            [ "${PLATFORM}" = "epyc7002" ] && KVERP="${PRODUCTVER}-${KVER}" || KVERP="${KVER}"
+            if [ -n "${PLATFORM}" ] && [ -n "${KVERP}" ]; then
+              writeConfigKey "modules" "{}" "${USER_CONFIG_FILE}"
+              mergeConfigModules "$(getAllModules "${PLATFORM}" "${KVERP}" | awk '{print $1}')" "${USER_CONFIG_FILE}"
+            fi
+            writeConfigKey "arc.builddone" "false" "${USER_CONFIG_FILE}"
+            BUILDDONE="$(readConfigKey "arc.builddone" "${USER_CONFIG_FILE}")"
+            NEXT="K"
+            ;;
+          H) [ "${HDDSORT}" = "true" ] && HDDSORT='false' || HDDSORT='true'
+            writeConfigKey "hddsort" "${HDDSORT}" "${USER_CONFIG_FILE}"
+            writeConfigKey "arc.builddone" "false" "${USER_CONFIG_FILE}"
+            BUILDDONE="$(readConfigKey "arc.builddone" "${USER_CONFIG_FILE}")"
+            NEXT="H"
+            ;;
+          h) [ "${USBMOUNT}" = "true" ] && USBMOUNT='false' || USBMOUNT='true'
+            writeConfigKey "usbmount" "${USBMOUNT}" "${USER_CONFIG_FILE}"
+            writeConfigKey "arc.builddone" "false" "${USER_CONFIG_FILE}"
+            BUILDDONE="$(readConfigKey "arc.builddone" "${USER_CONFIG_FILE}")"
+            NEXT="h"
+            ;;
+          O) [ "${ODP}" = "false" ] && ODP='true' || ODP='false'
+            writeConfigKey "odp" "${ODP}" "${USER_CONFIG_FILE}"
+            writeConfigKey "arc.builddone" "false" "${USER_CONFIG_FILE}"
+            BUILDDONE="$(readConfigKey "arc.builddone" "${USER_CONFIG_FILE}")"
+            NEXT="O"
+            ;;
+          c) ARCOFFLINE=$([ "${ARCOFFLINE}" = "true" ] && echo 'false' || echo 'true')
+            writeConfigKey "arc.offline" "${ARCOFFLINE}" "${USER_CONFIG_FILE}"
+            [ "${ARCOFFLINE}" = "false" ] && exec arc.sh
+            NEXT="c"
+            ;;
+          # Diag Section
+          a) sysinfo; NEXT="a" ;;
+          A) networkdiag; NEXT="A" ;;
+          # Misc Settings
+          x) backupMenu; NEXT="x" ;;
+          z) updateMenu; NEXT="z" ;;
+          I) rebootMenu; NEXT="I" ;;
+          V) credits; NEXT="V" ;;
+          9) advancedMenu; NEXT="9" ;;
+        esac
+        ;;
+      1)
+        exec arc.sh
+        ;;
+      3)
+        if [ "${CONFDONE}" = "false" ]; then
+          arcModel
+        elif [ "${CONFDONE}" = "true" ]; then
+          arcSummary
+        elif [ "${BUILDDONE}" = "true" ]; then
+          boot
+        fi
+        ;;
+      *)
+        break
+        ;;
+    esac
+  done
+else
+  exec reboot
+fi
+
+# Inform user
+echo -e "Call \033[1;34marc.sh\033[0m to configure Loader"
+echo
+echo -e "Web Config: \033[1;34mhttp://${IPCON}${HTTPPORT:+:$HTTPPORT}\033[0m"
+echo
+echo -e "SSH Access:"
+echo -e "IP: \033[1;34m${IPCON}\033[0m"
+echo -e "User: \033[1;34mroot\033[0m"
+echo -e "Password: \033[1;34marc\033[0m"
+echo

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

@@ -11,7 +11,7 @@ function availableAddons() {
   local PAT_URL="$(readConfigKey "paturl" "${USER_CONFIG_FILE}")"
   for D in $(find "${ADDONS_PATH}" -maxdepth 1 -type d 2>/dev/null | sort); do
     [ ! -f "${D}/manifest.yml" ] && continue
-    local ADDON=$(basename ${D})
+    local ADDON=$(basename "${D}")
     local AVAILABLE="$(readConfigKey "${1}" "${D}/manifest.yml")"
     [ "${AVAILABLE}" = false ] && continue
     local SYSTEM=$(readConfigKey "system" "${D}/manifest.yml")
@@ -113,3 +113,19 @@ function updateAddon() {
     rm -f "${F}"
   done
 }
+
+###############################################################################
+# Read Addon Key
+# 1 - Addon
+# 2 - key
+function readAddonKey() {
+  if [ -z "${1}" ] || [ -z "${2}" ]; then
+    echo ""
+    return 1
+  fi
+  if [ ! -f "${ADDONS_PATH}/${1}/manifest.yml" ]; then
+    echo ""
+    return 1
+  fi
+  readConfigKey "${2}" "${ADDONS_PATH}/${1}/manifest.yml"
+}

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

@@ -13,10 +13,11 @@ RAMDISK_PATH="${TMP_PATH}/ramdisk"
 LOG_FILE="${TMP_PATH}/log.txt"
 TMP_UP_PATH="${TMP_PATH}/upload"
 
-USER_GRUB_CONFIG="${PART1_PATH}/boot/grub/grub.cfg"
-USER_GRUBENVFILE="${PART1_PATH}/boot/grub/grubenv"
-USER_CONFIG_FILE="${PART1_PATH}/user-config.yml"
 GRUB_PATH="${PART1_PATH}/boot/grub"
+USER_GRUB_CONFIG="${GRUB_PATH}/grub.cfg"
+USER_GRUBENVFILE="${GRUB_PATH}/grubenv"
+USER_CONFIG_FILE="${PART1_PATH}/user-config.yml"
+HW_KEY="${PART2_PATH}/machine.key"
 
 ORI_ZIMAGE_FILE="${PART2_PATH}/zImage"
 ORI_RDGZ_FILE="${PART2_PATH}/rd.gz"
@@ -43,7 +44,7 @@ EXTRACTOR_PATH="${PART3_PATH}/extractor"
 EXTRACTOR_BIN="syno_extract_system_patch"
 
 HTTPPORT=$(grep -i '^HTTP_PORT=' /etc/arc.conf 2>/dev/null | cut -d'=' -f2)
-[ -z "${HTTPPORT}" ] && HTTPPORT=8080 || true
+[ -z "${HTTPPORT}" ] && HTTPPORT=5000 || true
 DUFSPORT=$(grep -i '^DUFS_PORT=' /etc/arc.conf 2>/dev/null | cut -d'=' -f2)
 [ -z "${DUFSPORT}" ] && DUFSPORT=7304 || true
 TTYDPORT=$(grep -i '^TTYD_PORT=' /etc/arc.conf 2>/dev/null | cut -d'=' -f2)

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

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2023 AuxXxilium <https://github.com/AuxXxilium> and Ing <https://github.com/wjz304>
+# Copyright (C) 2025 AuxXxilium <https://github.com/AuxXxilium> and Ing <https://github.com/wjz304>
 #
 # This is free software, licensed under the MIT License.
 # See /LICENSE for more information.

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

@@ -147,6 +147,14 @@ function generateMacAddress() {
   return 0
 }
 
+###############################################################################
+function generate_and_write_serial() {
+  local use_patch=$1
+  SN="$(generateSerial "${MODEL}" "${use_patch}")"
+  writeConfigKey "arc.patch" "${use_patch}" "${USER_CONFIG_FILE}"
+  writeConfigKey "sn" "${SN}" "${USER_CONFIG_FILE}"
+}
+
 ###############################################################################
 # Validate a serial number for a model
 # 1 - Model
@@ -668,4 +676,14 @@ function fixDSMRootPart() {
     mdadm --assemble --scan >/dev/null 2>&1
     fsck "${1}" >/dev/null 2>&1
   fi
+}
+
+###############################################################################
+# Menu functions
+function write_menu() {
+  echo "$1 \"$2\" " >>"${TMP_PATH}/menu"
+}
+    
+function write_menu_with_color() {
+  echo "$1 \"$2: \Z4${3:-none}\Zn\" " >>"${TMP_PATH}/menu"
 }

files/initrd/opt/arc/include/modulelist

@@ -7,13 +7,25 @@
 # eg: N i915.ko
 
 # kvm
-N irqbypass.ko
-N kvm-intel.ko
-N kvm-amd.ko
-N kvm.ko
+F irqbypass.ko
+F kvm-intel.ko
+F kvm-amd.ko
+F kvm.ko
 
 # acpi
 N acpi_call.ko
+N acpi-cpufreq.ko
+N processor.ko
+N button.ko
+
+# cpufreq
+N cpufreq_governor.ko
+N cpufreq_ondemand.ko
+N cpufreq_conservative.ko
+N cpufreq_performance.ko
+N cpufreq_powersave.ko
+N cpufreq_userspace.ko
+N cpufreq_stats.ko
 
 # misc
 N check_signature.ko
@@ -34,14 +46,6 @@ N cdc_ether.ko
 N rndis_host.ko
 N r8152.ko
 
-# iwlwifi
-N libarc4.ko
-N cfg80211.ko
-N mac80211.ko
-N iwlwifi.ko
-N iwlmvm.ko
-N iwldvm.ko
-
 ## i915
 #N dmabuf.ko
 #N drm.ko

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

@@ -49,9 +49,9 @@ function getAllModules() {
 
   # Get list of all modules
   for F in $(ls ${TMP_PATH}/modules/*.ko 2>/dev/null); do
-    local X=$(basename ${F})
+    local X=$(basename "${F}")
     local M=${X:0:-3}
-    local DESC=$(modinfo ${F} | awk -F':' '/description:/{ print $2}' | awk '{sub(/^[ ]+/,""); print}')
+    local DESC=$(modinfo "${F}" | awk -F':' '/description:/{ print $2}' | awk '{sub(/^[ ]+/,""); print}')
     [ -z "${DESC}" ] && DESC="${X}"
     echo "${M} \"${DESC}\""
   done
@@ -78,19 +78,19 @@ function installModules() {
 
   local ODP="$(readConfigKey "odp" "${USER_CONFIG_FILE}")"
   for F in $(ls "${TMP_PATH}/modules/"*.ko 2>/dev/null); do
-    local M=$(basename ${F})
+    local M=$(basename "${F}")
     [ "${ODP}" = "true" ] && [ -f "${RAMDISK_PATH}/usr/lib/modules/${M}" ] && continue
     if echo "${MLIST}" | grep -wq "${M:0:-3}"; then
-      cp -f "${F}" "${RAMDISK_PATH}/usr/lib/modules/${M}"
+      cp -f "${F}" "${RAMDISK_PATH}/usr/lib/modules/${M}" 2>"${LOG_FILE}"
     else
-      rm -f "${RAMDISK_PATH}/usr/lib/modules/${M}"
+      rm -f "${RAMDISK_PATH}/usr/lib/modules/${M}" 2>"${LOG_FILE}"
     fi
   done
   mkdir -p "${RAMDISK_PATH}/usr/lib/firmware"
   if [ "${KERNEL}" = "custom" ]; then
-    tar -zxf "${CUSTOM_PATH}/firmware.tgz" -C "${RAMDISK_PATH}/usr/lib/firmware"
+    tar -zxf "${CUSTOM_PATH}/firmware.tgz" -C "${RAMDISK_PATH}/usr/lib/firmware" 2>"${LOG_FILE}"
   else
-    tar -zxf "${MODULES_PATH}/firmware.tgz" -C "${RAMDISK_PATH}/usr/lib/firmware"
+    tar -zxf "${MODULES_PATH}/firmware.tgz" -C "${RAMDISK_PATH}/usr/lib/firmware" 2>"${LOG_FILE}"
   fi
   if [ $? -ne 0 ]; then
     return 1
@@ -118,7 +118,7 @@ function addToModules() {
 
   unpackModules "${PLATFORM}" "${KVER}"
 
-  cp -f ${KOFILE} ${TMP_PATH}/modules
+  cp -f "${KOFILE}" "${TMP_PATH}/modules"
 
   packModules "${PLATFORM}" "${KVER}"
 }
@@ -140,7 +140,7 @@ function delToModules() {
 
   unpackModules "${PLATFORM}" "${KVER}"
 
-  rm -f ${TMP_PATH}/modules/${KONAME}
+  rm -f "${TMP_PATH}/modules/${KONAME}"
 
   packModules "${PLATFORM}" "${KVER}"
 }
@@ -173,7 +173,7 @@ function getdepends() {
 
   unpackModules "${PLATFORM}" "${KVER}"
 
-  local DPS=($(_getdepends ${KONAME} | tr ' ' '\n' | sort -u))
+  local DPS=($(_getdepends "${KONAME}" | tr ' ' '\n' | sort -u))
   echo ${DPS[@]}
   rm -rf "${TMP_PATH}/modules"
 }

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

@@ -1,34 +1,33 @@
 # Get Network Config for Loader
 function getnet() {
-  ETHX=$(ls /sys/class/net/ 2>/dev/null | grep eth) || true
-  MODEL="$(readConfigKey "model" "${USER_CONFIG_FILE}")"
+  generate_and_write_macs() {
+    local patch=$1
+    local macs=($(generateMacAddress "${MODEL}" "${ETHN}" "${patch}"))
+
+    for i in $(seq 1 "${ETHN}"); do
+      local mac="${macs[$((i - 1))]}"
+      writeConfigKey "eth$((i - 1))" "${mac}" "${USER_CONFIG_FILE}"
+    done
+  }
+
+  ETHX=$(ls /sys/class/net/ 2>/dev/null | 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
-    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
-    MACS=($(generateMacAddress "${MODEL}" "${ETHN}" "false"))
-    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}" = "user" ]; then
-    # User Mac
+  ARCCONF="$(readConfigKey "${MODEL}.serial" "${S_FILE}")"
+  ARCMODE="$(readConfigKey "arc.mode" "${USER_CONFIG_FILE}")"
+  ETHN=$(echo "${ETHX}" | wc -w)
+
+  if [ "${ARCPATCH}" = "user" ]; then
     for N in ${ETHX}; do
       while true; do
         dialog --backtitle "$(backtitle)" --title "Mac Setting" \
-          --inputbox "Type a custom Mac for ${N} (Eq. 001132a1b2c3).\nA custom Mac will not be applied to NIC!" 8 50\
+          --inputbox "Type a custom Mac for ${N} (Eq. 001132a1b2c3).\nA custom Mac will not be applied to NIC!" 8 50 \
           2>"${TMP_PATH}/resp"
         [ $? -ne 0 ] && break
         MAC=$(cat "${TMP_PATH}/resp")
-        [ -z "${MAC}" ] && MAC="$(readConfigKey "${N}" "${USER_CONFIG_FILE}")"
-        [ -z "${MAC}" ] && MAC="$(cat /sys/class/net/${N}/address 2>/dev/null | sed 's/://g')"
-        MAC="$(echo "${MAC}" | tr '[:upper:]' '[:lower:]')"
+        [ -z "${MAC}" ] && MAC=$(readConfigKey "${N}" "${USER_CONFIG_FILE}")
+        [ -z "${MAC}" ] && MAC=$(cat /sys/class/net/${N}/address 2>/dev/null | sed 's/://g')
+        MAC=$(echo "${MAC}" | tr '[:upper:]' '[:lower:]')
         if [ ${#MAC} -eq 12 ]; then
           dialog --backtitle "$(backtitle)" --title "Mac Setting" --msgbox "Set Mac for ${N} to ${MAC}!" 5 50
           writeConfigKey "${N}" "${MAC}" "${USER_CONFIG_FILE}"
@@ -38,13 +37,17 @@ function getnet() {
         fi
       done
     done
+  elif [ "${ARCPATCH}" != "user" ] && [ -n "${ARCCONF}" ]; then
+    generate_and_write_macs "${ARCPATCH}"
+  else
+    generate_and_write_macs "false"
   fi
 }
 
 # Get Amount of NIC
-ETHX=$(ls /sys/class/net/ 2>/dev/null | grep eth) || true
+ETHX=$(ls /sys/class/net/ 2>/dev/null | grep eth)
 # Get actual IP
 for N in ${ETHX}; do
   IPCON="$(getIP "${N}")"
-  [ -n "${IPCON}" ] && break
+  [ -n "${IPCON}" ] && break || IPCON="noip"
 done

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

@@ -1,109 +1,133 @@
 # Get PortMap for Loader
 function getmap() {
+  function show_and_set_remap() {
+      dialog --backtitle "$(backtitle)" --title "Sata Portmap" \
+        --menu "Choose a Portmap for Sata!?\n* Recommended Option" 8 60 0 \
+        1 "DiskIdxMap: Active Ports ${REMAP1}" \
+        2 "DiskIdxMap: Max Ports ${REMAP2}" \
+        3 "SataRemap: Remove empty Ports ${REMAP3}" \
+        4 "AhciRemap: Remove empty Ports (new) ${REMAP4}" \
+        5 "Set my own Portmap in Config" \
+      2>"${TMP_PATH}/resp"
+      [ $? -ne 0 ] && return 1
+      resp=$(cat "${TMP_PATH}/resp")
+      [ -z "${resp}" ] && return 1
+  
+      case ${resp} in
+        1) writeConfigKey "arc.remap" "acports" "${USER_CONFIG_FILE}" ;;
+        2) writeConfigKey "arc.remap" "maxports" "${USER_CONFIG_FILE}" ;;
+        3) writeConfigKey "arc.remap" "remap" "${USER_CONFIG_FILE}" ;;
+        4) writeConfigKey "arc.remap" "ahci" "${USER_CONFIG_FILE}" ;;
+        5) writeConfigKey "arc.remap" "user" "${USER_CONFIG_FILE}" ;;
+      esac
+  }
+
   # Sata Disks
   SATADRIVES=0
   if [ $(lspci -d ::106 2>/dev/null | wc -l) -gt 0 ]; then
     # Clean old files
-    [ -f "${TMP_PATH}/drivesmax" ] && rm -f "${TMP_PATH}/drivesmax" && touch "${TMP_PATH}/drivesmax"
-    [ -f "${TMP_PATH}/drivescon" ] && rm -f "${TMP_PATH}/drivescon" && touch "${TMP_PATH}/drivescon"
-    [ -f "${TMP_PATH}/ports" ] && rm -f "${TMP_PATH}/ports" && touch "${TMP_PATH}/ports"
-    [ -f "${TMP_PATH}/remap" ] && rm -f "${TMP_PATH}/remap" && touch "${TMP_PATH}/remap"
-    if [ $(lspci -d ::106 | wc -l) -gt 0 ]; then
-      let DISKIDXMAPIDX=0
-      DISKIDXMAP=""
-      let DISKIDXMAPIDXMAX=0
-      DISKIDXMAPMAX=""
-      for PCI in $(lspci -d ::106 2>/dev/null | awk '{print $1}'); do
-        NUMPORTS=0
-        CONPORTS=0
-        unset HOSTPORTS
-        declare -A HOSTPORTS
-        while read -r LINE; do
-          ATAPORT="$(echo ${LINE} | grep -o 'ata[0-9]*')"
-          PORT=$(echo ${ATAPORT} | sed 's/ata//')
-          HOSTPORTS[${PORT}]=$(echo ${LINE} | grep -o 'host[0-9]*$')
-        done < <(ls -l /sys/class/scsi_host | grep -F "${PCI}")
-        while read -r PORT; do
-          ls -l /sys/block | grep -F -q "${PCI}/ata${PORT}" && ATTACH=1 || ATTACH=0
-          PCMD=$(cat /sys/class/scsi_host/${HOSTPORTS[${PORT}]}/ahci_port_cmd)
-          [ ${PCMD} = 0 ] && DUMMY=1 || DUMMY=0
-          [ ${ATTACH} = 1 ] && CONPORTS="$((${CONPORTS} + 1))" && echo "$((${PORT} - 1))" >>"${TMP_PATH}/ports"
-          [ ${DUMMY} = 1 ] # Do nothing for now
-          NUMPORTS=$((${NUMPORTS} + 1))
-        done < <(echo ${!HOSTPORTS[@]} | tr ' ' '\n' | sort -n)
-        [ ${NUMPORTS} -gt 8 ] && NUMPORTS=8
-        [ ${CONPORTS} -gt 8 ] && CONPORTS=8
-        echo -n "${NUMPORTS}" >>"${TMP_PATH}/drivesmax"
-        echo -n "${CONPORTS}" >>"${TMP_PATH}/drivescon"
-        DISKIDXMAP=$DISKIDXMAP$(printf "%02x" $DISKIDXMAPIDX)
-        let DISKIDXMAPIDX=$DISKIDXMAPIDX+$CONPORTS
-        DISKIDXMAPMAX=$DISKIDXMAPMAX$(printf "%02x" $DISKIDXMAPIDXMAX)
-        let DISKIDXMAPIDXMAX=$DISKIDXMAPIDXMAX+$NUMPORTS
-        SATADRIVES=$((${SATADRIVES} + ${CONPORTS}))
+    for file in drivesmax drivescon ports remap; do
+      > "${TMP_PATH}/${file}"
+    done
+
+    DISKIDXMAPIDX=0
+    DISKIDXMAP=""
+    DISKIDXMAPIDXMAX=0
+    DISKIDXMAPMAX=""
+
+    for PCI in $(lspci -d ::106 2>/dev/null | awk '{print $1}'); do
+      NUMPORTS=0
+      CONPORTS=0
+      declare -A HOSTPORTS
+
+      while read -r LINE; do
+        PORT=$(echo ${LINE} | grep -o 'ata[0-9]*' | sed 's/ata//')
+        HOSTPORTS[${PORT}]=$(echo ${LINE} | grep -o 'host[0-9]*$')
+      done < <(ls -l /sys/class/scsi_host | grep -F "${PCI}")
+
+      for PORT in $(echo ${!HOSTPORTS[@]} | tr ' ' '\n' | sort -n); do
+        ATTACH=$(ls -l /sys/block | grep -F -q "${PCI}/ata${PORT}" && echo 1 || echo 0)
+        PCMD=$(cat /sys/class/scsi_host/${HOSTPORTS[${PORT}]}/ahci_port_cmd)
+        DUMMY=$([ ${PCMD} = 0 ] && echo 1 || echo 0)
+
+        [ ${ATTACH} = 1 ] && CONPORTS=$((CONPORTS + 1)) && echo $((PORT - 1)) >>"${TMP_PATH}/ports"
+        NUMPORTS=$((NUMPORTS + 1))
       done
-    fi
+
+      NUMPORTS=$((NUMPORTS > 8 ? 8 : NUMPORTS))
+      CONPORTS=$((CONPORTS > 8 ? 8 : CONPORTS))
+
+      echo -n "${NUMPORTS}" >>"${TMP_PATH}/drivesmax"
+      echo -n "${CONPORTS}" >>"${TMP_PATH}/drivescon"
+      DISKIDXMAP+=$(printf "%02x" $DISKIDXMAPIDX)
+      DISKIDXMAPIDX=$((DISKIDXMAPIDX + CONPORTS))
+      DISKIDXMAPMAX+=$(printf "%02x" $DISKIDXMAPIDXMAX)
+      DISKIDXMAPIDXMAX=$((DISKIDXMAPIDXMAX + NUMPORTS))
+      SATADRIVES=$((SATADRIVES + CONPORTS))
+    done
   fi
+
   # SAS Disks
   SASDRIVES=0
   if [ $(lspci -d ::107 2>/dev/null | wc -l) -gt 0 ]; then
     for PCI in $(lspci -d ::107 2>/dev/null | awk '{print $1}'); do
-      NAME=$(lspci -s "${PCI}" | sed "s/\ .*://")
       PORT=$(ls -l /sys/class/scsi_host | grep "${PCI}" | awk -F'/' '{print $NF}' | sed 's/host//' | sort -n 2>/dev/null)
       PORTNUM=$(lsscsi -b | grep -v - | grep "\[${PORT}:" | wc -l)
-      SASDRIVES=$((${SASDRIVES} + ${PORTNUM}))
+      SASDRIVES=$((SASDRIVES + PORTNUM))
     done
   fi
+
   # SCSI Disks
   SCSIDRIVES=0
   if [ $(lspci -d ::100 2>/dev/null | wc -l) -gt 0 ]; then
     for PCI in $(lspci -d ::100 2>/dev/null | awk '{print $1}'); do
-      NAME=$(lspci -s "${PCI}" | sed "s/\ .*://")
-      PORT=$(ls -l /sys/class/scsi_host | grep "${PCI}" | awk -F'/' '{print $NF}' | sed 's/host//' | sort - 2>/dev/null)
+      PORT=$(ls -l /sys/class/scsi_host | grep "${PCI}" | awk -F'/' '{print $NF}' | sed 's/host//' | sort -n 2>/dev/null)
       PORTNUM=$(lsscsi -b | grep -v - | grep "\[${PORT}:" | wc -l)
-      SCSIDRIVES=$((${SCSIDRIVES} + ${PORTNUM}))
+      SCSIDRIVES=$((SCSIDRIVES + PORTNUM))
     done
   fi
+
   # Raid Disks
   RAIDDRIVES=0
   if [ $(lspci -d ::104 2>/dev/null | wc -l) -gt 0 ]; then
     for PCI in $(lspci -d ::104 2>/dev/null | awk '{print $1}'); do
-      NAME=$(lspci -s "${PCI}" | sed "s/\ .*://")
       PORT=$(ls -l /sys/class/scsi_host | grep "${PCI}" | awk -F'/' '{print $NF}' | sed 's/host//' | sort -n 2>/dev/null)
       PORTNUM=$(lsscsi -b | grep -v - | grep "\[${PORT}:" | wc -l)
-      RAIDDRIVES=$((${RAIDDRIVES} + ${PORTNUM}))
+      RAIDDRIVES=$((RAIDDRIVES + PORTNUM))
     done
   fi
+
+  # NVMe Disks
+  NVMEDRIVES=0
+  if [ $(ls -l /sys/class/nvme 2>/dev/null | wc -l) -gt 0 ]; then
+    for PCI in $(lspci -d ::108 2>/dev/null | awk '{print $1}'); do
+      PORTNUM=$(ls -l /sys/class/nvme | grep "${PCI}" | wc -l 2>/dev/null)
+      [ ${PORTNUM} -eq 0 ] && continue
+      NVMEDRIVES=$((NVMEDRIVES + PORTNUM))
+    done
+  fi
+
   # USB Disks
   USBDRIVES=0
   if [ $(ls -l /sys/class/scsi_host 2>/dev/null | grep usb | wc -l) -gt 0 ]; then
     for PCI in $(lspci -d ::c03 2>/dev/null | awk '{print $1}'); do
-      NAME=$(lspci -s "${PCI}" | sed "s/\ .*://")
       PORT=$(ls -l /sys/class/scsi_host | grep "${PCI}" | awk -F'/' '{print $NF}' | sed 's/host//' | sort -n 2>/dev/null)
       PORTNUM=$(lsscsi -b | grep -v - | grep "\[${PORT}:" | wc -l)
       [ ${PORTNUM} -eq 0 ] && continue
-      USBDRIVES=$((${USBDRIVES} + ${PORTNUM}))
+      USBDRIVES=$((USBDRIVES + PORTNUM))
     done
   fi
+
   # MMC Disks
   MMCDRIVES=0
   if [ $(ls -l /sys/block/mmc* 2>/dev/null | wc -l) -gt 0 ]; then
     for PCI in $(lspci -d ::805 | awk '{print $1}'); do
-      NAME=$(lspci -s "${PCI}" 2>/dev/null | sed "s/\ .*://")
       PORTNUM=$(ls -l /sys/block/mmc* | grep "${PCI}" | wc -l 2>/dev/null)
       [ ${PORTNUM} -eq 0 ] && continue
-      MMCDRIVES=$((${MMCDRIVES} + ${PORTNUM}))
-    done
-  fi
-  # NVMe Disks
-  NVMEDRIVES=0
-  if [ $(lspci -d ::108 2>/dev/null | wc -l) -gt 0 ]; then
-    for PCI in $(lspci -d ::108 2>/dev/null | awk '{print $1}'); do
-      NAME=$(lspci -s "${PCI}" | sed "s/\ .*://")
-      PORT=$(ls -l /sys/class/nvme | grep "${PCI}" | awk -F'/' '{print $NF}' | sed 's/nvme//' | sort -n 2>/dev/null)
-      PORTNUM=$(lsscsi -b | grep -v - | grep "\[N:${PORT}:" | wc -l)
-      NVMEDRIVES=$((${NVMEDRIVES} + ${PORTNUM}))
+      MMCDRIVES=$((MMCDRIVES + PORTNUM))
     done
   fi
+
   # Disk Count for MaxDisks
   DRIVES=$((${SATADRIVES} + ${SASDRIVES} + ${SCSIDRIVES} + ${RAIDDRIVES} + ${USBDRIVES} + ${MMCDRIVES} + ${NVMEDRIVES}))
   HARDDRIVES=$((${SATADRIVES} + ${SASDRIVES} + ${SCSIDRIVES} + ${RAIDDRIVES} + ${NVMEDRIVES}))
@@ -116,30 +140,32 @@ function getmap() {
   writeConfigKey "device.nvmedrives" "${NVMEDRIVES}" "${USER_CONFIG_FILE}"
   writeConfigKey "device.drives" "${DRIVES}" "${USER_CONFIG_FILE}"
   writeConfigKey "device.harddrives" "${HARDDRIVES}" "${USER_CONFIG_FILE}"
+
   # Check for Sata Boot
   if [ $(lspci -d ::106 2>/dev/null | wc -l) -gt 0 ]; then
     LASTDRIVE=0
     while read -r D; do
       if [ "${BUS}" = "sata" ] && [ "${MACHINE}" != "Native" ] && [ ${D} -eq 0 ]; then
         MAXDISKS=${DRIVES}
-        echo -n "${D}>${MAXDISKS}:">>"${TMP_PATH}/remap"
-      elif [ ${D} != ${LASTDRIVE} ]; then
-        echo -n "${D}>${LASTDRIVE}:">>"${TMP_PATH}/remap"
-        LASTDRIVE=$((${LASTDRIVE} + 1))
-      elif [ ${D} = ${LASTDRIVE} ]; then
-        LASTDRIVE=$((${D} + 1))
+        echo -n "${D}>${MAXDISKS}:" >>"${TMP_PATH}/remap"
+      elif [ ${D} -ne ${LASTDRIVE} ]; then
+        echo -n "${D}>${LASTDRIVE}:" >>"${TMP_PATH}/remap"
+        LASTDRIVE=$((LASTDRIVE + 1))
+      else
+        LASTDRIVE=$((D + 1))
       fi
-    done < <(cat "${TMP_PATH}/ports")
+    done < "${TMP_PATH}/ports"
   fi
 }
 
 function getmapSelection() {
   # Compute PortMap Options
-  SATAPORTMAPMAX="$(awk '{print $1}' "${TMP_PATH}/drivesmax")"
-  SATAPORTMAP="$(awk '{print $1}' "${TMP_PATH}/drivescon")"
-  SATAREMAP="$(awk '{print $1}' "${TMP_PATH}/remap" | sed 's/.$//')"
-  EXTERNALCONTROLLER="$(readConfigKey "device.externalcontroller" "${USER_CONFIG_FILE}")"
-  ARCMODE="$(readConfigKey "arc.mode" "${USER_CONFIG_FILE}")"
+  SATAPORTMAPMAX=$(awk '{print $1}' "${TMP_PATH}/drivesmax")
+  SATAPORTMAP=$(awk '{print $1}' "${TMP_PATH}/drivescon")
+  SATAREMAP=$(awk '{print $1}' "${TMP_PATH}/remap" | sed 's/.$//')
+  EXTERNALCONTROLLER=$(readConfigKey "device.externalcontroller" "${USER_CONFIG_FILE}")
+  ARCMODE=$(readConfigKey "arc.mode" "${USER_CONFIG_FILE}")
+  
   if [ "${ARCMODE}" = "config" ]; then
     # Show recommended Option to user
     if [ -n "${SATAREMAP}" ] && [ "${EXTERNALCONTROLLER}" = "true" ] && [ "${MACHINE}" = "Native" ]; then
@@ -149,43 +175,7 @@ function getmapSelection() {
     else
       REMAP1="*"
     fi
-    # Ask for Portmap
-    if [ "${STEP}" = "storagemap" ]; then
-      dialog --backtitle "$(backtitlep)" --title "Sata Portmap" \
-        --menu "Choose a Portmap for Sata!?\n* Recommended Option" 8 60 0 \
-        1 "DiskIdxMap: Active Ports ${REMAP1}" \
-        2 "DiskIdxMap: Max Ports ${REMAP2}" \
-        3 "SataRemap: Remove empty Ports ${REMAP3}" \
-        4 "AhciRemap: Remove empty Ports (new) ${REMAP4}" \
-        5 "Set my own Portmap in Config" \
-      2>"${TMP_PATH}/resp"
-      [ $? -ne 0 ] && return 1
-      resp=$(cat "${TMP_PATH}/resp")
-      [ -z "${resp}" ] && return 1
-    else
-        dialog --backtitle "$(backtitle)" --title "Sata Portmap" \
-        --menu "Choose a Portmap for Sata!?\n* Recommended Option" 8 60 0 \
-        1 "DiskIdxMap: Active Ports ${REMAP1}" \
-        2 "DiskIdxMap: Max Ports ${REMAP2}" \
-        3 "SataRemap: Remove empty Ports ${REMAP3}" \
-        4 "AhciRemap: Remove empty Ports (new) ${REMAP4}" \
-        5 "Set my own Portmap in Config" \
-      2>"${TMP_PATH}/resp"
-      [ $? -ne 0 ] && return 1
-      resp=$(cat "${TMP_PATH}/resp")
-      [ -z "${resp}" ] && return 1
-    fi
-    if [ ${resp} -eq 1 ]; then
-      writeConfigKey "arc.remap" "acports" "${USER_CONFIG_FILE}"
-    elif [ ${resp} -eq 2 ]; then
-      writeConfigKey "arc.remap" "maxports" "${USER_CONFIG_FILE}"
-    elif [ ${resp} -eq 3 ]; then
-      writeConfigKey "arc.remap" "remap" "${USER_CONFIG_FILE}"
-    elif [ ${resp} -eq 4 ]; then
-      writeConfigKey "arc.remap" "ahci" "${USER_CONFIG_FILE}"
-    elif [ ${resp} -eq 5 ]; then
-      writeConfigKey "arc.remap" "user" "${USER_CONFIG_FILE}"
-    fi
+    show_and_set_remap
   else
     # Show recommended Option to user
     if [ -n "${SATAREMAP}" ] && [ "${EXTERNALCONTROLLER}" = "true" ] && [ "${MACHINE}" = "Native" ]; then
@@ -198,53 +188,46 @@ function getmapSelection() {
   fi
   # Check Remap for correct config
   REMAP="$(readConfigKey "arc.remap" "${USER_CONFIG_FILE}")"
-  # Write Map to config and show Map to User
-  if [ "${REMAP}" = "acports" ]; then
-    writeConfigKey "cmdline.SataPortMap" "${SATAPORTMAP}" "${USER_CONFIG_FILE}"
-    writeConfigKey "cmdline.DiskIdxMap" "${DISKIDXMAP}" "${USER_CONFIG_FILE}"
-    deleteConfigKey "cmdline.sata_remap" "${USER_CONFIG_FILE}"
-    deleteConfigKey "cmdline.ahci_remap" "${USER_CONFIG_FILE}"
-  elif [ "${REMAP}" = "maxports" ]; then
-    writeConfigKey "cmdline.SataPortMap" "${SATAPORTMAPMAX}" "${USER_CONFIG_FILE}"
-    writeConfigKey "cmdline.DiskIdxMap" "${DISKIDXMAPMAX}" "${USER_CONFIG_FILE}"
-    deleteConfigKey "cmdline.sata_remap" "${USER_CONFIG_FILE}"
-    deleteConfigKey "cmdline.ahci_remap" "${USER_CONFIG_FILE}"
-  elif [ "${REMAP}" = "remap" ]; then
-    writeConfigKey "cmdline.sata_remap" "${SATAREMAP}" "${USER_CONFIG_FILE}"
-    deleteConfigKey "cmdline.DiskIdxMap" "${USER_CONFIG_FILE}"
-    deleteConfigKey "cmdline.SataPortMap" "${USER_CONFIG_FILE}"
-    deleteConfigKey "cmdline.ahci_remap" "${USER_CONFIG_FILE}"
-  elif [ "${REMAP}" = "ahci" ]; then
-    writeConfigKey "cmdline.ahci_remap" "${SATAREMAP}" "${USER_CONFIG_FILE}"
-    deleteConfigKey "cmdline.DiskIdxMap" "${USER_CONFIG_FILE}"
-    deleteConfigKey "cmdline.SataPortMap" "${USER_CONFIG_FILE}"
-    deleteConfigKey "cmdline.sata_remap" "${USER_CONFIG_FILE}"
-  elif [ "${REMAP}" = "user" ]; then
-    deleteConfigKey "cmdline.SataPortMap" "${USER_CONFIG_FILE}"
-    deleteConfigKey "cmdline.DiskIdxMap" "${USER_CONFIG_FILE}"
-    deleteConfigKey "cmdline.sata_remap" "${USER_CONFIG_FILE}"
-    deleteConfigKey "cmdline.ahci_remap" "${USER_CONFIG_FILE}"
-  fi
+  deleteConfigKey "cmdline.SataPortMap" "${USER_CONFIG_FILE}"
+  deleteConfigKey "cmdline.DiskIdxMap" "${USER_CONFIG_FILE}"
+  deleteConfigKey "cmdline.sata_remap" "${USER_CONFIG_FILE}"
+  deleteConfigKey "cmdline.ahci_remap" "${USER_CONFIG_FILE}"
+  
+  case "${REMAP}" in
+    "acports")
+      writeConfigKey "cmdline.SataPortMap" "${SATAPORTMAP}" "${USER_CONFIG_FILE}"
+      writeConfigKey "cmdline.DiskIdxMap" "${DISKIDXMAP}" "${USER_CONFIG_FILE}"
+      ;;
+    "maxports")
+      writeConfigKey "cmdline.SataPortMap" "${SATAPORTMAPMAX}" "${USER_CONFIG_FILE}"
+      writeConfigKey "cmdline.DiskIdxMap" "${DISKIDXMAPMAX}" "${USER_CONFIG_FILE}"
+      ;;
+    "remap")
+      writeConfigKey "cmdline.sata_remap" "${SATAREMAP}" "${USER_CONFIG_FILE}"
+      ;;
+    "ahci")
+      writeConfigKey "cmdline.ahci_remap" "${SATAREMAP}" "${USER_CONFIG_FILE}"
+      ;;
+  esac
+  return
 }
 
 # Check for Controller // 104=RAID // 106=SATA // 107=SAS // 100=SCSI // c03=USB
-SATACONTROLLER=$(lspci -d ::106 2>/dev/null | wc -l)
-writeConfigKey "device.satacontroller" "${SATACONTROLLER}" "${USER_CONFIG_FILE}"
-if [ ${SATACONTROLLER} -gt 0 ]; then
-  writeConfigKey "device.externalcontroller" "false" "${USER_CONFIG_FILE}"
-fi
-SASCONTROLLER=$(lspci -d ::107 2>/dev/null | wc -l)
-writeConfigKey "device.sascontroller" "${SASCONTROLLER}" "${USER_CONFIG_FILE}"
-if [ ${SASCONTROLLER} -gt 0 ]; then
-  writeConfigKey "device.externalcontroller" "true" "${USER_CONFIG_FILE}"
-fi
-SCSICONTROLLER=$(lspci -d ::100 2>/dev/null | wc -l)
-writeConfigKey "device.scsicontroller" "${SCSICONTROLLER}" "${USER_CONFIG_FILE}"
-if [ ${SCSICONTROLLER} -gt 0 ]; then
-  writeConfigKey "device.externalcontroller" "true" "${USER_CONFIG_FILE}"
-fi
-RAIDCONTROLLER=$(lspci -d ::104 2>/dev/null | wc -l)
-writeConfigKey "device.raidcontroller" "${RAIDCONTROLLER}" "${USER_CONFIG_FILE}"
-if [ ${RAIDCONTROLLER} -gt 0 ]; then
-  writeConfigKey "device.externalcontroller" "true" "${USER_CONFIG_FILE}"
-fi
+declare -A controllers=(
+  [satacontroller]=106
+  [sascontroller]=107
+  [scsicontroller]=100
+  [raidcontroller]=104
+)
+
+external_controller=false
+
+for controller in "${!controllers[@]}"; do
+  count=$(lspci -d ::${controllers[$controller]} 2>/dev/null | wc -l)
+  writeConfigKey "device.${controller}" "${count}" "${USER_CONFIG_FILE}"
+  if [ "${controller}" != "satacontroller" ] && [ ${count} -gt 0 ]; then
+    external_controller=true
+  fi
+done
+
+writeConfigKey "device.externalcontroller" "${external_controller}" "${USER_CONFIG_FILE}"

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

@@ -457,9 +457,14 @@ function updateLKMs() {
 function updateOffline() {
   local ARCOFFLINE="$(readConfigKey "arc.offline" "${USER_CONFIG_FILE}")"
   if [ "${ARCOFFLINE}" != "true" ]; then
-    [ -f "${MODEL_CONFIG_PATH}/data.yml" ] && cp -f "${MODEL_CONFIG_PATH}/data.yml" "${MODEL_CONFIG_PATH}/data.yml.bak"
+    [ -f "${MODEL_CONFIG_PATH}/data.yml" ] && cp -f "${MODEL_CONFIG_PATH}/data.yml" "${MODEL_CONFIG_PATH}/data.yml.bak" || true
     curl -skL "https://raw.githubusercontent.com/AuxXxilium/arc-dsm/refs/heads/main/data.yml" -o "${MODEL_CONFIG_PATH}/data.yml"
-    [ ! -f "${MODEL_CONFIG_PATH}/data.yml" ] && cp -f "${MODEL_CONFIG_PATH}/data.yml.bak" "${MODEL_CONFIG_PATH}/data.yml"
+    
+    # Check file size and restore backup if necessary
+    local FILESIZE=$(stat -c%s "${MODEL_CONFIG_PATH}/data.yml")
+    if [ "${FILESIZE}" -lt 3072 ]; then
+      cp -f "${MODEL_CONFIG_PATH}/data.yml.bak" "${MODEL_CONFIG_PATH}/data.yml"
+    fi
   fi
   return 0
 }
@@ -467,34 +472,24 @@ function updateOffline() {
 ###############################################################################
 # Loading Update Mode
 function dependenciesUpdate() {
-  BUILDDONE="$(readConfigKey "arc.builddone" "${USER_CONFIG_FILE}")"
-  FAILED="false"
   dialog --backtitle "$(backtitle)" --title "Update Dependencies" --aspect 18 \
     --infobox "Updating Dependencies..." 3 40
   sleep 2
-  updateAddons
-  [ $? -ne 0 ] && FAILED="true"
-  updateModules
-  [ $? -ne 0 ] && FAILED="true"
-  updateCustom
-  [ $? -ne 0 ] && FAILED="true"
-  updatePatches
-  [ $? -ne 0 ] && FAILED="true"
-  updateLKMs
-  [ $? -ne 0 ] && FAILED="true"
-  updateOffline
-  [ $? -ne 0 ] && FAILED="true"
+
+  FAILED="false"
+  for updateFunction in updateAddons updateModules updateCustom updatePatches updateLKMs updateOffline; do
+    $updateFunction || FAILED="true"
+  done
+
   if [ "${FAILED}" = "true" ]; then
     dialog --backtitle "$(backtitle)" --title "Update Dependencies" --aspect 18 \
       --infobox "Update Dependencies failed! Try again later." 3 40
-    sleep 3
-  elif [ "${FAILED}" = "false" ]; then
+  else
     dialog --backtitle "$(backtitle)" --title "Update Dependencies" --aspect 18 \
       --infobox "Update Dependencies successful!" 3 40
     writeConfigKey "arc.builddone" "false" "${USER_CONFIG_FILE}"
-    BUILDDONE="$(readConfigKey "arc.builddone" "${USER_CONFIG_FILE}")"
-    sleep 3
-    clear
-    exec arc.sh
   fi
+  sleep 3
+  clear
+  exec arc.sh
 }

files/initrd/opt/arc/informations/apollolake.yml

@@ -24,6 +24,6 @@ As external: yes
 Community Package required *
 
 - NVMe
-Cache: yes (sometimes addon required)
-Storage: Addon required
+Cache: yes
+Storage: no
 System (NVMe only): no

files/initrd/opt/arc/informations/broadwell.yml

@@ -24,6 +24,6 @@ Unsupported
 Community Package required *
 
 - NVMe
-Cache: yes (sometimes addon required)
-Storage: Addon required
+Cache: yes
+Storage: no
 System (NVMe only): no

files/initrd/opt/arc/informations/broadwellnk.yml

@@ -24,6 +24,6 @@ Unsupported
 Community Package required *
 
 - NVMe
-Cache: yes (sometimes addon required)
-Storage: Addon required
+Cache: yes
+Storage: no
 System (NVMe only): no

files/initrd/opt/arc/informations/denverton.yml

@@ -26,6 +26,6 @@ Partially natively supported
 Community Package required *
 
 - NVMe
-Cache: yes (sometimes addon required)
-Storage: Addon required
+Cache: yes
+Storage: no
 System (NVMe only): no

files/initrd/opt/arc/init.sh

@@ -221,7 +221,7 @@ touch "${HOME}/.initialized"
 # Load Arc Overlay
 echo -e "\033[1;34mLoading Arc Overlay...\033[0m"
 echo
-echo -e "Use \033[1;34mDisplay Output\033[0m or \033[1;34mhttp://${IPCON}:${TTYDPORT:-7681}\033[0m to configure Loader."
+echo -e "Use \033[1;34mDisplay Output\033[0m or \033[1;34mhttp://${IPCON}${HTTPPORT:+:$HTTPPORT}\033[0m to configure Loader."
 
 # Check memory and load Arc
 RAM=$(awk '/MemTotal:/ {printf "%.0f", $2 / 1024}' /proc/meminfo 2>/dev/null)

files/initrd/opt/arc/ramdisk-patch.sh

@@ -43,46 +43,50 @@ ARCBRANCH="$(readConfigKey "arc.branch" "${USER_CONFIG_FILE}")"
 PAT_URL="$(readConfigKey "paturl" "${USER_CONFIG_FILE}")"
 PAT_HASH="$(readConfigKey "pathash" "${USER_CONFIG_FILE}")"
 
-[ "${PATURL:0:1}" = "#" ] && PATURL=""
-[ "${PATSUM:0:1}" = "#" ] && PATSUM=""
-
 # Check if DSM Version changed
 . "${RAMDISK_PATH}/etc/VERSION"
 
-if [[ -n "${PRODUCTVER}" && -n "${BUILDNUM}" && -n "${SMALLNUM}" ]] &&
-  ([ "${PRODUCTVER}" != "${majorversion}.${minorversion}" ] || [ "${BUILDNUM}" != "${buildnumber}" ] || [ "${SMALLNUM}" != "${smallfixnumber}" ]); then
-  OLDVER="${PRODUCTVER}(${BUILDNUM}$([ ${SMALLNUM:-0} -ne 0 ] && echo "u${SMALLNUM}"))"
-  NEWVER="${majorversion}.${minorversion}(${buildnumber}$([ ${smallfixnumber:-0} -ne 0 ] && echo "u${smallfixnumber}"))"
+if [[ -n "${BUILDNUM}" && ("${PRODUCTVER}" != "${majorversion}.${minorversion}" || "${BUILDNUM}" != "${buildnumber}" || "${SMALLNUM}" != "${smallfixnumber}") ]]; then
+  OLDVER="${PRODUCTVER}(${BUILDNUM}$([[ ${SMALLNUM:-0} -ne 0 ]] && echo "u${SMALLNUM}"))"
+  NEWVER="${majorversion}.${minorversion}(${buildnumber}$([[ ${smallfixnumber:-0} -ne 0 ]] && echo "u${smallfixnumber}"))"
   PAT_URL=""
   PAT_HASH=""
+  echo "\nVersion changed from ${OLDVER} to ${NEWVER}"
 fi
-PRODUCTVER=${majorversion}.${minorversion}
-BUILDNUM=${buildnumber}
-SMALLNUM=${smallfixnumber}
+
+# Re-read PAT_URL and PAT_HASH if they are empty or commented out
+if [[ -z "${PAT_URL}" || "${PAT_URL:0:1}" == "#" ]]; then
+  PAT_URL="$(readConfigKey "${PLATFORM}.\"${MODEL}\".\"${majorversion}.${minorversion}\".url" "${D_FILE}")"
+fi
+if [[ -z "${PAT_HASH}" || "${PAT_HASH:0:1}" == "#" ]]; then
+  PAT_HASH="$(readConfigKey "${PLATFORM}.\"${MODEL}\".\"${majorversion}.${minorversion}\".hash" "${D_FILE}")"
+fi
+
+PRODUCTVER="${majorversion}.${minorversion}"
+BUILDNUM="${buildnumber}"
+SMALLNUM="${smallfixnumber}"
+
 writeConfigKey "productver" "${PRODUCTVER}" "${USER_CONFIG_FILE}"
 writeConfigKey "buildnum" "${BUILDNUM}" "${USER_CONFIG_FILE}"
 writeConfigKey "smallnum" "${SMALLNUM}" "${USER_CONFIG_FILE}"
 
 # Read model data
 KVER="$(readConfigKey "platforms.${PLATFORM}.productvers.\"${PRODUCTVER}\".kver" "${P_FILE}")"
-
-# Modify KVER for Epyc7002
 [ "${PLATFORM}" = "epyc7002" ] && KVERP="${PRODUCTVER}-${KVER}" || KVERP="${KVER}"
 
 # Sanity check
 if [ -z "${PLATFORM}" ] || [ -z "${KVER}" ]; then
-  echo "ERROR: Configuration for model ${MODEL} and productversion ${PRODUCTVER} not found." >"${LOG_FILE}"
+  echo "ERROR: Configuration for Model ${MODEL} and Version ${PRODUCTVER} not found." >"${LOG_FILE}"
   exit 1
 fi
 
-declare -A SYNOINFO
-declare -A ADDONS
-declare -A MODULES
-
 # Read synoinfo and addons from config
+declare -A SYNOINFO ADDONS MODULES
+
 while IFS=': ' read -r KEY VALUE; do
   [ -n "${KEY}" ] && SYNOINFO["${KEY}"]="${VALUE}"
 done < <(readConfigMap "synoinfo" "${USER_CONFIG_FILE}")
+
 while IFS=': ' read -r KEY VALUE; do
   [ -n "${KEY}" ] && ADDONS["${KEY}"]="${VALUE}"
 done < <(readConfigMap "addons" "${USER_CONFIG_FILE}")
@@ -93,35 +97,24 @@ while IFS=': ' read -r KEY VALUE; do
 done < <(readConfigMap "modules" "${USER_CONFIG_FILE}")
 
 # Patches (diff -Naru OLDFILE NEWFILE > xxx.patch)
-PATCHS=(
+PATCHES=(
   "ramdisk-etc-rc-*.patch"
   "ramdisk-init-script-*.patch"
   "ramdisk-post-init-script-*.patch"
   "ramdisk-disable-root-pwd-*.patch"
   "ramdisk-disable-disabled-ports-*.patch"
 )
-for PE in "${PATCHS[@]}"; do
-  RET=1
-  echo "Patching with ${PE}" >"${LOG_FILE}"
-  # ${PE} contains *, so double quotes cannot be added
-  for PF in $(ls ${PATCH_PATH}/${PE} 2>/dev/null); do
-    echo "Patching with ${PF}" >>"${LOG_FILE}"
-    # busybox patch and gun patch have different processing methods and parameters.
-    (cd "${RAMDISK_PATH}" && busybox patch -p1 -i "${PF}") >>"${LOG_FILE}" 2>&1
-    RET=$?
-    [ ${RET} -eq 0 ] && break
-  done
-  [ ${RET} -ne 0 ] && exit 1
-done
 
-# Add serial number to synoinfo.conf, to help to recovery a installed DSM
-echo "Set synoinfo SN" >"${LOG_FILE}"
-_set_conf_kv "SN" "${SN}" "${RAMDISK_PATH}/etc/synoinfo.conf" >>"${LOG_FILE}" 2>&1 || exit 1
-_set_conf_kv "SN" "${SN}" "${RAMDISK_PATH}/etc.defaults/synoinfo.conf" >>"${LOG_FILE}" 2>&1 || exit 1
-for KEY in ${!SYNOINFO[@]}; do
-  echo "Set synoinfo ${KEY}" >>"${LOG_FILE}"
-  _set_conf_kv "${KEY}" "${SYNOINFO[${KEY}]}" "${RAMDISK_PATH}/etc/synoinfo.conf" >>"${LOG_FILE}" 2>&1 || exit 1
-  _set_conf_kv "${KEY}" "${SYNOINFO[${KEY}]}" "${RAMDISK_PATH}/etc.defaults/synoinfo.conf" >>"${LOG_FILE}" 2>&1 || exit 1
+for PATCH in "${PATCHES[@]}"; do
+  echo "Patching with ${PATCH}" >>"${LOG_FILE}"
+  for PF in ${PATCH_PATH}/${PATCH}; do
+    [ -e "${PF}" ] || continue
+    echo "Applying patch ${PF}" >>"${LOG_FILE}"
+    if ! (cd "${RAMDISK_PATH}" && busybox patch -p1 -i "${PF}") >>"${LOG_FILE}" 2>&1; then
+      echo "Failed to apply patch ${FILE}" >>"${LOG_FILE}"
+      continue
+    fi
+  done
 done
 
 # Patch /sbin/init.post
@@ -163,7 +156,7 @@ mkdir -p "${RAMDISK_PATH}/addons"
   echo "export PLATFORM=\"${PLATFORM}\""
   echo "export MODEL=\"${MODEL}\""
   echo "export MODELID=\"${MODELID}\""
-  echo "export PRODUCTVER=\"${PRODUCTVER}\""
+  echo "export PRODUCTVERL=\"${PRODUCTVERL}\""
   echo "export MLINK=\"${PAT_URL}\""
   echo "export MCHECKSUM=\"${PAT_HASH}\""
   echo "export LAYOUT=\"${LAYOUT:-qwerty}\""
@@ -172,7 +165,7 @@ mkdir -p "${RAMDISK_PATH}/addons"
 chmod +x "${RAMDISK_PATH}/addons/addons.sh"
 
 # System Addons
-for ADDON in "redpill" "revert" "misc" "eudev" "disks" "localrss" "notify" "wol" "mountloader"; do
+for ADDON in redpill revert misc eudev disks localrss notify wol mountloader; do
   PARAMS=""
   if [ "${ADDON}" = "disks" ]; then
     HDDSORT="$(readConfigKey "hddsort" "${USER_CONFIG_FILE}")"
@@ -184,8 +177,8 @@ for ADDON in "redpill" "revert" "misc" "eudev" "disks" "localrss" "notify" "wol"
 done
 
 # User Addons
-for ADDON in ${!ADDONS[@]}; do
-  PARAMS=${ADDONS[${ADDON}]}
+for ADDON in "${!ADDONS[@]}"; do
+  PARAMS="${ADDONS[${ADDON}]}"
   installAddon "${ADDON}" "${PLATFORM}" || echo "Addon ${ADDON} not found"
   echo "/addons/${ADDON}.sh \${1} ${PARAMS}" >>"${RAMDISK_PATH}/addons/addons.sh" 2>>"${LOG_FILE}" || exit 1
 done
@@ -195,7 +188,7 @@ echo "inetd" >>"${RAMDISK_PATH}/addons/addons.sh"
 
 echo "Modify files" >"${LOG_FILE}"
 # Remove function from scripts
-[ "2" = "${PRODUCTVER:0:1}" ] && sed -i 's/function //g' $(find "${RAMDISK_PATH}/addons/" -type f -name "*.sh")
+[ "2" = "${PRODUCTVER:2:1}" ] && sed -i 's/function //g' $(find "${RAMDISK_PATH}/addons/" -type f -name "*.sh")
 
 # Build modules dependencies
 # ${ARC_PATH}/depmod -a -b ${RAMDISK_PATH} 2>/dev/null
@@ -210,7 +203,7 @@ fi
 # backup current loader configs
 BACKUP_PATH="${RAMDISK_PATH}/usr/arc/backup"
 rm -rf "${BACKUP_PATH}"
-for F in "${USER_GRUB_CONFIG}" "${USER_CONFIG_FILE}" "${USER_UP_PATH}"; do
+for F in "${USER_GRUB_CONFIG}" "${USER_CONFIG_FILE}" "${USER_UP_PATH}" "${HW_KEY}"; do
   if [ -f "${F}" ]; then
     FD="$(dirname "${F}")"
     mkdir -p "${FD/\/mnt/${BACKUP_PATH}}"

files/p1/ARC-VERSION

@@ -1 +0,0 @@
-23.1.1

files/p1/boot/grub/grub.cfg

@@ -1,44 +1,66 @@
-set default="boot"
+
 set timeout="5"
 set timeout_style="menu"
-set vesa_mode=1
-set menu_color_normal=white/black
-set menu_color_highlight=white/red
-set color_normal=white/black
 
 if [ -s ${prefix}/grubenv ]; then
   load_env --skip-sig
 fi
+
 if [ "${next_entry}" ]; then
   set default="${next_entry}"
   unset next_entry
   save_env next_entry
-fi
-if [ "${vesa_mode}" ]; then
-  set vesa_mode=${vesa_mode}
-fi
-
-terminal_input console
-terminal_output console
-
-if [ "${feature_all_video_module}" = "y" ]; then
-  insmod all_video
 else
-  insmod efi_gop
-  insmod efi_uga
-  insmod vbe
-  insmod vga
-  insmod video_bochs
-  insmod video_cirrus
+  set default="boot"
 fi
 
-if loadfont unicode; then
+if [ "${linux_gfx_mode}" ]; then
+  save_env linux_gfx_mode
+else
+  set linux_gfx_mode=keep
+  save_env linux_gfx_mode
+fi
+
+if [ x"${feature_menuentry_id}" = xy ]; then
+  menuentry_id_option="--id"
+else
+  menuentry_id_option=""
+fi
+
+export menuentry_id_option
+
+function load_video {
+  if [ x"${feature_all_video_module}" = xy ]; then
+    insmod all_video
+  else
+    insmod efi_gop
+    insmod efi_uga
+    insmod ieee1275_fb
+    insmod vbe
+    insmod vga
+    insmod video_bochs
+    insmod video_cirrus
+  fi
+}
+
+set menu_color_normal=white/black
+set menu_color_highlight=white/red
+set color_normal=white/black
+
+if [ x"${feature_default_font_path}" = xy ]; then
+  font=unicode
+else
+  font=${prefix}/fonts/unicode.pf2
+fi
+
+if loadfont ${font}; then
   if [ "${grub_platform}" = "efi" ]; then
     set gfxmode=auto
   else
     set gfxmode=1024x768
   fi
-  terminal_output gfxterm
+  load_video
+  insmod gfxterm
   insmod gfxmenu
   loadfont ${prefix}/theme/dejavu_bold_14.pf2
   loadfont ${prefix}/theme/dejavu_mono_12.pf2
@@ -47,17 +69,20 @@ if loadfont unicode; then
   export theme
 fi
 
+terminal_output gfxterm
+
 if serial --unit=0 --speed=115200 --word=8 --parity=no --stop=1; then
   terminal_input --append serial
   terminal_output --append serial
 fi
 
-function set_gfxpayload {
-  if [ ${vesa_mode} -eq 1 ]; then
-    set gfxpayload=keep
-  else
-    set gfxpayload=text
-  fi
+function gfxmode {
+	set gfxpayload="${linux_gfx_mode}"
+	if [ "${linux_gfx_mode}" = "keep" ]; then
+		set vt_handoff=vt.handoff=7
+	else
+		set vt_handoff=
+	fi
 }
 
 set ARC_CMDLINE="earlyprintk earlycon=uart8250,io,0x3f8,115200n8 console=ttyS0,115200n8 root=/dev/ram rootwait intremap=off amd_iommu_intr=legacy net.ifnames=0 panic=5 split_lock_detect=off pcie_aspm=off intel_pstate=disable amd_pstate=disable nox2apic nomodeset"
@@ -66,8 +91,8 @@ search --set=root --label "ARC3"
 if [ -s /zImage-dsm -a -s /initrd-dsm ]; then
   if [ "${default}" = "direct" ]; then
     set timeout="1"
-    menuentry 'DSM Direct Mode' --id direct {
-      set_gfxpayload
+    menuentry 'DSM Direct Mode' ${menuentry_id_option} direct {
+      gfxmode
       echo "Loading DSM Kernel..."
       linux /zImage-dsm ${dsm_cmdline}
       echo "Loading DSM Initramfs..."
@@ -76,8 +101,8 @@ if [ -s /zImage-dsm -a -s /initrd-dsm ]; then
       echo "Access http://find.synology.com/ to connect the DSM via web."
     }
   fi
-  menuentry 'Arc DSM Mode' --id boot {
-    set_gfxpayload
+  menuentry 'Arc DSM Mode' ${menuentry_id_option} boot {
+    gfxmode
     echo "Loading Arc Kernel..."
     linux /bzImage-arc ${ARC_CMDLINE} ${arc_cmdline}
     echo "Loading Arc Initramfs..."
@@ -91,8 +116,8 @@ if [ -s /zImage-dsm -a -s /initrd-dsm ]; then
 fi
 
 if [ -e /automated ]; then
-  menuentry 'Arc Automated Mode' --id automated {
-    set_gfxpayload
+  menuentry 'Arc Automated Mode' ${menuentry_id_option} automated {
+    gfxmode
     echo "Loading Arc Kernel..."
     linux /bzImage-arc ${ARC_CMDLINE} ${arc_cmdline} automated_arc
     echo "Loading Arc Initramfs..."
@@ -105,8 +130,8 @@ if [ -e /automated ]; then
   }
 fi
 
-menuentry 'Arc Config Mode' --id config {
-  set_gfxpayload
+menuentry 'Arc Config Mode' ${menuentry_id_option} config {
+  gfxmode
   echo "Loading Arc Kernel..."
   linux /bzImage-arc ${ARC_CMDLINE} ${arc_cmdline} force_arc
   echo "Loading Arc Initramfs..."
@@ -119,8 +144,8 @@ menuentry 'Arc Config Mode' --id config {
 }
 
 if [ -s /zImage-dsm -a -s /initrd-dsm ]; then
-  menuentry 'Arc Update Mode' --id update {
-    set_gfxpayload
+  menuentry 'Arc Update Mode' ${menuentry_id_option} update {
+    gfxmode
     echo "Loading Arc Kernel..."
     linux /bzImage-arc ${ARC_CMDLINE} ${arc_cmdline} update_arc
     echo "Loading Arc Initramfs..."
@@ -131,8 +156,8 @@ if [ -s /zImage-dsm -a -s /initrd-dsm ]; then
     fi
     echo "Booting..."
   }
-  menuentry 'DSM Recovery Mode' --id recovery {
-    set_gfxpayload
+  menuentry 'DSM Recovery Mode' ${menuentry_id_option} recovery {
+    gfxmode
     echo "Loading Arc Kernel..."
     linux /bzImage-arc ${ARC_CMDLINE} ${arc_cmdline} recovery
     echo "Loading Arc Initramfs..."
@@ -143,8 +168,8 @@ if [ -s /zImage-dsm -a -s /initrd-dsm ]; then
     fi
     echo "Booting..."
   }
-  menuentry 'DSM Reinstall Mode' --id junior {
-    set_gfxpayload
+  menuentry 'DSM Reinstall Mode' ${menuentry_id_option} junior {
+    gfxmode
     echo "Loading Arc Kernel..."
     linux /bzImage-arc ${ARC_CMDLINE} ${arc_cmdline} force_junior
     echo "Loading Arc Initramfs..."
@@ -157,31 +182,30 @@ if [ -s /zImage-dsm -a -s /initrd-dsm ]; then
   }
 fi
 
-menuentry 'Enter BIOS Setup' --id bios  {
+menuentry 'System UEFI Setup' ${menuentry_id_option} uefi {
   fwsetup
 }
 
-menuentry 'Start Memtest86+' --id memtest {
+menuentry 'System Memtest86+' ${menuentry_id_option} memtest {
   echo "Loading memtest86+..."
   linux ${prefix}/memtest 
 }
 
-menuentry 'Poweroff' --id poweroff {
+menuentry 'System Poweroff' ${menuentry_id_option} poweroff {
   echo "System is powering off..."
   halt
 }
 
-if [ ${vesa_mode} = 1 ]; then
-  menuentry 'Change Vesa to Text Output' --id videomode {
-    set vesa_mode=0
-    save_env vesa_mode
+if [ "${linux_gfx_mode}" = "keep" ]; then
+  menuentry 'Change vesa to text video mode' ${menuentry_id_option} videomode {
+    set linux_gfx_mode=text
+    save_env linux_gfx_mode
     configfile ${prefix}/grub.cfg
   }
 else
-  menuentry 'Change Text to Vesa Output' --id videomode {
-    set vesa_mode=1
-    save_env vesa_mode
-    reboot
+  menuentry 'Change text to vesa video mode' ${menuentry_id_option} videomode {
+    set linux_gfx_mode=keep
+    save_env linux_gfx_mode
     configfile ${prefix}/grub.cfg
   }
 fi

img-ext.sh

@@ -1,82 +0,0 @@
-#!/usr/bin/env bash
-#
-# Copyright (C) 2025 AuxXxilium <https://github.com/AuxXxilium>
-#
-# This is free software, licensed under the MIT License.
-# See /LICENSE for more information.
-#
-
-set -e
-
-# Clean cached Files
-sudo git clean -fdx
-
-. scripts/func.sh "${AUX_TOKEN}"
-
-# Unmount Image File
-sudo umount "/tmp/p1" 2>/dev/null || true
-sudo umount "/tmp/p3" 2>/dev/null || true
-
-# Get extractor, LKM, addons and Modules
-echo "Get Dependencies"
-getAddons "files/p3/addons"
-getModules "files/p3/modules"
-getConfigs "files/p3/configs"
-getPatches "files/p3/patches"
-getCustom "files/p3/custom"
-getLKMs "files/p3/lkms"
-getTheme "files/p1/boot/grub"
-getOffline "files/p3/configs"
-mkdir -p "brx"
-[ ! -f "../brx/bzImage" ] && getBuildrootx "brx" || copyBuildroot "brx"
-
-# Sbase
-IMAGE_FILE="arc_create.img"
-gzip -dc "grub.img.gz" >"${IMAGE_FILE}"
-fdisk -l "${IMAGE_FILE}"
-
-LOOPX=$(sudo losetup -f)
-sudo losetup -P "${LOOPX}" "${IMAGE_FILE}"
-
-echo "Mounting Image File"
-sudo rm -rf "/tmp/p1"
-sudo rm -rf "/tmp/p3"
-mkdir -p "/tmp/p1"
-mkdir -p "/tmp/p3"
-sudo mount ${LOOPX}p1 "/tmp/p1"
-sudo mount ${LOOPX}p3 "/tmp/p3"
-
-ARC_BUILD="`date +'%y%m%d'`"
-ARC_VERSION="13.3.7"
-ARC_BRANCH="extended"
-echo "${ARC_BUILD}" >files/p1/ARC-BUILD
-echo "${ARC_VERSION}" >files/p1/ARC-VERSION
-echo "${ARC_BRANCH}" >files/p1/ARC-BRANCH
-
-echo "Repack initrd"
-if [ -f "brx/bzImage-arc" ] && [ -f "brx/initrd-arc" ]; then
-    cp -f "brx/bzImage-arc" "files/p3/bzImage-arc"
-    repackInitrd "brx/initrd-arc" "files/initrd" "files/p3/initrd-arc"
-else
-    exit 1
-fi
-
-echo "Copying files"
-sudo cp -rf "files/p1/"* "/tmp/p1"
-sudo cp -rf "files/p3/"* "/tmp/p3"
-sync
-
-echo "Unmount image file"
-sudo umount "/tmp/p1"
-sudo umount "/tmp/p3"
-sudo rm -rf "/tmp/p1"
-sudo rm -rf "/tmp/p3"
-
-sudo losetup --detach ${LOOPX}
-
-# Resize Image
-resizeImg "${IMAGE_FILE}" "+1024M" "arc.img" 2>/dev/null
-rm -f "${IMAGE_FILE}"
-
-IMAGE_FILE="arc.img"
-qemu-img convert -p -f raw -o subformat=monolithicFlat -O vmdk ${IMAGE_FILE} arc.vmdk

img-gen.sh

@@ -27,11 +27,14 @@ getCustom "files/p3/custom"
 getLKMs "files/p3/lkms"
 getTheme "files/p1/boot/grub"
 getOffline "files/p3/configs"
-[ -f "../brs/bzImage" ] && copyBuildroot "brs" || getBuildroots "brs"
+case "${1}" in
+  evo) getBuildroot "${1}" "br" ;;
+  *) echo "Invalid option specified" ;;
+esac
 
 # Sbase
-IMAGE_FILE="arc_create.img"
-gzip -dc "grub.img.gz" >"${IMAGE_FILE}"
+IMAGE_FILE="arc.img"
+gzip -dc "files/initrd/opt/arc/grub.img.gz" >"${IMAGE_FILE}"
 fdisk -l "${IMAGE_FILE}"
 
 LOOPX=$(sudo losetup -f)
@@ -45,17 +48,17 @@ mkdir -p "/tmp/p3"
 sudo mount ${LOOPX}p1 "/tmp/p1"
 sudo mount ${LOOPX}p3 "/tmp/p3"
 
-ARC_BUILD="`date +'%y%m%d'`"
+ARC_BUILD="$(date +'%y%m%d')"
 ARC_VERSION="13.3.7"
-ARC_BRANCH="minimal"
-echo "${ARC_BUILD}" >files/p1/ARC-BUILD
-echo "${ARC_VERSION}" >files/p1/ARC-VERSION
-echo "${ARC_BRANCH}" >files/p1/ARC-BRANCH
+ARC_BRANCH="dev"
+echo "${ARC_VERSION}" >"files/p1/ARC-VERSION"
+echo "${ARC_BUILD}" >"files/p1/ARC-BUILD"
+echo "${ARC_BRANCH}" >"files/p1/ARC-BRANCH"
 
 echo "Repack initrd"
-if [ -f "brs/bzImage-arc" ] && [ -f "brs/initrd-arc" ]; then
-    cp -f "brs/bzImage-arc" "files/p3/bzImage-arc"
-    repackInitrd "brs/initrd-arc" "files/initrd" "files/p3/initrd-arc"
+if [ -f "br/bzImage-arc" ] && [ -f "br/initrd-arc" ]; then
+    cp -f "br/bzImage-arc" "files/p3/bzImage-arc"
+    repackInitrd "br/initrd-arc" "files/initrd" "files/p3/initrd-arc"
 else
     exit 1
 fi
@@ -73,9 +76,4 @@ sudo rm -rf "/tmp/p3"
 
 sudo losetup --detach ${LOOPX}
 
-# Resize Image
-resizeImg "${IMAGE_FILE}" "+1024M" "arc.img" 2>/dev/null
-rm -f "${IMAGE_FILE}"
-
-IMAGE_FILE="arc.img"
 qemu-img convert -p -f raw -o subformat=monolithicFlat -O vmdk ${IMAGE_FILE} arc.vmdk

scripts/func.sh

@@ -185,50 +185,33 @@ function getTheme() {
   done < <(curl -skL -H "Authorization: token ${TOKEN}" "https://api.github.com/repos/AuxXxilium/arc-theme/releases/tags/${TAG}" | jq -r '.assets[] | "\(.id) \(.name)"')
 }
 
-# Get latest Buildroot-X
-# $1 path
-function getBuildrootx() {
-  echo "Getting Buildroot-X begin"
-  local DEST_PATH="${1}"
+# Get latest Buildroot
+# $1 type (min for S, ext for X, micro for M)
+# $2 path
+function getBuildroot() {
+  local TYPE="${1}"
+  local DEST_PATH="${2}"
+  local REPO=""
+  local ZIP_NAME=""
+  local TAG_VAR=""
+  local REPO="arc-buildroot-${TYPE}"
 
-  TAG=$(curl -skL -H "Authorization: token ${TOKEN}" "https://api.github.com/repos/AuxXxilium/arc-buildroot-x/releases" | jq -r ".[].tag_name" | sort -rV | head -1)
-  export BRXTAG="${TAG}"
+  echo "Getting Buildroot-${TYPE} begin"
+  TAG=$(curl -skL -H "Authorization: token ${TOKEN}" "https://api.github.com/repos/AuxXxilium/${REPO}/releases" | jq -r ".[].tag_name" | sort -rV | head -1)
+  export BRTAG="${TAG}-${TYPE}"
   [ ! -d "${DEST_PATH}" ] && mkdir -p "${DEST_PATH}"
   rm -f "${DEST_PATH}/bzImage-arc"
   rm -f "${DEST_PATH}/initrd-arc"
   while read -r ID NAME; do
     if [ "${NAME}" = "buildroot-${TAG}.zip" ]; then
-      curl -kL -H "Authorization: token ${TOKEN}" -H "Accept: application/octet-stream" "https://api.github.com/repos/AuxXxilium/arc-buildroot-x/releases/assets/${ID}" -o "${DEST_PATH}/brx.zip"
-      echo "Buildroot-X: ${TAG}"
-      unzip -o "${DEST_PATH}/brx.zip" -d "${DEST_PATH}"
+      curl -kL -H "Authorization: token ${TOKEN}" -H "Accept: application/octet-stream" "https://api.github.com/repos/AuxXxilium/${REPO}/releases/assets/${ID}" -o "${DEST_PATH}/br.zip"
+      echo "Buildroot: ${TAG}-${TYPE}"
+      unzip -o "${DEST_PATH}/br.zip" -d "${DEST_PATH}"
       mv -f "${DEST_PATH}/bzImage" "${DEST_PATH}/bzImage-arc"
       mv -f "${DEST_PATH}/rootfs.cpio.zst" "${DEST_PATH}/initrd-arc"
       [ -f "${DEST_PATH}/bzImage-arc" ] && [ -f "${DEST_PATH}/initrd-arc" ] && break
     fi
-  done < <(curl -skL -H "Authorization: token ${TOKEN}" "https://api.github.com/repos/AuxXxilium/arc-buildroot-x/releases/tags/${TAG}" | jq -r '.assets[] | "\(.id) \(.name)"')
-}
-
-# Get latest Buildroot-S
-# $1 path
-function getBuildroots() {
-  echo "Getting Buildroot-S begin"
-  local DEST_PATH="${1}"
-
-  TAG=$(curl -skL -H "Authorization: token ${TOKEN}" "https://api.github.com/repos/AuxXxilium/arc-buildroot-s/releases" | jq -r ".[].tag_name" | sort -rV | head -1)
-  export BRSTAG="${TAG}"
-  [ ! -d "${DEST_PATH}" ] && mkdir -p "${DEST_PATH}"
-  rm -f "${DEST_PATH}/bzImage-arc"
-  rm -f "${DEST_PATH}/initrd-arc"
-  while read -r ID NAME; do
-    if [ "${NAME}" = "buildroot-${TAG}.zip" ]; then
-      curl -kL -H "Authorization: token ${TOKEN}" -H "Accept: application/octet-stream" "https://api.github.com/repos/AuxXxilium/arc-buildroot-s/releases/assets/${ID}" -o "${DEST_PATH}/brs.zip"
-      echo "Buildroot-S: ${TAG}"
-      unzip -o "${DEST_PATH}/brs.zip" -d "${DEST_PATH}"
-      mv -f "${DEST_PATH}/bzImage" "${DEST_PATH}/bzImage-arc"
-      mv -f "${DEST_PATH}/rootfs.cpio.zst" "${DEST_PATH}/initrd-arc"
-      [ -f "${DEST_PATH}/bzImage-arc" ] && [ -f "${DEST_PATH}/initrd-arc" ] && break
-    fi
-  done < <(curl -skL -H "Authorization: token ${TOKEN}" "https://api.github.com/repos/AuxXxilium/arc-buildroot-s/releases/tags/${TAG}" | jq -r '.assets[] | "\(.id) \(.name)"')
+  done < <(curl -skL -H "Authorization: token ${TOKEN}" "https://api.github.com/repos/AuxXxilium/${REPO}/releases/tags/${TAG}" | jq -r '.assets[] | "\(.id) \(.name)"')
 }
 
 # Get latest Offline
@@ -294,36 +277,46 @@ function repackInitrd() {
   sudo rm -rf "${RDXZ_PATH}"
 }
 
-# resizeimg
+# resizeImg
 # $1 input file  
-# $2 changsize MB eg: +50M -50M
+# $2 change size MB e.g., +50M -50M
 # $3 output file
 function resizeImg() {
-  INPUT_FILE="${1}"
-  CHANGE_SIZE="${2}"
-  OUTPUT_FILE="${3:-${INPUT_FILE}}"
+  local INPUT_FILE="${1}"
+  local CHANGE_SIZE="${2}"
+  local OUTPUT_FILE="${3:-${INPUT_FILE}}"
 
-  [[ -z "${INPUT_FILE}" || ! -f "${INPUT_FILE}" ]] && exit 1
-  [ -z "${CHANGE_SIZE}" ] && exit 1
+  [[ -z "${INPUT_FILE}" || ! -f "${INPUT_FILE}" ]] && { echo "Input file not specified or does not exist"; exit 1; }
+  [[ -z "${CHANGE_SIZE}" ]] && { echo "Change size not specified"; exit 1; }
 
   INPUT_FILE="$(realpath "${INPUT_FILE}")"
   OUTPUT_FILE="$(realpath "${OUTPUT_FILE}")"
 
+  local CURRENT_SIZE
+  CURRENT_SIZE=$(du -m "${INPUT_FILE}" | awk '{print $1}')
+  local SIZE
+  SIZE=$((CURRENT_SIZE + ${CHANGE_SIZE//M/}))
 
-  SIZE=$(($(du -m "${INPUT_FILE}" | awk '{print $1}')$(echo "${CHANGE_SIZE}" | sed 's/M//g; s/b//g')))
-  [[ -z "${SIZE}" || "${SIZE}" -lt 0 ]] && exit 1
+  [[ -z "${SIZE}" || "${SIZE}" -lt 0 ]] && { echo "Invalid size calculated"; exit 1; }
 
-  if [ ! "${INPUT_FILE}" = "${OUTPUT_FILE}" ]; then
+  if [[ "${INPUT_FILE}" != "${OUTPUT_FILE}" ]]; then
     sudo cp -f "${INPUT_FILE}" "${OUTPUT_FILE}"
   fi
 
-  sudo truncate -s ${SIZE}M "${OUTPUT_FILE}"
-  echo -e "d\n\nn\n\n\n\n\nn\nw" | sudo fdisk "${OUTPUT_FILE}"
+  sudo truncate -s "${SIZE}M" "${OUTPUT_FILE}"
+
+  # Use `parted` to resize partition 3
+  sudo parted "${OUTPUT_FILE}" --script -- resizepart 3 "${SIZE}M"
+
+  local LOOPX
   LOOPX=$(sudo losetup -f)
-  sudo losetup -P ${LOOPX} "${OUTPUT_FILE}"
-  sudo e2fsck -fp $(ls ${LOOPX}* | sort -n | tail -1)
-  sudo resize2fs $(ls ${LOOPX}* | sort -n | tail -1)
-  sudo losetup -d ${LOOPX}
+  sudo losetup -P "${LOOPX}" "${OUTPUT_FILE}"
+  local PARTITION
+  PARTITION=$(ls "${LOOPX}p3")
+  sudo e2fsck -fp "${PARTITION}"
+  sudo tune2fs -l "${PARTITION}" | grep "Block size"
+  sudo resize2fs "${PARTITION}"
+  sudo losetup -d "${LOOPX}"
 }
 
 # createvmx
@@ -499,4 +492,4 @@ function copyBuildroot() {
   mkdir -p "${DEST_PATH}"
   cp -f "../${DEST_PATH}/bzImage" "${DEST_PATH}/bzImage-arc"
   cp -f "../${DEST_PATH}/rootfs.cpio.zst" "${DEST_PATH}/initrd-arc"
-}
+}

scripts/grub.sh

@@ -29,7 +29,7 @@ done
 popd
 
 rm -f grub.img
-dd if=/dev/zero of=grub.img bs=1M seek=1024 count=0
+dd if=/dev/zero of=grub.img bs=1M seek=2048 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
 
@@ -71,4 +71,4 @@ sudo umount ${LOOPX}p1
 sudo losetup -d ${LOOPX}
 sudo rm -rf ${NAME}1
 
-gzip grub.img
+gzip grub.img