Merge pull request #4886 from AuxXxilium/dev

Dev
Merge pull request #4885 from AuxXxilium/dev
2024-11-25 00:18:45 +01:00 · 2024-11-24 23:53:23 +01:00 · 2024-11-24 23:21:48 +01:00
38 changed files with 1299 additions and 1703 deletions
--- a/.github/workflows/autobuild.yml
+++ b/.github/workflows/autobuild.yml
@@ -0,0 +1,259 @@
+#
+# Copyright (C) 2024 AuxXxilium <https://github.com/AuxXxilium>
+#
+# This is free software, licensed under the MIT License.
+# See /LICENSE for more information.
+#
+
+name: Build Arc Image Development
+
+on:
+  workflow_dispatch:
+    inputs:
+      runs:
+        description: "runs-on"
+        type: choice
+        options:
+          - ubuntu-latest
+          - self-hosted
+      version:
+        description: "version (1.0.0)"
+        required: true
+        type: string
+      next:
+        description: "next"
+        default: true
+        type: boolean
+      stable:
+        description: "stable"
+        default: true
+        type: boolean
+
+jobs:
+  build:
+    runs-on: ${{ inputs.runs }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@main
+
+      # Install Dependencies
+      - name: Install Dependencies
+        if: ${{ inputs.runs == 'ubuntu-latest' }}
+        run: |
+          git config --global user.email "info@auxxxilium.tech"
+          git config --global user.name "AuxXxilium"
+          sudo timedatectl set-timezone "Europe/Berlin"
+
+          sudo apt update
+          sudo apt install -y locales busybox dialog gettext sed gawk jq curl 
+          sudo apt install -y python-is-python3 python3-pip libelf-dev qemu-utils cpio xz-utils lz4 lzma bzip2 gzip zstd
+          # sudo snap install yq
+          if ! command -v yq &>/dev/null || ! yq --version 2>/dev/null | grep -q "v4."; then
+            sudo curl -kL https://github.com/mikefarah/yq/releases/latest/download/yq_linux_amd64 -o /usr/bin/yq && sudo chmod a+x /usr/bin/yq
+          fi
+
+          df -h
+
+      # Get extractor, LKM, Addons, Modules, Theme and Configs
+      - name: Get Buildroot
+        run: |
+          . scripts/func.sh "${{ secrets.BUILD_TOKEN }}"
+
+          echo "Get Dependencies"
+          getAddons "files/p3/addons"
+          getModules "files/p3/modules"
+          getConfigs "files/p3/configs"
+          getPatches "files/p3/patches"
+          getCustom "files/p3/custom"
+          getOffline "files/p3/configs"
+          getLKMs "files/p3/lkms"
+          getTheme "files/p1/boot/grub"
+          getBuildrootx "brx"
+          getBuildroots "brs"
+
+          # Export Dependencies Version to env
+          echo "ADDONTAG=${ADDONTAG}" >> $GITHUB_ENV
+          echo "MODULETAG=${MODULETAG}" >> $GITHUB_ENV
+          echo "CONFIGTAG=${CONFIGTAG}" >> $GITHUB_ENV
+          echo "PATCHTAG=${PATCHTAG}" >> $GITHUB_ENV
+          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 "BUILD_TIME=$(date +'%Y-%m-%d %H:%M')" >> $GITHUB_ENV
+
+          echo "OK"
+
+       # Build incremental
+      - name: Build Next Image
+        if: ${{ inputs.next == true }}
+        run: |
+          . scripts/func.sh
+
+          # Modify Source File
+          ARC_BUILD="`date +'%y%m%d'`"
+          ARC_VERSION="${{ inputs.version }}-dev"
+          ARC_BRANCH="next"
+          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.img"
+          gzip -dc "files/initrd/opt/arc/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 "brx/bzImage-arc" ] || [ ! -f "brx/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"
+
+          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}
+
+          echo "Image Converter"
+          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
+          qemu-img convert -p -f raw -O vhdx ${IMAGE_FILE} arc.vhdx
+
+      # Zip image and generate checksum
+      - name: Pack Next Image
+        if: ${{ inputs.next == true }}
+        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 }}.vhdx.zip" arc.vhdx
+            (cd files && zip -r ../update-${{ env.ARC_VERSION }}-${{ env.ARC_BRANCH }}.zip ./p1 ./p3)
+          fi
+
+      # Cleanup
+      - name: Cleanup
+        run: |
+          rm -rf "arc.img" "arc.vmdk" "arc-dyn.vmdk" "arc.vhdx" "arc-flat.vmdk"
+
+       # Build incremental
+      - name: Build Stable Image
+        if: ${{ inputs.stable }}
+        run: |
+          . scripts/func.sh
+
+          # Modify Source File
+          ARC_BUILD="`date +'%y%m%d'`"
+          ARC_VERSION="${{ inputs.version }}-dev"
+          ARC_BRANCH="stable"
+          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.img"
+          gzip -dc "files/initrd/opt/arc/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"
+          #cp -f "brs/initrd-arc" "files/p3/initrd-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}
+
+          echo "Image Converter"
+          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
+          qemu-img convert -p -f raw -O vhdx ${IMAGE_FILE} arc.vhdx
+
+      # Zip image and generate checksum
+      - name: Pack Stable Image
+        if: ${{ inputs.stable }}
+        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 }}.vhdx.zip" arc.vhdx
+            (cd files && zip -r ../update-${{ env.ARC_VERSION }}-${{ env.ARC_BRANCH }}.zip ./p1 ./p3)
+          fi
+
+      # Publish a release if is a tag
+      - name: Release
+        if: success() && env.ARC_VERSION != ''
+        uses: ncipollo/release-action@v1
+        with:
+          tag: ${{ env.ARC_VERSION }}
+          prerelease: true
+          makeLatest: false
+          allowUpdates: true
+          body: |
+            ### Note:
+              - Development Build
+
+            ### Information:
+              - Full Changelog is available in my Discord
+              - Discord Account for Arc Patch needed
+
+            ### Dependencies:
+              - Addons: ${{ env.ADDONTAG }}
+              - Modules: ${{ env.MODULETAG }}
+              - Configs: ${{ env.CONFIGTAG }}
+              - Patches: ${{ env.PATCHTAG }}
+              - Custom: ${{ env.CUSTOMTAG }}
+              - LKMs: ${{ env.LKMTAG }}
+              - Buildroot Stable: ${{ env.BRSTAG }}
+              - Buildroot Next: ${{ env.BRXTAG }}
+
+            ### Release
+              - ${{ env.BUILD_TIME }}
+          artifacts: |
+            arc-*.zip
+            update-*.zip
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2025 AuxXxilium <https://github.com/AuxXxilium>
+# Copyright (C) 2024 AuxXxilium <https://github.com/AuxXxilium>
 #
 # This is free software, licensed under the MIT License.
 # See /LICENSE for more information.
@@ -32,13 +32,13 @@ on:
        description: "pre release"
        default: false
        type: boolean
-      minimal:
-        description: "minimal"
+      next:
+        description: "next"
        default: true
        type: boolean
-      extended:
-        description: "extended"
-        default: false
+      stable:
+        description: "stable"
+        default: true
        type: boolean
      clean:
        description: "clean"
@@ -53,7 +53,7 @@ jobs:
        uses: actions/checkout@main

      - name: Delete releases and workflows runs
-        if: ${{ inputs.clean }}
+        if: ${{ inputs.clean == true }}
        uses: ophub/delete-releases-workflows@main
        with:
          delete_releases: true
@@ -71,7 +71,7 @@ jobs:
          sudo timedatectl set-timezone "Europe/Berlin"

          sudo apt update
-          sudo apt install -y locales busybox dialog gettext sed gawk jq curl
+          sudo apt install -y locales busybox dialog gettext sed gawk jq curl 
          sudo apt install -y python-is-python3 python3-pip libelf-dev qemu-utils cpio xz-utils lz4 lzma bzip2 gzip zstd
          # sudo snap install yq
          if ! command -v yq &>/dev/null || ! yq --version 2>/dev/null | grep -q "v4."; then
@@ -112,15 +112,15 @@ jobs:
          echo "OK"

       # Build incremental
-      - name: Build extended Image
-        if: ${{ inputs.extended }}
+      - name: Build Next Image
+        if: ${{ inputs.next == true }}
        run: |
          . scripts/func.sh

          # Modify Source File
          ARC_BUILD="`date +'%y%m%d'`"
          ARC_VERSION="${{ inputs.version }}"
-          ARC_BRANCH="extended"
+          ARC_BRANCH="next"
          echo "${ARC_BUILD}" >files/p1/ARC-BUILD
          echo "${ARC_VERSION}" >files/p1/ARC-VERSION
          echo "${ARC_BRANCH}" >files/p1/ARC-BRANCH
@@ -129,8 +129,8 @@ jobs:
          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)
@@ -161,51 +161,42 @@ 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
-
-          echo "Create Arc vhd"
-          createvmc "arc.vmc"
-          qemu-img convert -p -f raw -O vpc ${IMAGE_FILE} arc.vhd
+          qemu-img convert -p -f raw -O vhdx ${IMAGE_FILE} arc.vhdx

          echo "Create Arc ova"
          convertova "${IMAGE_FILE}" "arc.ova"

      # Zip image and generate checksum
-      - name: Pack extended Image
-        if: ${{ inputs.extended }}
+      - name: Pack Next Image
+        if: ${{ inputs.next == true }}
        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 }}.vhdx.zip" arc.vhdx
            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
+          rm -rf "arc.img" "arc.ova" "arc.vmdk" "arc-dyn.vmdk" "arc.vhdx" "arc-flat.vmdk"

       # Build incremental
-      - name: Build minimal Image
-        if: ${{ inputs.minimal }}
+      - name: Build Stable Image
+        if: ${{ inputs.stable == true }}
        run: |
          . scripts/func.sh

          # Modify Source File
          ARC_BUILD="`date +'%y%m%d'`"
          ARC_VERSION="${{ inputs.version }}"
-          ARC_BRANCH="minimal"
+          ARC_BRANCH="stable"
          echo "${ARC_BUILD}" >files/p1/ARC-BUILD
          echo "${ARC_VERSION}" >files/p1/ARC-VERSION
          echo "${ARC_BRANCH}" >files/p1/ARC-BRANCH
@@ -214,8 +205,8 @@ jobs:
          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)
@@ -231,6 +222,7 @@ jobs:
          
          echo "Repack initrd"
          cp -f "brs/bzImage-arc" "files/p3/bzImage-arc"
+          #cp -f "brs/initrd-arc" "files/p3/initrd-arc"
          repackInitrd "brs/initrd-arc" "files/initrd" "files/p3/initrd-arc"

          echo "Copying files"
@@ -246,34 +238,25 @@ 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
-
-          echo "Create Arc vhd"
-          createvmc "arc.vmc"
-          qemu-img convert -p -f raw -O vpc ${IMAGE_FILE} arc.vhd
+          qemu-img convert -p -f raw -O vhdx ${IMAGE_FILE} arc.vhdx

          echo "Create Arc ova"
          convertova "${IMAGE_FILE}" "arc.ova"

      # Zip image and generate checksum
-      - name: Pack minimal Image
-        if: ${{ inputs.minimal }}
+      - name: Pack Stable Image
+        if: ${{ inputs.stable == true }}
        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 }}.vhdx.zip" arc.vhdx
            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

      # Publish a release if is a tag
@@ -290,12 +273,12 @@ jobs:
              - ${{ inputs.notice }}

            ### Information:
-              - Changelog is available in my Discord
+              - Full 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)' || '' }}
+              - stable: Stable Image (Full Image, all dependencies are included, less hardware support)
+              - next: Next Image (Full Image, all dependencies are included, more hardware support, new features to test)

            ### Dependencies:
              - Addons: ${{ env.ADDONTAG }}
@@ -304,12 +287,11 @@ 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) || '' }}
+              - Buildroot Stable: ${{ env.BRSTAG }}
+              - Buildroot Next: ${{ env.BRXTAG }}

            ### Release
              - ${{ env.BUILD_TIME }}
          artifacts: |
            arc-*.zip
            update-*.zip
-            update-*.hash
--- a/.github/workflows/data.yml
+++ b/.github/workflows/data.yml
@@ -43,7 +43,7 @@ jobs:

          TAG=""
          if [ "${PRERELEASE}" = "true" ]; then
-            TAG="$(curl -skL --connect-timeout 10 "${REPO}/tags" | grep /refs/tags/.*\.zip  | sed -E 's/.*\/refs\/tags\/(.*)\.zip.*$/\1/' | sort -rV | head -1)"
+            TAG="$(curl -skL --connect-timeout 10 "${REPO}/tags" | grep /refs/tags/.*\.zip  | sed -r 's/.*\/refs\/tags\/(.*)\.zip.*$/\1/' | sort -rV | head -1)"
          else
            LATESTURL="$(curl -skL --connect-timeout 10 -w %{url_effective} -o /dev/null "${REPO}/releases/latest")"
            TAG="${LATESTURL##*/}"
--- a/.github/workflows/grub.yml
+++ b/.github/workflows/grub.yml
@@ -33,13 +33,15 @@ jobs:

      - name: Make Grub
        run: |
-          rm -f grub.img.gz
-          . scripts/grub.sh "grub-2.12" "i386-pc i386-efi x86_64-efi" "ARC"
+          . scripts/grub.sh "grub-2.12" "i386-pc i386-efi x86_64-efi"

      - name: Check and Push
        if: success() && inputs.push == true
        run: |
          if [ -f "grub.img.gz" ]; then
+            echo "Copy img ..."
+            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}')
--- a/Taskfile.yaml
+++ b/Taskfile.yaml
@@ -3,17 +3,15 @@
 version: "3"

 tasks:
-  build-ext:
+  build-img-n:
    cmds:
-      - git reset --hard
      - git pull
-      - ./img-ext.sh
+      - ./img-gen-n.sh

-  build-min:
+  build-img-s:
    cmds:
-      - git reset --hard
      - git pull
-      - ./img-min.sh
+      - ./img-gen-s.sh

  compile-kpatch:
    dir: kpatch
--- a/files/initrd/opt/arc/arc-functions.sh
+++ b/files/initrd/opt/arc/arc-functions.sh
--- a/files/initrd/opt/arc/arc.sh
+++ b/files/initrd/opt/arc/arc.sh
@@ -5,17 +5,19 @@
 [[ -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"
+. "${ARC_PATH}/include/compat.sh"
+. "${ARC_PATH}/arc-functions.sh"

-# Get Keymap and Timezone and check System
+# Get Keymap and Timezone Config
 onlineCheck
 KEYMAP="$(readConfigKey "keymap" "${USER_CONFIG_FILE}")"
 ARCOFFLINE="$(readConfigKey "arc.offline" "${USER_CONFIG_FILE}")"
+# Check for System
 systemCheck
 ARCMODE="$(readConfigKey "arc.mode" "${USER_CONFIG_FILE}")"

@@ -58,7 +60,7 @@ BUILDDONE="$(readConfigKey "arc.builddone" "${USER_CONFIG_FILE}")"
 ###############################################################################
 # Mounts backtitle dynamically
 function backtitle() {
-  BACKTITLE="${ARC_TITLE}$([ -n "${NEWTAG}" ] && [ -n "${ARC_VERSION}" ] && [ ${ARC_VERSION//[!0-9]/} -lt ${NEWTAG//[!0-9]/} ] && echo " > ${NEWTAG}") | "
+  BACKTITLE="${ARC_TITLE}$([ -n "${NEWTAG}" ] && [ ${ARC_VERSION//[!0-9]/} -lt ${NEWTAG//[!0-9]/} ] && echo " > ${NEWTAG}") | "
  BACKTITLE+="${MODEL:-(Model)} | "
  BACKTITLE+="${PRODUCTVER:-(Version)} | "
  BACKTITLE+="${IPCON:-(IP)} | "
@@ -87,7 +89,11 @@ function backtitlep() {
 # Model Selection
 function arcModel() {
  STEP="model"
-  [ "${ARCOFFLINE}" != "true" ] && checkHardwareID || true
+  if [ ! -f "${S_FILE}" ] || [ ! -f "${P_FILE}" ]; then
+    updateConfigs
+  else
+    checkHardwareID
+  fi
  dialog --backtitle "$(backtitlep)" --title "Model" \
    --infobox "Reading Models..." 3 25
  ARCCONF="$(readConfigKey "${MODEL:-SA6400}.serial" "${S_FILE}")"
@@ -113,23 +119,15 @@ function arcModel() {
        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
+        [[ "${A}" = "apollolake" || "${A}" = "geminilake" ]] && IGPUS="up to 9th"
+        [ "${A}" = "epyc7002" ] && IGPUS="up to 14th" 
        [ "${DT}" = "true" ] && HBAS="" || HBAS="x"
        [ "${M}" = "SA6400" ] && HBAS="x"
        [ "${DT}" = "false" ] && USBS="int/ext" || USBS="ext"
-        [[ "${M}" = "DS718+" || "${M}" = "DS918+" || "${M}" = "DS1019+" || "${M}" = "DS1621xs+" || "${M}" = "RS1619xs+" ]] && M_2_CACHE="+" || M_2_CACHE="x"
+        [[ "${M}" = "DS918+" || "${M}" = "DS1019+" || "${M}" = "DS1621xs+" || "${M}" = "RS1619xs+" ]] && M_2_CACHE="+" || M_2_CACHE="x"
        [[ "${M}" = "DS220+" ||  "${M}" = "DS224+" ]] && M_2_CACHE=""
-        [[ "${M}" = "DS220+" || "${M}" = "DS224+" || "${M}" = "DS718+" || "${M}" = "DS918+" || "${M}" = "DS1019+" || "${M}" = "DS1621xs+" || "${M}" = "RS1619xs+" ]] && M_2_STORAGE="" || M_2_STORAGE="+"
+        [[ "${M}" = "DS220+" || "${M}" = "DS224+" || "${M}" = "DS918+" || "${M}" = "DS1019+" || "${M}" = "DS1621xs+" || "${M}" = "RS1619xs+" ]] && M_2_STORAGE="" || M_2_STORAGE="+"
        # Check id model is compatible with CPU
        if [ ${RESTRICT} -eq 1 ]; then
          for F in "${FLAGS}"; do
@@ -157,13 +155,13 @@ function arcModel() {
        [ -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"
+          [ ${COMPATIBLE} -eq 1 ] && echo -e "${M} \"\t$(printf "\Zb%-15s\Zn \Zb%-5s\Zn \Zb%-5s\Zn \Zb%-12s\Zn \Zb%-5s\Zn \Zb%-10s\Zn \Zb%-12s\Zn \Zb%-10s\Zn \Zb%-10s\Zn" "${A}" "${DTS}" "${ARC}" "${IGPUS}" "${HBAS}" "${M_2_CACHE}" "${M_2_STORAGE}" "${USBS}" "${BETA}")\" ">>"${TMP_PATH}/menu"
        else
-          [ ${COMPATIBLE} -eq 1 ] && echo -e "${M} \"\t$(printf "\Zb%-15s\Zn \Zb%-5s\Zn \Zb%-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"
+          [ ${COMPATIBLE} -eq 1 ] && echo -e "${M} \"\t$(printf "\Zb%-15s\Zn \Zb%-5s\Zn \Zb%-12s\Zn \Zb%-5s\Zn \Zb%-10s\Zn \Zb%-12s\Zn \Zb%-10s\Zn \Zb%-10s\Zn" "${A}" "${DTS}" "${IGPUS}" "${HBAS}" "${M_2_CACHE}" "${M_2_STORAGE}" "${USBS}" "${BETA}")\" ">>"${TMP_PATH}/menu"
        fi
      done < <(cat "${TMP_PATH}/modellist")
      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}" ] && MSG="Supported Models for your Hardware (x = supported / + = need Addons)\n$(printf "\Zb%-16s\Zn \Zb%-15s\Zn \Zb%-5s\Zn \Zb%-5s\Zn \Zb%-12s\Zn \Zb%-5s\Zn \Zb%-10s\Zn \Zb%-12s\Zn \Zb%-10s\Zn \Zb%-10s\Zn" "Model" "Platform" "DT" "Arc" "Intel iGPU" "HBA" "M.2 Cache" "M.2 Volume" "USB Mount" "Source")" || MSG="Supported Models for your Hardware (x = supported / + = need Addons) | Syno Models can have faulty Values.\n$(printf "\Zb%-16s\Zn \Zb%-15s\Zn \Zb%-5s\Zn \Zb%-12s\Zn \Zb%-5s\Zn \Zb%-10s\Zn \Zb%-12s\Zn \Zb%-10s\Zn \Zb%-10s\Zn" "Model" "Platform" "DT" "Intel iGPU" "HBA" "M.2 Cache" "M.2 Volume" "USB Mount" "Source")"
      [ -n "${ARCCONF}" ] && TITLEMSG="Arc Model" || TITLEMSG="Model"
      dialog --backtitle "$(backtitlep)" --title "${TITLEMSG}" --colors \
        --cancel-label "Show all" --help-button --help-label "Exit" \
@@ -172,22 +170,26 @@ function arcModel() {
        --file "${TMP_PATH}/menu" 2>"${TMP_PATH}/resp"
      RET=$?
      case ${RET} in
-        0)
+        0) # ok-button
          resp=$(cat ${TMP_PATH}/resp)
-          [ -z "${resp}" ] && return
+          [ -z "${resp}" ] && return 1
          break
          ;;
-        1)
+        1) # cancel-button -> Show all Models
          [ ${RESTRICT} -eq 1 ] && RESTRICT=0 || RESTRICT=1
          ;;
-        3)
+        2) # help-button -> Exit
+          return 1
+          break
+          ;;
+        3) # extra-button -> Platform Info
          resp=$(cat ${TMP_PATH}/resp)
          PLATFORM="$(grep -w "${resp}" "${TMP_PATH}/modellist" | awk '{print $2}' | head -n 1)"
          dialog --backtitle "$(backtitlep)" --colors \
            --title "Platform Info" --textbox "./informations/${PLATFORM}.yml" 70 80
          ;;
-        *)
-          return 
+        255) # ESC -> Exit
+          return 1
          break
          ;;
      esac
@@ -246,12 +248,12 @@ function arcVersion() {
  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 "$(backtitlep)" \
-      --no-items --menu "Select DSM Version" 7 30 0 ${ITEMS} \
+    dialog --clear --no-items --nocancel --title "Version" --backtitle "$(backtitlep)" \
+      --no-items --menu "Choose DSM Version" 7 30 0 ${ITEMS} \
    2>"${TMP_PATH}/resp"
-    [ $? -ne 0 ] && return
+    [ $? -ne 0 ] && return 0
    resp=$(cat ${TMP_PATH}/resp)
-    [ -z "${resp}" ] && return
+    [ -z "${resp}" ] && return 1
    if [ "${PRODUCTVER}" != "${resp}" ]; then
      PRODUCTVER="${resp}"
      writeConfigKey "productver" "${PRODUCTVER}" "${USER_CONFIG_FILE}"
@@ -262,6 +264,10 @@ function arcVersion() {
      writeConfigKey "ramdisk-hash" "" "${USER_CONFIG_FILE}"
      writeConfigKey "smallnum" "" "${USER_CONFIG_FILE}"
      writeConfigKey "zimage-hash" "" "${USER_CONFIG_FILE}"
+      writeConfigKey "arc.builddone" "false" "${USER_CONFIG_FILE}"
+      writeConfigKey "arc.confdone" "false" "${USER_CONFIG_FILE}"
+      BUILDDONE="$(readConfigKey "arc.builddone" "${USER_CONFIG_FILE}")"
+      CONFDONE="$(readConfigKey "arc.confdone" "${USER_CONFIG_FILE}")"
    fi
    dialog --backtitle "$(backtitlep)" --title "Version" \
    --infobox "Reading DSM Build..." 3 25
@@ -280,8 +286,8 @@ function arcVersion() {
        PREV="${V}"
      done < <(echo "${PVS}")
      DSMPVS="$(cat ${TMP_PATH}/versions)"
-      dialog --backtitle "$(backtitlep)" --colors --title "DSM Build" \
-      --no-items --menu "Select DSM Build" 0 0 0 ${DSMPVS} \
+      dialog --backtitle "$(backtitlep)" --colors --title "Version" \
+      --no-items --menu "Choose a DSM Build" 0 0 0 ${DSMPVS} \
      2>${TMP_PATH}/resp
      RET=$?
      [ ${RET} -ne 0 ] && return
@@ -314,18 +320,10 @@ function arcVersion() {
      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 "$(backtitlep)" --colors --title "Automated Mode" \
-        --yesno "${MSG}" 6 55
-      if [ $? -eq 0 ]; then
-        writeConfigKey "arc.mode" "automated" "${USER_CONFIG_FILE}"
-        ARCMODE="$(readConfigKey "arc.mode" "${USER_CONFIG_FILE}")"
-      else
-        writeConfigKey "arc.mode" "config" "${USER_CONFIG_FILE}"
-        ARCMODE="$(readConfigKey "arc.mode" "${USER_CONFIG_FILE}")"
-      fi
-    fi
+    MSG="Do you want to try Automated Mode?\nIf yes, Loader will configure, build and boot DSM."
+    dialog --backtitle "$(backtitlep)" --colors --title "Automated Mode" \
+      --yesno "${MSG}" 6 55
+    [ $? -eq 0 ] && ARCMODE="automated" || ARCMODE="config"
  elif [ "${ARCMODE}" = "automated" ] || [ "${ARCRESTORE}" = "true" ]; then
    VALID="true"
  fi
@@ -338,13 +336,6 @@ function arcVersion() {
    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}")"
@@ -370,8 +361,7 @@ function arcVersion() {
        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
+        initConfigKey "addons.i915" "" "${USER_CONFIG_FILE}"
      fi
      if echo "${PAT_URL}" 2>/dev/null | grep -q "7.2.2"; then
        initConfigKey "addons.allowdowngrade" "" "${USER_CONFIG_FILE}"
@@ -379,7 +369,7 @@ function arcVersion() {
      if [ -n "${ARCCONF}" ]; then
        initConfigKey "addons.arcdns" "" "${USER_CONFIG_FILE}"
      fi
-      if [ ${SASDRIVES} -gt 0 ] && [ "${DT}" = "false" ]; then
+      if [ ${SASDRIVES} -gt 0 ]; then
        initConfigKey "addons.smartctl" "" "${USER_CONFIG_FILE}"
      fi
    fi
@@ -389,12 +379,20 @@ function arcVersion() {
        deleteConfigKey "addons.\"${ADDON}\"" "${USER_CONFIG_FILE}"
      fi
    done < <(readConfigMap "addons" "${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}"
+      while read -r ID DESC; do
+        writeConfigKey "modules.${ID}" "" "${USER_CONFIG_FILE}"
+      done < <(getAllModules "${PLATFORM}" "${KVERP}")
+    fi
    # 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
+      return 0
    else
      arcPatch
    fi
@@ -404,7 +402,7 @@ function arcVersion() {
    writeConfigKey "arc.confdone" "false" "${USER_CONFIG_FILE}"
    CONFDONE="$(readConfigKey "arc.confdone" "${USER_CONFIG_FILE}")"
    sleep 5
-    return
+    return 1
  fi
 }

@@ -415,37 +413,39 @@ function arcPatch() {
  # Read Model Values
  PLATFORM="$(readConfigKey "platform" "${USER_CONFIG_FILE}")"
  MODEL="$(readConfigKey "model" "${USER_CONFIG_FILE}")"
-  ARCPATCH="$(readConfigKey "arc.patch" "${USER_CONFIG_FILE}")"
+  ARCCONF="$(readConfigKey "${MODEL}.serial" "${S_FILE}")"
  # Check for Custom Build
-  if [ "${ARCMODE}" = "automated" ] && [ "${ARCPATCH}" != "user" ]; then
-      ARCCONF="$(readConfigKey "${MODEL}.serial" "${S_FILE}")"
-      [ -n "${ARCCONF}" ] && SN="$(generateSerial "${MODEL}" "true")" || SN="$(generateSerial "${MODEL}" "false")"
-      [ -n "${ARCCONF}" ] && writeConfigKey "arc.patch" "true" "${USER_CONFIG_FILE}" || writeConfigKey "arc.patch" "false" "${USER_CONFIG_FILE}"
-      writeConfigKey "sn" "${SN}" "${USER_CONFIG_FILE}"
-  elif [ "${ARCMODE}" = "config" ]; then
+  if [ "${ARCMODE}" = "automated" ]; then
    ARCCONF="$(readConfigKey "${MODEL}.serial" "${S_FILE}")"
-    if [ -n "${ARCCONF}" ]; then
-      dialog --clear --backtitle "$(backtitlep)" \
+    [ -n "${ARCCONF}" ] && SN="$(generateSerial "${MODEL}" "true")" || SN="$(generateSerial "${MODEL}" "false")"
+    [ -n "${ARCCONF}" ] && writeConfigKey "arc.patch" "true" "${USER_CONFIG_FILE}" || writeConfigKey "arc.patch" "false" "${USER_CONFIG_FILE}"
+  elif [ "${ARCMODE}" = "config" ]; then
+    dialog --clear --backtitle "$(backtitlep)" \
      --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 "$(backtitlep)" \
-      --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
+    2>"${TMP_PATH}/resp"
    resp=$(cat ${TMP_PATH}/resp)
    [ -z "${resp}" ] && return 1
    if [ ${resp} -eq 1 ]; then
-      SN="$(generateSerial "${MODEL}" "true")"
-      writeConfigKey "arc.patch" "true" "${USER_CONFIG_FILE}"
+      ARCCONF="$(readConfigKey "${MODEL}.serial" "${S_FILE}")"
+      if [ -n "${ARCCONF}" ]; then
+        dialog --backtitle "$(backtitlep)" --colors --title "Arc Patch" \
+          --infobox "Arc Patch successful!" 3 30
+        sleep 2
+        SN="$(generateSerial "${MODEL}" "true")"
+        writeConfigKey "arc.patch" "true" "${USER_CONFIG_FILE}"
+      else
+        dialog --backtitle "$(backtitlep)" --colors --title "Arc Patch" \
+          --infobox "Arc Patch failed!" 3 30
+        sleep 2
+        SN="$(generateSerial "${MODEL}" "false")"
+        writeConfigKey "arc.patch" "false" "${USER_CONFIG_FILE}"
+      fi
    elif [ ${resp} -eq 2 ]; then
+      # Generate random Serial
      SN="$(generateSerial "${MODEL}" "false")"
      writeConfigKey "arc.patch" "false" "${USER_CONFIG_FILE}"
    elif [ ${resp} -eq 3 ]; then
@@ -463,8 +463,8 @@ function arcPatch() {
      done
      writeConfigKey "arc.patch" "user" "${USER_CONFIG_FILE}"
    fi
-    writeConfigKey "sn" "${SN}" "${USER_CONFIG_FILE}"
  fi
+  writeConfigKey "sn" "${SN}" "${USER_CONFIG_FILE}"
  ARCPATCH="$(readConfigKey "arc.patch" "${USER_CONFIG_FILE}")"
  arcSettings
 }
@@ -480,14 +480,12 @@ function arcSettings() {
  PAT_HASH="$(readConfigKey "pathash" "${USER_CONFIG_FILE}")"
  DT="$(readConfigKey "platforms.${PLATFORM}.dt" "${P_FILE}")"
  # Get Network Config for Loader
-  if [ "${ARCMODE}" = "config" ] || [ "${ARCPATCH}" = "true" ] || [ "${ARCPATCH}" = "false" ]; then
-    STEP="network"
-    dialog --backtitle "$(backtitlep)" --colors --title "Network Config" \
-      --infobox "Generating Network Config..." 3 40
-    sleep 2
-    getnet
-    [ $? -ne 0 ] && return
-  fi
+  STEP="network"
+  dialog --backtitle "$(backtitlep)" --colors --title "Network Config" \
+    --infobox "Generating Network Config..." 3 40
+  sleep 2
+  getnet
+  [ $? -ne 0 ] && return 1
  if [ "${ONLYPATCH}" = "true" ]; then
    writeConfigKey "arc.builddone" "false" "${USER_CONFIG_FILE}"
    BUILDDONE="$(readConfigKey "arc.builddone" "${USER_CONFIG_FILE}")"
@@ -495,13 +493,13 @@ function arcSettings() {
    return 0
  fi
  # Select Portmap for Loader
-  if [ "${DT}" = "false" ] && [ ${SATADRIVES} -gt 0 ]; then
+  if [ "${DT}" = "false" ] && [ $(lspci -d ::106 | wc -l) -gt 0 ]; then
    STEP="storagemap"
    dialog --backtitle "$(backtitlep)" --colors --title "Storage Map" \
      --infobox "Generating Storage Map..." 3 40
    sleep 2
    getmapSelection
-    [ $? -ne 0 ] && return
+    [ $? -ne 0 ] && return 1
  fi
  # Check for Custom Build
  if [ "${ARCMODE}" = "config" ]; then
@@ -510,16 +508,16 @@ function arcSettings() {
    dialog --backtitle "$(backtitlep)" --colors --title "Addons" \
      --infobox "Loading Addons Table..." 3 40
    addonSelection
-    [ $? -ne 0 ] && return
+    [ $? -ne 0 ] && return 1
  fi
  # Check for CPU Frequency Scaling & Governor
  if [ "${ARCMODE}" = "config" ] && [ "${MACHINE}" = "Native" ] && readConfigMap "addons" "${USER_CONFIG_FILE}" | grep -q "cpufreqscaling"; then
    dialog --backtitle "$(backtitlep)" --colors --title "CPU Frequency Scaling" \
      --infobox "Generating Governor Table..." 3 40
    governorSelection
-    [ $? -ne 0 ] && return
+    [ $? -ne 0 ] && return 1
  elif [ "${ARCMODE}" = "automated" ] && [ "${MACHINE}" = "Native" ] && readConfigMap "addons" "${USER_CONFIG_FILE}" | grep -q "cpufreqscaling"; then
-    [ "${PLATFORM}" = "epyc7002" ] && writeConfigKey "governor" "schedutil" "${USER_CONFIG_FILE}" || writeConfigKey "governor" "conservative" "${USER_CONFIG_FILE}"
+    [ "${PLATFORM}" = "epyc7002" ] && writeConfigKey "addons.cpufreqscaling" "schedutil" "${USER_CONFIG_FILE}" || writeConfigKey "addons.cpufreqscaling" "conservative" "${USER_CONFIG_FILE}"
  fi
  if [ "${ARCMODE}" = "config" ]; then
    # Check for DT and HBA/Raid Controller
@@ -536,7 +534,7 @@ function arcSettings() {
    fi
    if [ ${DEVICENIC} -gt ${MODELNIC} ] && [ "${ARCPATCH}" = "true" ]; then
      dialog --backtitle "$(backtitlep)" --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
+        --msgbox "WARN: You have more NIC (${DEVICENIC}) than supported by Model (${MODELNIC}).\nOnly ${MODELNIC} are used by Arc Patch." 6 80
    fi
    # Check for AES
    if [ "${AESSYS}" = "false" ]; then
@@ -571,12 +569,12 @@ function arcSettings() {
        2 "No - I want to make changes" \
      2>"${TMP_PATH}/resp"
      resp=$(cat ${TMP_PATH}/resp)
-      [ -z "${resp}" ] && return
+      [ -z "${resp}" ] && return 1
      if [ ${resp} -eq 1 ]; then
        arcSummary
      elif [ ${resp} -eq 2 ]; then
        dialog --clear --no-items --backtitle "$(backtitle)"
-        return
+        return 1
      fi
    else
      # Build Loader
@@ -667,13 +665,13 @@ function arcSummary() {
    --extra-button --extra-label "Cancel" --msgbox "${SUMMARY}" 0 0
  RET=$?
  case ${RET} in
-    0)
+    0) # ok-button
      make
      ;;
-    3)
+    3) # extra-button
      return 0
      ;;
-    255)
+    255) # ESC
      return 0
      ;;
  esac
@@ -710,14 +708,14 @@ function make() {
    writeConfigKey "arc.builddone" "false" "${USER_CONFIG_FILE}"
    BUILDDONE="$(readConfigKey "arc.builddone" "${USER_CONFIG_FILE}")"
    sleep 2
-    return
+    return 1
  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 "$(backtitlep)" --colors --title "Build Loader" \
-      --progressbox "Patching DSM Files..." 20 70
+      --progressbox "Magical things happening..." 20 70
  else
    dialog --backtitle "$(backtitle)" --title "Build Loader" --aspect 18 \
      --infobox "Configuration issue found.\nCould not build Loader!\nExit." 5 40
@@ -725,10 +723,11 @@ function make() {
    writeConfigKey "arc.builddone" "false" "${USER_CONFIG_FILE}"
    BUILDDONE="$(readConfigKey "arc.builddone" "${USER_CONFIG_FILE}")"
    sleep 2
-    return
+    return 1
  fi
+  STEP="boot"
  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+/')"
+    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
@@ -739,14 +738,13 @@ function make() {
    writeConfigKey "arc.builddone" "false" "${USER_CONFIG_FILE}"
    BUILDDONE="$(readConfigKey "arc.builddone" "${USER_CONFIG_FILE}")"
    sleep 2
-    return
+    return 1
  fi
 }

 ###############################################################################
 # Finish Building Loader
 function arcFinish() {
-  STEP="boot"
  rm -f "${LOG_FILE}" >/dev/null 2>&1 || true
  MODELID="$(readConfigKey "modelid" "${USER_CONFIG_FILE}")"
  if [ -n "${MODELID}" ]; then
@@ -762,11 +760,11 @@ function arcFinish() {
        2 "No - I want to make changes" \
      2>"${TMP_PATH}/resp"
      resp=$(cat ${TMP_PATH}/resp)
-      [ -z "${resp}" ] && return
+      [ -z "${resp}" ] && return 1
      if [ ${resp} -eq 1 ]; then
        boot
      elif [ ${resp} -eq 2 ]; then
-        return
+        return 0
      fi
    fi
  fi
@@ -808,7 +806,8 @@ function boot() {
    dialog --backtitle "$(backtitle)" --title "Arc Boot" \
      --infobox "Booting DSM...\nPlease stay patient!" 4 25
    sleep 2
-    exec reboot
+    clear 
+    exec boot.sh
  fi
 }

@@ -823,7 +822,7 @@ if [ "${ARCMODE}" = "update" ]; then
    dialog --backtitle "$(backtitle)" --title "Arc Update" \
      --infobox "Update is not possible in Offline Mode!" 5 40
    sleep 3
-    exec reboot
+    reboot
  fi
 elif [ "${ARCMODE}" = "automated" ]; then
  # Check for Custom Build
@@ -832,18 +831,16 @@ elif [ "${ARCMODE}" = "automated" ]; then
  else
    make
  fi
-elif [ "${ARCMODE}" = "config" ]; then
+else
  [ "${CONFDONE}" = "true" ] && NEXT="2" || NEXT="1"
  [ "${BUILDDONE}" = "true" ] && NEXT="3" || NEXT="1"
  while true; do
    echo "= \"\Z4===== Main =====\Zn \" "                                                     >"${TMP_PATH}/menu"
-    if [ -z "${USERID}" ] && [ "${ARCOFFLINE}" = "false" ]; then
+    if [ -z "${USERID}" ] && [ "${ARCOFFLINE}" != "true" ]; then
      echo "0 \"HardwareID for Arc Patch\" "                                                  >>"${TMP_PATH}/menu"
    fi
    echo "1 \"Choose Model \" "                                                               >>"${TMP_PATH}/menu"
-    if [ "${CONFDONE}" = "true" ] && [ -f "${MOD_ZIMAGE_FILE}" ] && [ -f "${MOD_RDGZ_FILE}" ]; then
-      echo "2 \"Rebuild Loader \" "                                                           >>"${TMP_PATH}/menu"
-    elif [ "${CONFDONE}" = "true" ]; then
+    if [ "${CONFDONE}" = "true" ]; then
      echo "2 \"Build Loader \" "                                                             >>"${TMP_PATH}/menu"
    fi
    if [ "${BUILDDONE}" = "true" ]; then
@@ -886,7 +883,7 @@ elif [ "${ARCMODE}" = "config" ]; then
        if [ "${DT}" = "true" ]; then
          echo "H \"Hotplug/SortDrives: \Z4${HDDSORT}\Zn \" "                                 >>"${TMP_PATH}/menu"
        else
-          echo "h \"USB Mount as Internal: \Z4${USBMOUNT}\Zn \" "                             >>"${TMP_PATH}/menu"
+          echo "h \"USB Mount: \Z4${USBMOUNT}\Zn \" "                                         >>"${TMP_PATH}/menu"
        fi
      fi
      if [ "${BOOTOPTS}" = "true" ]; then
@@ -916,9 +913,7 @@ elif [ "${ARCMODE}" = "config" ]; then
        echo "t \"Change User Password \" "                                                   >>"${TMP_PATH}/menu"
        echo "J \"Reset Network Config \" "                                                   >>"${TMP_PATH}/menu"
        echo "T \"Disable all scheduled Tasks \" "                                            >>"${TMP_PATH}/menu"
-        if [ "${PLATFORM}" = "epyc7002" ]; then
-          echo "M \"Mount DSM Storage Pool \" "                                               >>"${TMP_PATH}/menu"
-        fi
+        echo "M \"Mount DSM Storage Pool (not SHR) \" "                                       >>"${TMP_PATH}/menu"
        echo "l \"Edit User Config \" "                                                       >>"${TMP_PATH}/menu"
        echo "s \"Allow Downgrade Version \" "                                                >>"${TMP_PATH}/menu"
        echo "O \"Official Driver Priority: \Z4${ODP}\Zn \" "                                 >>"${TMP_PATH}/menu"
@@ -950,7 +945,7 @@ elif [ "${ARCMODE}" = "config" ]; then
    fi
    echo "= \"\Z4===== Misc =====\Zn \" "                                                     >>"${TMP_PATH}/menu"
    echo "x \"Backup/Restore/Recovery \" "                                                    >>"${TMP_PATH}/menu"
-    [ "${ARCOFFLINE}" = "false" ] && echo "z \"Update Menu \" "                               >>"${TMP_PATH}/menu"
+    [ "${ARCOFFLINE}" != "true" ] && echo "z \"Update Menu \" "                               >>"${TMP_PATH}/menu"
    echo "I \"Power/Service Menu \" "                                                         >>"${TMP_PATH}/menu"
    echo "V \"Credits \" "                                                                    >>"${TMP_PATH}/menu"

@@ -1040,10 +1035,12 @@ elif [ "${ARCMODE}" = "config" ]; then
        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
+        if [ -n "${PLATFORM}" ] && [ -n "${KVER}" ]; then
+          [ "${PLATFORM}" = "epyc7002" ] && KVERP="${PRODUCTVER}-${KVER}" || KVERP="${KVER}"
          writeConfigKey "modules" "{}" "${USER_CONFIG_FILE}"
-          mergeConfigModules "$(getAllModules "${PLATFORM}" "${KVERP}" | awk '{print $1}')" "${USER_CONFIG_FILE}"
+          while read -r ID DESC; do
+            writeConfigKey "modules.\"${ID}\"" "" "${USER_CONFIG_FILE}"
+          done < <(getAllModules "${PLATFORM}" "${KVERP}")
        fi
        writeConfigKey "arc.builddone" "false" "${USER_CONFIG_FILE}"
        BUILDDONE="$(readConfigKey "arc.builddone" "${USER_CONFIG_FILE}")"
@@ -1055,7 +1052,13 @@ elif [ "${ARCMODE}" = "config" ]; then
        BUILDDONE="$(readConfigKey "arc.builddone" "${USER_CONFIG_FILE}")"
        NEXT="H"
        ;;
-      h) [ "${USBMOUNT}" = "true" ] && USBMOUNT='false' || USBMOUNT='true'
+      h) if [ "${USBMOUNT}" = "auto" ]; then
+          USBMOUNT='internal'
+        elif [ "${USBMOUNT}" = "internal" ]; then
+          USBMOUNT='external'
+        elif [ "${USBMOUNT}" = "external" ]; then
+          USBMOUNT='auto'
+        fi
        writeConfigKey "usbmount" "${USBMOUNT}" "${USER_CONFIG_FILE}"
        writeConfigKey "arc.builddone" "false" "${USER_CONFIG_FILE}"
        BUILDDONE="$(readConfigKey "arc.builddone" "${USER_CONFIG_FILE}")"
@@ -1109,18 +1112,16 @@ elif [ "${ARCMODE}" = "config" ]; then
    esac
  done
  clear
-else
-  exec reboot
 fi

 # Inform user
 echo -e "Call \033[1;34marc.sh\033[0m to configure Loader"
 echo
-echo -e "Web Terminal: \033[1;34mhttp://${IPCON}:${TTYDPORT:-7681}\033[0m"
-echo -e "Web Filemanager: \033[1;34mhttp://${IPCON}:${DUFSPORT:-7304}\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
+echo -e "Web Terminal: \033[1;34mhttp://${IPCON}:${TTYDPORT}\033[0m"
+echo -e "Web Filemanager: \033[1;34mhttp://${IPCON}:${DUFSPORT}\033[0m"
+echo
--- a/files/initrd/opt/arc/boot.sh
+++ b/files/initrd/opt/arc/boot.sh
@@ -55,10 +55,9 @@ LKM="$(readConfigKey "lkm" "${USER_CONFIG_FILE}")"
 CPU="$(echo $(cat /proc/cpuinfo 2>/dev/null | grep 'model name' | uniq | awk -F':' '{print $2}'))"
 RAMTOTAL="$(awk '/MemTotal:/ {printf "%.0f\n", $2 / 1024 / 1024 + 0.5}' /proc/meminfo 2>/dev/null)"
 VENDOR="$(dmesg 2>/dev/null | grep -i "DMI:" | head -1 | sed 's/\[.*\] DMI: //i')"
-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}")"
+DSMINFO="$(readConfigKey "boot.dsminfo" "${USER_CONFIG_FILE}")"
+SYSTEMINFO="$(readConfigKey "boot.systeminfo" "${USER_CONFIG_FILE}")"
+DISKINFO="$(readConfigKey "boot.diskinfo" "${USER_CONFIG_FILE}")"

 if [ "${DSMINFO}" = "true" ]; then
  echo -e "\033[1;37mDSM:\033[0m"
@@ -79,11 +78,6 @@ if [ "${DISKINFO}" = "true" ]; then
  echo -e "\033[1;37mDisks:\033[0m"
  echo -e "Disks: \033[1;37m$(lsblk -dpno NAME | grep -v "${LOADER_DISK}" | wc -l)\033[0m"
 fi
-if [ "${HWIDINFO}" = "true" ]; then
-  echo -e "\033[1;37mHardwareID:\033[0m"
-  echo -e "HWID: \033[1;37m$(genHWID)\033[0m"
-  echo
-fi

 if ! readConfigMap "addons" "${USER_CONFIG_FILE}" | grep -q nvmesystem; then
  HASATA=0
@@ -94,12 +88,7 @@ if ! readConfigMap "addons" "${USER_CONFIG_FILE}" | grep -q nvmesystem; then
      break
    fi
  done
-  [ ${HASATA} -eq 0 ] && echo -e "\033[1;31m*** Note: Please insert at least one Sata/SAS/SCSI Disk for System installation, except the Bootloader Disk. ***\033[0m"
-fi
-
-if checkBIOS_VT_d && [ $(echo "${KVER:-4}" | cut -d'.' -f1) -lt 5 ]; then
-  echo -e "\033[1;31m*** Notice: Disable Intel(VT-d)/AMD(AMD-V) in BIOS/UEFI settings if you encounter a boot failure. ***\033[0m"
-  echo
+  [ ${HASATA} -eq 0 ] && echo -e "\033[1;31m*** Please insert at least one Sata/SAS/SCSI Disk for System installation, except for the Bootloader Disk. ***\033[0m"
 fi

 # Read necessary variables
@@ -109,46 +98,30 @@ 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["vid"]="${VID:-"0x46f4"}" # Sanity check
-CMDLINE["pid"]="${PID:-"0x0001"}" # Sanity check
-CMDLINE["sn"]="${SN}"
+CMDLINE['syno_hw_version']="${MODELID:-${MODEL}}"
+CMDLINE['vid']="${VID:-"0x46f4"}" # Sanity check
+CMDLINE['pid']="${PID:-"0x0001"}" # Sanity check
+CMDLINE['sn']="${SN}"

 # Boot Cmdline
 if grep -q "force_junior" /proc/cmdline; then
-  CMDLINE["force_junior"]=""
+  CMDLINE['force_junior']=""
 fi
 if grep -q "recovery" /proc/cmdline; then
-  CMDLINE["force_junior"]=""
-  CMDLINE["recovery"]=""
+  CMDLINE['force_junior']=""
+  CMDLINE['recovery']=""
 fi
 if [ ${EFI} -eq 1 ]; then
-  CMDLINE["withefi"]=""
+  CMDLINE['withefi']=""
 else
-  CMDLINE["noefi"]=""
+  CMDLINE['noefi']=""
 fi

 # DSM Cmdline
@@ -159,10 +132,10 @@ 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
@@ -174,82 +147,65 @@ else
  CMDLINE["syno_hdd_detect"]="0"
  CMDLINE["syno_hdd_powerup_seq"]="0"
 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
+
+# DSM Specific Cmdline
 CMDLINE['pcie_aspm']="off"
-# CMDLINE['intel_pstate']="disable"
-# CMDLINE['amd_pstate']="disable"
+CMDLINE['modprobe.blacklist']="${MODBLACKLIST}"
+[ $(cat /proc/cpuinfo | grep Intel | wc -l) -gt 0 ] && CMDLINE["intel_pstate"]="passive"
+# CMDLINE['nointremap']="" # no need
+# CMDLINE['split_lock_detect']="off" # no need
 # CMDLINE['nox2apic']=""  # check platform
 # CMDLINE['nomodeset']=""
-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"
-fi
 if echo "apollolake geminilake purley" | grep -wq "${PLATFORM}"; then
  CMDLINE["nox2apic"]=""
 fi
-
-# Disabled for now
-# if [ -n "$(ls /dev/mmcblk* 2>/dev/null)" ] && [ "${BUS}" != "mmc" ] && [ "${EMMCBOOT}" != "true" ]; then
-#   if ! echo "${CMDLINE["modprobe.blacklist"]}" | grep -q "sdhci"; then
-#     [ ! "${CMDLINE["modprobe.blacklist"]}" = "" ] && CMDLINE["modprobe.blacklist"]+=","
-#     CMDLINE["modprobe.blacklist"]+="sdhci,sdhci_pci,sdhci_acpi"
+#if [ -n "$(ls /dev/mmcblk* 2>/dev/null)" ] && [ "${BUS}" != "mmc" ] && [ "${EMMCBOOT}" != "true" ]; then
+#   if ! echo "${CMDLINE['modprobe.blacklist']}" | grep -q "sdhci"; then
+#     [ ! "${CMDLINE['modprobe.blacklist']}" = "" ] && CMDLINE['modprobe.blacklist']+=","
+#     CMDLINE['modprobe.blacklist']+="sdhci,sdhci_pci,sdhci_acpi"
 #   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)
 fi
-
 # CMDLINE['kvm.ignore_msrs']="1"
 # CMDLINE['kvm.report_ignored_msrs']="0"
-
 if echo "apollolake geminilake" | grep -wq "${PLATFORM}"; then
  CMDLINE["intel_iommu"]="igfx_off"
 fi
-
 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
+ETHX=$(ip -o link show | awk -F': ' '{print $2}' | grep eth)
 ETHM=$(readConfigKey "${MODEL}.ports" "${S_FILE}" 2>/dev/null)
 ETHN=$(echo ${ETHX} | wc -w)
 [ -z "${ETHM}" ] && ETHM="${ETHN}"
 NIC=0
 for 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))
+  MAC="$(readConfigKey "${N}" "${USER_CONFIG_FILE}" | tr '[:lower:]' '[:upper:]')"
+  [ -z "${MAC}" ] && MAC="$(cat /sys/class/net/${N}/address 2>/dev/null | tr '[:lower:]' '[:upper:]')" || NIC=$((NIC + 1))
  [ ${NIC} -le ${ETHM} ] && CMDLINE["mac${NIC}"]="${MAC}"
  [ ${NIC} -ge ${ETHM} ] && break
 done
-CMDLINE["netif_num"]="${NIC}"
+CMDLINE['netif_num']="${NIC}"

 # Read user network settings
 while IFS=': ' read -r KEY VALUE; do
@@ -263,7 +219,7 @@ done < <(readConfigMap "cmdline" "${USER_CONFIG_FILE}")

 # Prepare command line
 CMDLINE_LINE=""
-for KEY in "${!CMDLINE[@]}"; do
+for KEY in ${!CMDLINE[@]}; do
  VALUE="${CMDLINE[${KEY}]}"
  CMDLINE_LINE+=" ${KEY}"
  [ -n "${VALUE}" ] && CMDLINE_LINE+="=${VALUE}"
@@ -277,6 +233,7 @@ if [ "${DIRECTBOOT}" = "true" ]; then
  CMDLINE_DIRECT=$(echo ${CMDLINE_LINE} | sed 's/>/\\\\>/g') # Escape special chars
  grub-editenv ${USER_GRUBENVFILE} set dsm_cmdline="${CMDLINE_DIRECT}"
  grub-editenv ${USER_GRUBENVFILE} set next_entry="direct"
+  _bootwait || true
  echo -e "\033[1;34mReboot with Directboot\033[0m"
  reboot
  exit 0
@@ -298,10 +255,9 @@ elif [ "${DIRECTBOOT}" = "false" ]; then
  for N in ${ETHX}; do
    COUNT=0
    DRIVER=$(ls -ld /sys/class/net/${N}/device/driver 2>/dev/null | awk -F '/' '{print $NF}')
-    MAC="$(cat /sys/class/net/${N}/address 2>/dev/null | sed 's/://g' | tr '[:upper:]' '[:lower:]')"
    while true; do
      if [ "0" = "$(cat /sys/class/net/${N}/carrier 2>/dev/null)" ]; then
-        echo -e "\r${DRIVER}: \033[1;37mNOT CONNECTED @ Mac: ${MAC}\033[0m"
+        echo -e "\r${DRIVER}: \033[1;37mNOT CONNECTED\033[0m"
        break
      fi
      COUNT=$((COUNT + 1))
@@ -309,27 +265,27 @@ elif [ "${DIRECTBOOT}" = "false" ]; then
      if [ -n "${IP}" ]; then
        SPEED=$(ethtool ${N} 2>/dev/null | grep "Speed:" | awk '{print $2}')
        if [[ "${IP}" =~ ^169\.254\..* ]]; then
-          echo -e "\r${DRIVER} (${SPEED} | ${MAC}): \033[1;37mLINK LOCAL (No DHCP server found.)\033[0m"
+          echo -e "\r${DRIVER} (${SPEED}): \033[1;37mLINK LOCAL (No DHCP server found.)\033[0m"
        else
-          echo -e "\r${DRIVER} (${SPEED} | ${MAC}): \033[1;37m${IP}\033[0m"
+          echo -e "\r${DRIVER} (${SPEED}): \033[1;37m${IP}\033[0m"
          [ -z "${IPCON}" ] && IPCON="${IP}"
        fi
        break
      fi
      if [ -z "$(cat /sys/class/net/${N}/carrier 2>/dev/null)" ]; then
-        echo -e "\r${DRIVER} (${MAC}): \033[1;37mDOWN\033[0m"
+        echo -e "\r${DRIVER}: \033[1;37mDOWN\033[0m"
        break
      fi
      if [ ${COUNT} -ge ${BOOTIPWAIT} ]; then
-        echo -e "\r${DRIVER} (${MAC}): \033[1;37mTIMEOUT\033[0m"
+        echo -e "\r${DRIVER}: \033[1;37mTIMEOUT\033[0m"
        break
      fi
      sleep 1
    done
  done
-  echo
+   _bootwait || true

-  DSMLOGO="$(readConfigKey "bootscreen.dsmlogo" "${USER_CONFIG_FILE}")"
+  DSMLOGO="$(readConfigKey "boot.dsmlogo" "${USER_CONFIG_FILE}")"
  if [ "${DSMLOGO}" = "true" ] && [ -c "/dev/fb0" ]; then
    [[ "${IPCON}" =~ ^169\.254\..* ]] && IPCON=""
    [ -n "${IPCON}" ] && URL="http://${IPCON}:5000" || URL="http://find.synology.com/"
@@ -339,13 +295,12 @@ elif [ "${DIRECTBOOT}" = "false" ]; then

  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 \
-      || echo -e "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.\nNo IP found - DSM will not work properly!\033[0m\n" >"/dev/${T}" 2>/dev/null
+      [ -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.\033[0m\n" >"/dev/${T}" 2>/dev/null || echo -e "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.\nNo IP found.\033[0m\n" >"/dev/${T}" 2>/dev/null
    fi
  done

  # # Unload all network interfaces
-  # for D in $(realpath /sys/class/net/*/device/driver); do rmmod -f "$(basename ${D})" 2>/dev/null || true; done
+  # for D in $(readlink /sys/class/net/*/device/driver); do rmmod -f "$(basename ${D})" 2>/dev/null || true; done

  # Unload all graphics drivers
  # for D in $(lsmod | grep -E '^(nouveau|amdgpu|radeon|i915)' | awk '{print $1}'); do rmmod -f "${D}" 2>/dev/null || true; done
@@ -354,6 +309,7 @@ elif [ "${DIRECTBOOT}" = "false" ]; then
  # done

  echo -e "\033[1;37mLoading DSM Kernel...\033[0m"
+  # Executes DSM kernel via KEXEC
  KEXECARGS="-a"
  if [ $(echo "${KVER:-4}" | cut -d'.' -f1) -lt 4 ] && [ ${EFI} -eq 1 ]; then
    echo -e "\033[1;33mWarning, running kexec with --noefi param, strange things will happen!!\033[0m"
@@ -362,6 +318,7 @@ elif [ "${DIRECTBOOT}" = "false" ]; then
  kexec ${KEXECARGS} -l "${MOD_ZIMAGE_FILE}" --initrd "${MOD_RDGZ_FILE}" --command-line="${CMDLINE_LINE}" >"${LOG_FILE}" 2>&1 || dieLog

  echo -e "\033[1;37mBooting DSM...\033[0m"
+  # Boot to DSM
  [ "${KERNELLOAD}" = "kexec" ] && kexec -e || poweroff
  exit 0
-fi
+fi
--- a/files/initrd/opt/arc/calc_run_size.sh
+++ b/files/initrd/opt/arc/calc_run_size.sh
@@ -0,0 +1,36 @@
+#!/usr/bin/env bash
+#
+# Calculate the amount of space needed to run the kernel, including room for
+# the .bss and .brk sections.
+#
+# Usage:
+# objdump -h a.out | sh calc_run_size.sh
+
+NUM='\([0-9a-fA-F]*[ \t]*\)'
+OUT=$(sed -n 's/^[ \t0-9]*.b[sr][sk][ \t]*'"${NUM}${NUM}${NUM}${NUM}"'.*/0x\1 0x\4/p')
+
+if [ -z "${OUT}" ]; then
+  echo "Never found .bss or .brk file offset" >&2
+  exit 1
+fi
+
+read -r sizeA offsetA sizeB offsetB <<<$(echo ${OUT} | awk '{printf "%d %d %d %d", strtonum($1), strtonum($2), strtonum($3), strtonum($4)}')
+
+runSize=$((offsetA + sizeA + sizeB))
+
+# BFD linker shows the same file offset in ELF.
+if [ "${offsetA}" -ne "${offsetB}" ]; then
+  # Gold linker shows them as consecutive.
+  endSize=$((offsetB + sizeB))
+  if [ "${endSize}" -ne "${runSize}" ]; then
+    printf "sizeA: 0x%x\n" ${sizeA} >&2
+    printf "offsetA: 0x%x\n" ${offsetA} >&2
+    printf "sizeB: 0x%x\n" ${sizeB} >&2
+    printf "offsetB: 0x%x\n" ${offsetB} >&2
+    echo ".bss and .brk are non-contiguous" >&2
+    exit 1
+  fi
+fi
+
+printf "%d\n" ${runSize}
+exit 0
--- a/files/initrd/opt/arc/grub.img.gz
+++ b/files/initrd/opt/arc/grub.img.gz
--- a/files/initrd/opt/arc/include/addons.sh
+++ b/files/initrd/opt/arc/include/addons.sh
@@ -8,7 +8,6 @@ function availableAddons() {
  fi
  local ARCOFFLINE="$(readConfigKey "arc.offline" "${USER_CONFIG_FILE}")"
  local ARCCONF="$(readConfigKey "${MODEL}.serial" "${S_FILE}")"
-  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})
--- a/files/initrd/opt/arc/include/compat.sh
+++ b/files/initrd/opt/arc/include/compat.sh
@@ -0,0 +1 @@
+###############################################################################
--- a/files/initrd/opt/arc/include/configFile.sh
+++ b/files/initrd/opt/arc/include/configFile.sh
@@ -26,20 +26,6 @@ function readConfigKey() {
  [ "${RESULT}" = "null" ] && echo "" || echo "${RESULT}"
 }

-###############################################################################
-# Write to yaml config file
-# 1 - Modules
-# 2 - Path of yaml config file
-function mergeConfigModules() {
-  local MS="ARCMOD\n${1// /\\n}"
-  local L="$(echo -en "${MS}" | awk '{print "modules."$1":"}')"
-  local xmlfile=$(mktemp)
-  echo -en "${L}" | yq -p p -o=yaml >"${xmlfile}"
-  deleteConfigKey "modules.\"ARCMOD\"" "${xmlfile}"
-  yq eval-all --inplace 'select(fileIndex == 0) * select(fileIndex == 1)' "${2}" "${xmlfile}" 2>/dev/null
-  rm -f "${xmlfile}"
-}
-
 ###############################################################################
 # Write to yaml config file if key not exists
 # 1 - Path of Key
--- a/files/initrd/opt/arc/include/consts.sh
+++ b/files/initrd/opt/arc/include/consts.sh
@@ -43,7 +43,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=7080 || 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)
--- a/files/initrd/opt/arc/include/functions.sh
+++ b/files/initrd/opt/arc/include/functions.sh
@@ -68,12 +68,6 @@ function randomhex() {
  printf "&02X" "$((${RANDOM} % 255 + 1))"
 }

-###############################################################################
-# Generate a random digit (0-9A-Z)
-function genRandomDigit() {
-  echo {0..9} | tr ' ' '\n' | sort -R | head -1
-}
-
 ###############################################################################
 # Generate a random letter
 function genRandomLetter() {
@@ -142,7 +136,7 @@ function generateMacAddress() {
    [ ${I} -lt ${NUM} ] && MACS+=" "
  done

-  MACS="$(echo "${MACS}" | tr '[:upper:]' '[:lower:]')"
+  MACS="$(echo "${MACS}" | tr '[:lower:]' '[:upper:]')"
  echo "${MACS}"
  return 0
 }
@@ -235,7 +229,7 @@ function _set_conf_kv() {
 # sort netif busid
 function _sort_netif() {
  local ETHLIST=""
-  local ETHX=$(ls /sys/class/net/ 2>/dev/null | grep eth) || true
+  local ETHX=$(ip -o link show | awk -F': ' '{print $2}' | grep eth)
  for N in ${ETHX}; do
    local MAC="$(cat /sys/class/net/${N}/address 2>/dev/null | sed 's/://g; s/.*/\L&/')"
    local BUS="$(ethtool -i ${N} 2>/dev/null | grep bus-info | cut -d' ' -f2)"
@@ -381,39 +375,13 @@ function delCmdline() {
  setCmdline "${1}" "${CMDLINE}"
 }

-###############################################################################
-# check CPU Intel(VT-d)/AMD(AMD-Vi)
-function checkCPU_VT_d() {
-  lsmod | grep -q msr || modprobe msr 2>/dev/null
-  if grep -q "GenuineIntel" /proc/cpuinfo 2>/dev/null; then
-    local VT_D_ENABLED=$(rdmsr 0x3a 2>/dev/null)
-    [ "$((${VT_D_ENABLED:-0x0} & 0x5))" -eq $((0x5)) ] && return 0
-  elif grep -q "AuthenticAMD" /proc/cpuinfo 2>/dev/null; then
-    local IOMMU_ENABLED=$(rdmsr 0xC0010114 2>/dev/null)
-    [ "$((${IOMMU_ENABLED:-0x0} & 0x1))" -eq $((0x1)) ] && return 0
-  else
-    return 1
-  fi
-}
-
-###############################################################################
-# check BIOS Intel(VT-d)/AMD(AMD-Vi)
-function checkBIOS_VT_d() {
-  if grep -q "GenuineIntel" /proc/cpuinfo 2>/dev/null; then
-    dmesg 2>/dev/null | grep -iq "DMAR-IR.*DRHD base" && return 0
-  elif grep -q "AuthenticAMD" /proc/cpuinfo 2>/dev/null; then
-    dmesg 2>/dev/null | grep -iq "AMD-Vi.*enabled" && return 0
-  else
-    return 1
-  fi
-}
-
 ###############################################################################
 # Rebooting
+# (based on pocopico's TCRP code)
 function rebootTo() {
  local MODES="config recovery junior automated update bios memtest"
  [ -z "${1}" ] && exit 1
-  if ! echo "${MODES}" | grep -wq "${1}"; then exit 1; fi
+  if ! echo "${MODES}" | grep -qw "${1}"; then exit 1; fi
  [ "${1}" = "automated" ] && echo "arc-${MODEL}-${PRODUCTVER}-${ARC_VERSION}" >"${PART3_PATH}/automated"
  [ ! -f "${USER_GRUBENVFILE}" ] && grub-editenv ${USER_GRUBENVFILE} create
  # echo -e "Rebooting to ${1} mode..."
@@ -543,15 +511,11 @@ function onlineCheck() {
  LAYOUT="$(readConfigKey "layout" "${USER_CONFIG_FILE}")"
  if [ -z "${LAYOUT}" ]; then
    [ -n "${KEYMAP}" ] && KEYMAP="$(echo ${KEYMAP} | tr '[:upper:]' '[:lower:]' | tr -d '[:space:]' | tr -d '[:punct:]' | tr -d '[:digit:]')"
-    if loadkeys "${KEYMAP:-us}" 2>/dev/null; then
-      writeConfigKey "keymap" "${KEYMAP}" "${USER_CONFIG_FILE}"
-    else
-      KEYMAP="us"
-      loadkeys "${KEYMAP}" 2>/dev/null
-      writeConfigKey "keymap" "${KEYMAP}" "${USER_CONFIG_FILE}"
-    fi
+    [ -n "${KEYMAP}" ] && writeConfigKey "keymap" "${KEYMAP}" "${USER_CONFIG_FILE}"
+    [ -z "${KEYMAP}" ] && KEYMAP="us"
+    loadkeys ${KEYMAP}
  fi
-  NEWTAG="$(curl -m 10 -skL "https://api.github.com/repos/AuxXxilium/arc/releases" | jq -r ".[].tag_name" | grep -v "dev" | sort -rV | head -1)"
+  [ $(echo "${ARC_VERSION}" | grep "dev" | wc -l) -eq 0 ] && NEWTAG="$(curl -m 10 -skL "https://api.github.com/repos/AuxXxilium/arc/releases" | jq -r ".[].tag_name" | grep -v "dev" | sort -rV | head -1)" || NEWTAG="$(curl -m 10 -skL "https://api.github.com/repos/AuxXxilium/arc/releases" | jq -r ".[].tag_name" | grep "dev" | sort -rV | head -1)"
  if [ -n "${NEWTAG}" ]; then
    writeConfigKey "arc.offline" "false" "${USER_CONFIG_FILE}"
    updateOffline
@@ -589,7 +553,7 @@ function systemCheck () {
  fi
  # Check for CPU Frequency Scaling
  CPUFREQUENCIES=$(ls -ltr /sys/devices/system/cpu/cpufreq/* 2>/dev/null | wc -l)
-  if [ ${CPUFREQUENCIES} -gt 1 ]; then
+  if [ ${CPUFREQUENCIES} -gt 1 ] && [ "${ACPISYS}" = "true" ]; then
    CPUFREQ="true"
  else
    CPUFREQ="false"
@@ -597,8 +561,6 @@ function systemCheck () {
  # Check for Arc Patch
  ARCCONF="$(readConfigKey "${MODEL:-SA6400}.serial" "${S_FILE}")"
  [ -z "${ARCCONF}" ] && writeConfigKey "arc.patch" "false" "${USER_CONFIG_FILE}"
-  # Check for Disks
-  getmap
 }

 ###############################################################################
@@ -623,49 +585,33 @@ function check_port() {
 }

 ###############################################################################
-# Unmount disks
+# Unmount new boot loader disk
 function __umountNewBlDisk() {
  umount "${TMP_PATH}/sdX1" 2>/dev/null
  umount "${TMP_PATH}/sdX2" 2>/dev/null
  umount "${TMP_PATH}/sdX3" 2>/dev/null
 }

-function __umountDSMRootDisk() {
-  umount "${TMP_PATH}/mdX"
-  rm -rf "${TMP_PATH}/mdX"
-}
-
 ###############################################################################
 # bootwait SSH/Web
 function _bootwait() {
-  BOOTWAIT="$(readConfigKey "bootwait" "${USER_CONFIG_FILE}")"
-  [ -z "${BOOTWAIT}" ] && BOOTWAIT=10
+  # Exec Bootwait to check SSH/Web connection
+  BOOTWAIT=5
  busybox w 2>/dev/null | awk '{print $1" "$2" "$4" "$5" "$6}' >WB
  MSG=""
-  while [ ${BOOTWAIT} -gt 0 ]; do
-    sleep 1
-    BOOTWAIT=$((BOOTWAIT - 1))
-    MSG="\033[1;33mAccess to SSH/Web will interrupt boot...\033[0m"
+  while test ${BOOTWAIT} -ge 0; do
+    MSG="\033[1;33mAccess SSH/Web will interrupt boot...\033[0m"
    echo -en "\r${MSG}"
    busybox w 2>/dev/null | awk '{print $1" "$2" "$4" "$5" "$6}' >WC
    if ! diff WB WC >/dev/null 2>&1; then
-      echo -en "\r\033[1;33mAccess to SSH/Web detected and boot is interrupted.\033[0m\n"
+      echo -en "\r\033[1;33mAccess SSH/Web detected and boot is interrupted.\033[0m\n"
      rm -f WB WC
-      return 1
+      exit 0
    fi
+    sleep 1
+    BOOTWAIT=$((BOOTWAIT - 1))
  done
  rm -f WB WC
  echo -en "\r$(printf "%$((${#MSG} * 2))s" " ")\n"
  return 0
-}
-
-###############################################################################
-# check and fix the DSM root partition
-# 1 - DSM root path
-function fixDSMRootPart() {
-  if mdadm --detail "${1}" 2>/dev/null | grep -i "State" | grep -iEq "active|FAILED|Not Started"; then
-    mdadm --stop "${1}" >/dev/null 2>&1
-    mdadm --assemble --scan >/dev/null 2>&1
-    fsck "${1}" >/dev/null 2>&1
-  fi
 }
--- a/files/initrd/opt/arc/include/i915ids
+++ b/files/initrd/opt/arc/include/i915ids
@@ -1,390 +0,0 @@
-# INTEL_I810_IDS
-80867121
-80867123
-80867125
-# INTEL_I815_IDS
-80861132
-# INTEL_I830_IDS
-80863577
-# INTEL_I845G_IDS
-80862562
-# INTEL_I85X_IDS
-80863582
-8086358e
-# INTEL_I865G_IDS
-80862572
-# INTEL_I915G_IDS
-80862582
-8086258a
-# INTEL_I915GM_IDS
-80862592
-# INTEL_I945G_IDS
-80862772
-# INTEL_I945GM_IDS
-808627a2
-808627ae
-# INTEL_I965G_IDS
-80862972
-80862982
-80862992
-808629a2
-# INTEL_G33_IDS
-808629b2
-808629c2
-808629d2
-# INTEL_I965GM_IDS
-80862a02
-80862a12
-# INTEL_GM45_IDS
-80862a42
-# INTEL_G45_IDS
-80862e02
-80862e12
-80862e22
-80862e32
-80862e42
-80862e92
-# INTEL_PINEVIEW_G_IDS
-8086a001
-# INTEL_PINEVIEW_M_IDS
-8086a011
-# INTEL_IRONLAKE_D_IDS
-80860042
-# INTEL_IRONLAKE_M_IDS
-80860046
-# INTEL_SNB_D_GT1_IDS
-80860102
-8086010A
-# INTEL_SNB_D_GT2_IDS
-80860112
-80860122
-# INTEL_SNB_M_GT1_IDS
-80860106
-# INTEL_SNB_M_GT2_IDS
-80860116
-80860126
-# INTEL_IVB_M_GT1_IDS
-80860156
-# INTEL_IVB_M_GT2_IDS
-80860166
-# INTEL_IVB_D_GT1_IDS
-80860152
-8086015a
-# INTEL_IVB_D_GT2_IDS
-80860162
-8086016a
-# INTEL_HSW_ULT_GT1_IDS
-80860A02
-80860A06
-80860A0A
-80860A0B
-# INTEL_HSW_ULX_GT1_IDS
-80860A0E
-# INTEL_HSW_GT1_IDS
-80860402
-80860406
-8086040A
-8086040B
-8086040E
-80860C02
-80860C06
-80860C0A
-80860C0B
-80860C0E
-80860D02
-80860D06
-80860D0A
-80860D0B
-80860D0E
-# INTEL_HSW_ULT_GT2_IDS
-80860A12
-80860A16
-80860A1A
-80860A1B
-# INTEL_HSW_ULX_GT2_IDS
-80860A1E
-# INTEL_HSW_GT2_IDS
-80860412
-80860416
-8086041A
-8086041B
-8086041E
-80860C12
-80860C16
-80860C1A
-80860C1B
-80860C1E
-80860D12
-80860D16
-80860D1A
-80860D1B
-80860D1E
-# INTEL_HSW_ULT_GT3_IDS
-80860A22
-80860A26
-80860A2A
-80860A2B
-80860A2E
-# INTEL_HSW_GT3_IDS
-80860422
-80860426
-8086042A
-8086042B
-8086042E
-80860C22
-80860C26
-80860C2A
-80860C2B
-80860C2E
-80860D22
-80860D26
-80860D2A
-80860D2B
-80860D2E
-# INTEL_VLV_IDS
-80860f30
-80860f31
-80860f32
-80860f33
-# INTEL_BDW_ULT_GT1_IDS
-80861606
-8086160B
-# INTEL_BDW_ULX_GT1_IDS
-8086160E
-# INTEL_BDW_GT1_IDS
-80861602
-8086160A
-8086160D
-# INTEL_BDW_ULT_GT2_IDS
-80861616
-8086161B
-# INTEL_BDW_ULX_GT2_IDS
-8086161E
-# INTEL_BDW_GT2_IDS
-80861612
-8086161A
-8086161D
-# INTEL_BDW_ULT_GT3_IDS
-80861626
-8086162B
-# INTEL_BDW_ULX_GT3_IDS
-8086162E
-# INTEL_BDW_GT3_IDS
-80861622
-8086162A
-8086162D
-# INTEL_BDW_ULT_RSVD_IDS
-80861636
-8086163B
-# INTEL_BDW_ULX_RSVD_IDS
-8086163E
-# INTEL_BDW_RSVD_IDS
-80861632
-8086163A
-8086163D
-# INTEL_CHV_IDS
-808622b0
-808622b1
-808622b2
-808622b3
-# INTEL_SKL_ULT_GT1_IDS
-80861906
-80861913~
-# INTEL_SKL_ULX_GT1_IDS
-8086190E
-80861915~
-# INTEL_SKL_GT1_IDS
-80861902
-8086190A
-8086190B
-80861917~
-# INTEL_SKL_ULT_GT2_IDS
-80861916
-80861921
-# INTEL_SKL_ULX_GT2_IDS
-8086191E
-# INTEL_SKL_GT2_IDS
-80861912
-8086191A
-8086191B
-8086191D
-# INTEL_SKL_ULT_GT3_IDS
-80861923
-80861926
-80861927
-# INTEL_SKL_GT3_IDS
-8086192A
-8086192B
-8086192D
-# INTEL_SKL_GT4_IDS
-80861932
-8086193A
-8086193B
-8086193D
-# INTEL_BXT_IDS
-80860A84
-80861A84
-80861A85
-80865A84
-80865A85
-# INTEL_GLK_IDS
-80863184
-80863185
-# INTEL_KBL_ULT_GT1_IDS
-80865906
-80865913
-# INTEL_KBL_ULX_GT1_IDS
-8086590E
-80865915
-# INTEL_KBL_GT1_IDS
-80865902
-80865908
-8086590A
-8086590B
-# INTEL_KBL_ULT_GT2_IDS
-80865916
-80865921
-# INTEL_KBL_ULX_GT2_IDS
-8086591E
-# INTEL_KBL_GT2_IDS
-80865912
-80865917
-8086591A
-8086591B
-8086591D
-# INTEL_KBL_ULT_GT3_IDS
-80865926
-# INTEL_KBL_GT3_IDS
-80865923
-80865927
-# INTEL_KBL_GT4_IDS
-8086593B
-# INTEL_AML_KBL_GT2_IDS
-8086591C
-808687C0
-# INTEL_AML_CFL_GT2_IDS
-808687CA
-# INTEL_CML_GT1_IDS
-80869BA2
-80869BA4
-80869BA5
-80869BA8
-# INTEL_CML_U_GT1_IDS
-80869B21
-80869BAA
-80869BAC
-# INTEL_CML_GT2_IDS
-80869BC2
-80869BC4
-80869BC5
-80869BC6
-80869BC8
-80869BE6
-80869BF6
-# INTEL_CML_U_GT2_IDS
-80869B41
-80869BCA
-80869BCC
-# INTEL_CFL_S_GT1_IDS
-80863E90
-80863E93
-80863E99
-# INTEL_CFL_S_GT2_IDS
-80863E91
-80863E92
-80863E96
-80863E98
-80863E9A
-# INTEL_CFL_H_GT1_IDS
-80863E9C
-# INTEL_CFL_H_GT2_IDS
-80863E94
-80863E9B
-# INTEL_CFL_U_GT2_IDS
-80863EA9
-# INTEL_CFL_U_GT3_IDS
-80863EA5
-80863EA6
-80863EA7
-80863EA8
-# INTEL_WHL_U_GT1_IDS
-80863EA1
-80863EA4
-# INTEL_WHL_U_GT2_IDS
-80863EA0
-80863EA3
-# INTEL_WHL_U_GT3_IDS
-80863EA2
-# INTEL_CNL_PORT_F_IDS
-80865A44
-80865A4C
-80865A54
-80865A5C
-# INTEL_CNL_IDS
-80865A40
-80865A41
-80865A42
-80865A49
-80865A4A
-80865A50
-80865A51
-80865A52
-80865A59
-80865A5A
-# INTEL_ICL_PORT_F_IDS
-80868A50
-80868A52
-80868A53
-80868A54
-80868A56
-80868A57
-80868A58
-80868A59
-80868A5A
-80868A5B
-80868A5C
-80868A70
-80868A71
-# INTEL_ICL_11_IDS
-80868A51
-80868A5D
-# INTEL_EHL_IDS
-80864500~
-80864541
-80864551
-80864555
-80864557
-80864570~
-80864571
-# INTEL_JSL_IDS
-80864E51
-80864E55
-80864E57
-80864E61
-80864E71
-# INTEL_TGL_12_GT1_IDS
-80869A60
-80869A68
-80869A70
-# INTEL_TGL_12_GT2_IDS
-80869A40
-80869A49
-80869A59
-80869A78
-80869AC0
-80869AC9
-80869AD9
-80869AF8
-# INTEL_RKL_IDS
-80864C80
-80864C8A
-80864C8B
-80864C8C
-80864C90
-80864C9A
-# INTEL_DG1_IDS
-80864905
-80864906~
-80864907~
-80864908~
-80864909~
--- a/files/initrd/opt/arc/include/modules.sh
+++ b/files/initrd/opt/arc/include/modules.sh
@@ -1,37 +1,3 @@
-###############################################################################
-# Unpack modules from a tgz file
-# 1 - Platform
-# 2 - Kernel Version
-function unpackModules() {
-  local PLATFORM=${1}
-  local KVER=${2}
-  local KERNEL="$(readConfigKey "kernel" "${USER_CONFIG_FILE}")"
-
-  rm -rf "${TMP_PATH}/modules"
-  mkdir -p "${TMP_PATH}/modules"
-  if [ "${KERNEL}" = "custom" ]; then
-    tar -zxf "${CUSTOM_PATH}/modules-${PLATFORM}-${KVER}.tgz" -C "${TMP_PATH}/modules"
-  else
-    tar -zxf "${MODULES_PATH}/${PLATFORM}-${KVER}.tgz" -C "${TMP_PATH}/modules"
-  fi
-}
-
-###############################################################################
-# Packag modules to a tgz file
-# 1 - Platform
-# 2 - Kernel Version
-function packModules() {
-  local PLATFORM=${1}
-  local KVER=${2}
-  local KERNEL="$(readConfigKey "kernel" "${USER_CONFIG_FILE}")"
-
-  if [ "${KERNEL}" = "custom" ]; then
-    tar -zcf "${CUSTOM_PATH}/modules-${PLATFORM}-${KVER}.tgz" -C "${TMP_PATH}/modules" .
-  else
-    tar -zcf "${MODULES_PATH}/${PLATFORM}-${KVER}.tgz" -C "${TMP_PATH}/modules" .
-  fi
-}
-
 ###############################################################################
 # Return list of all modules available
 # 1 - Platform
@@ -44,9 +10,15 @@ function getAllModules() {
    echo ""
    return 1
  fi
-
-  unpackModules "${PLATFORM}" "${KVER}"
-
+  # Unzip modules for temporary folder
+  rm -rf "${TMP_PATH}/modules"
+  mkdir -p "${TMP_PATH}/modules"
+  local KERNEL="$(readConfigKey "kernel" "${USER_CONFIG_FILE}")"
+  if [ "${KERNEL}" = "custom" ]; then
+    tar -zxf "${CUSTOM_PATH}/modules-${PLATFORM}-${KVER}.tgz" -C "${TMP_PATH}/modules"
+  else
+    tar -zxf "${MODULES_PATH}/${PLATFORM}-${KVER}.tgz" -C "${TMP_PATH}/modules"
+  fi
  # Get list of all modules
  for F in $(ls ${TMP_PATH}/modules/*.ko 2>/dev/null); do
    local X=$(basename ${F})
@@ -73,24 +45,34 @@ function installModules() {
    echo "ERROR: installModules: Platform or Kernel Version not defined" >"${LOG_FILE}"
    return 1
  fi
-
-  unpackModules "${PLATFORM}" "${KVER}"
+  # Unzip modules for temporary folder
+  rm -rf "${TMP_PATH}/modules"
+  mkdir -p "${TMP_PATH}/modules"
+  local KERNEL="$(readConfigKey "kernel" "${USER_CONFIG_FILE}")"
+  if [ "${KERNEL}" = "custom" ]; then
+    tar -zxf "${CUSTOM_PATH}/modules-${PLATFORM}-${KVER}.tgz" -C "${TMP_PATH}/modules" 2>"${LOG_FILE}"
+  else
+    tar -zxf "${MODULES_PATH}/${PLATFORM}-${KVER}.tgz" -C "${TMP_PATH}/modules" 2>"${LOG_FILE}"
+  fi
+  if [ $? -ne 0 ]; then
+    return 1
+  fi

  local ODP="$(readConfigKey "odp" "${USER_CONFIG_FILE}")"
  for F in $(ls "${TMP_PATH}/modules/"*.ko 2>/dev/null); do
    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
@@ -115,12 +97,21 @@ function addToModules() {
    echo ""
    return 1
  fi
-
-  unpackModules "${PLATFORM}" "${KVER}"
-
+  # Unzip modules for temporary folder
+  rm -rf "${TMP_PATH}/modules"
+  mkdir -p "${TMP_PATH}/modules"
+  local KERNEL="$(readConfigKey "kernel" "${USER_CONFIG_FILE}")"
+  if [ "${KERNEL}" = "custom" ]; then
+    tar -zxf "${CUSTOM_PATH}/modules-${PLATFORM}-${KVER}.tgz" -C "${TMP_PATH}/modules"
+  else
+    tar -zxf "${MODULES_PATH}/${PLATFORM}-${KVER}.tgz" -C "${TMP_PATH}/modules"
+  fi
  cp -f ${KOFILE} ${TMP_PATH}/modules
-
-  packModules "${PLATFORM}" "${KVER}"
+  if [ "${KERNEL}" = "custom" ]; then
+    tar -zcf "${CUSTOM_PATH}/modules-${PLATFORM}-${KVER}.tgz" -C "${TMP_PATH}/modules" .
+  else
+    tar -zcf "${MODULES_PATH}/${PLATFORM}-${KVER}.tgz" -C "${TMP_PATH}/modules" .
+  fi
 }

 ###############################################################################
@@ -137,12 +128,21 @@ function delToModules() {
    echo ""
    return 1
  fi
-
-  unpackModules "${PLATFORM}" "${KVER}"
-
+  # Unzip modules for temporary folder
+  rm -rf "${TMP_PATH}/modules"
+  mkdir -p "${TMP_PATH}/modules"
+  local KERNEL="$(readConfigKey "kernel" "${USER_CONFIG_FILE}")"
+  if [ "${KERNEL}" = "custom" ]; then
+    tar -zxf "${CUSTOM_PATH}/modules-${PLATFORM}-${KVER}.tgz" -C "${TMP_PATH}/modules"
+  else
+    tar -zxf "${MODULES_PATH}/${PLATFORM}-${KVER}.tgz" -C "${TMP_PATH}/modules"
+  fi
  rm -f ${TMP_PATH}/modules/${KONAME}
-
-  packModules "${PLATFORM}" "${KVER}"
+  if [ "${KERNEL}" = "custom" ]; then
+    tar -zcf "${CUSTOM_PATH}/modules-${PLATFORM}-${KVER}.tgz" -C "${TMP_PATH}/modules" .
+  else
+    tar -zcf "${MODULES_PATH}/${PLATFORM}-${KVER}.tgz" -C "${TMP_PATH}/modules" .
+  fi
 }

 ###############################################################################
@@ -170,9 +170,15 @@ function getdepends() {
    echo ""
    return 1
  fi
-
-  unpackModules "${PLATFORM}" "${KVER}"
-
+  # Unzip modules for temporary folder
+  rm -rf "${TMP_PATH}/modules"
+  mkdir -p "${TMP_PATH}/modules"
+  local KERNEL="$(readConfigKey "kernel" "${USER_CONFIG_FILE}")"
+  if [ "${KERNEL}" = "custom" ]; then
+    tar -zxf "${CUSTOM_PATH}/modules-${PLATFORM}-${KVER}.tgz" -C "${TMP_PATH}/modules"
+  else
+    tar -zxf "${MODULES_PATH}/${PLATFORM}-${KVER}.tgz" -C "${TMP_PATH}/modules"
+  fi
  local DPS=($(_getdepends ${KONAME} | tr ' ' '\n' | sort -u))
  echo ${DPS[@]}
  rm -rf "${TMP_PATH}/modules"
--- a/files/initrd/opt/arc/include/network.sh
+++ b/files/initrd/opt/arc/include/network.sh
@@ -1,6 +1,6 @@
 # Get Network Config for Loader
 function getnet() {
-  ETHX=$(ls /sys/class/net/ 2>/dev/null | grep eth) || true
+  ETHX=$(ip -o link show | awk -F': ' '{print $2}' | grep eth)
  MODEL="$(readConfigKey "model" "${USER_CONFIG_FILE}")"
  ARCPATCH="$(readConfigKey "arc.patch" "${USER_CONFIG_FILE}")"
  NICPORTS="$(readConfigKey "${MODEL}.ports" "${S_FILE}" 2>/dev/null)"
@@ -21,16 +21,16 @@ function getnet() {
    # User Mac
    for N in ${ETHX}; do
      while true; do
+        MAC="$(cat /sys/class/net/${N}/address | sed 's/://g' | tr '[:lower:]' '[:upper:]')"
        dialog --backtitle "$(backtitle)" --title "Mac Setting" \
-          --inputbox "Type a custom Mac for ${N} (Eq. 001132a1b2c3).\nA custom Mac will not be applied to NIC!" 8 50\
+          --inputbox "Type a custom MAC for ${ETH} (Eq. 001132abc123)." 7 50 "${MAC}"\
          2>"${TMP_PATH}/resp"
        [ $? -ne 0 ] && break
        MAC=$(cat "${TMP_PATH}/resp")
        [ -z "${MAC}" ] && MAC="$(readConfigKey "${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="$(cat /sys/class/net/${N}/address 2>/dev/null | sed 's/://g' | tr '[:lower:]' '[:upper:]')"
+        MAC="$(echo "${MAC}" | tr '[:lower:]' '[:upper:]')"
        if [ ${#MAC} -eq 12 ]; then
-          dialog --backtitle "$(backtitle)" --title "Mac Setting" --msgbox "Set Mac for ${N} to ${MAC}!" 5 50
          writeConfigKey "${N}" "${MAC}" "${USER_CONFIG_FILE}"
          break
        else
@@ -42,7 +42,7 @@ function getnet() {
 }

 # Get Amount of NIC
-ETHX=$(ls /sys/class/net/ 2>/dev/null | grep eth) || true
+ETHX=$(ip -o link show | awk -F': ' '{print $2}' | grep eth)
 # Get actual IP
 for N in ${ETHX}; do
  IPCON="$(getIP "${N}")"
--- a/files/initrd/opt/arc/include/storage.sh
+++ b/files/initrd/opt/arc/include/storage.sh
@@ -2,51 +2,53 @@
 function getmap() {
  # 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}))
-      done
-    fi
+  # 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 | 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}))
+    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
+  if [ $(lspci -d ::107 | wc -l) -gt 0 ]; then
+    for PCI in $(lspci -d ::107 | 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)
@@ -55,8 +57,8 @@ function getmap() {
  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
+  if [ $(lspci -d ::100 | wc -l) -gt 0 ]; then
+    for PCI in $(lspci -d ::100 | 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)
      PORTNUM=$(lsscsi -b | grep -v - | grep "\[${PORT}:" | wc -l)
@@ -65,8 +67,8 @@ function getmap() {
  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
+  if [ $(lspci -d ::104 | wc -l) -gt 0 ]; then
+    for PCI in $(lspci -d ::104 | 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)
@@ -75,8 +77,8 @@ function getmap() {
  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
+  if [[ -d "/sys/class/scsi_host" && $(ls -l /sys/class/scsi_host | grep usb | wc -l) -gt 0 ]]; then
+    for PCI in $(lspci -d ::c03 | 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)
@@ -86,9 +88,9 @@ function getmap() {
  fi
  # MMC Disks
  MMCDRIVES=0
-  if [ $(ls -l /sys/block/mmc* 2>/dev/null | wc -l) -gt 0 ]; then
+  if [[ -d "/sys/class/mmc_host" && $(ls -l /sys/class/mmc_host | grep mmc_host | wc -l) -gt 0 ]]; then
    for PCI in $(lspci -d ::805 | awk '{print $1}'); do
-      NAME=$(lspci -s "${PCI}" 2>/dev/null | sed "s/\ .*://")
+      NAME=$(lspci -s "${PCI}" | sed "s/\ .*://")
      PORTNUM=$(ls -l /sys/block/mmc* | grep "${PCI}" | wc -l 2>/dev/null)
      [ ${PORTNUM} -eq 0 ] && continue
      MMCDRIVES=$((${MMCDRIVES} + ${PORTNUM}))
@@ -96,8 +98,8 @@ function getmap() {
  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
+  if [ $(lspci -d ::108 | wc -l) -gt 0 ]; then
+    for PCI in $(lspci -d ::108 | 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)
@@ -117,7 +119,7 @@ function getmap() {
  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
+  if [ $(lspci -d ::106 | wc -l) -gt 0 ]; then
    LASTDRIVE=0
    while read -r D; do
      if [ "${BUS}" = "sata" ] && [ "${MACHINE}" != "Native" ] && [ ${D} -eq 0 ]; then
@@ -228,23 +230,25 @@ function getmapSelection() {
 }

 # Check for Controller // 104=RAID // 106=SATA // 107=SAS // 100=SCSI // c03=USB
-SATACONTROLLER=$(lspci -d ::106 2>/dev/null | wc -l)
+SATACONTROLLER=$(lspci -d ::106 | 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)
+SASCONTROLLER=$(lspci -d ::107 | 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)
+SCSICONTROLLER=$(lspci -d ::100 | 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)
+RAIDCONTROLLER=$(lspci -d ::104 | wc -l)
 writeConfigKey "device.raidcontroller" "${RAIDCONTROLLER}" "${USER_CONFIG_FILE}"
 if [ ${RAIDCONTROLLER} -gt 0 ]; then
  writeConfigKey "device.externalcontroller" "true" "${USER_CONFIG_FILE}"
-fi
+fi
+# Check Controller for Disks
+getmap
--- a/files/initrd/opt/arc/include/update.sh
+++ b/files/initrd/opt/arc/include/update.sh
@@ -43,25 +43,9 @@ function updateLoader() {
      dialog --gauge "Download Update: ${TAG}..." 14 72 4>&-
    } 4>&1
    if [ -f "${TMP_PATH}/update.zip" ] && [ $(ls -s "${TMP_PATH}/update.zip" | cut -d' ' -f1) -gt 300000 ]; then
-      HASHURL="https://github.com/AuxXxilium/arc/releases/download/${TAG}/update-${TAG}-${ARC_BRANCH}.hash"
-      HASH="$(curl -skL "${HASHURL}" | awk '{print $1}')"
-      if [ "${HASH}" != "$(sha256sum "${TMP_PATH}/update.zip" | awk '{print $1}')" ]; then
-        dialog --backtitle "$(backtitle)" --title "Update Loader" --aspect 18 \
-          --infobox "Update failed - Hash mismatch!\nTry again later." 0 0
-        sleep 3
-        exec reboot
-      else
-        rm -rf "/mnt/update"
-        mkdir -p "${TMP_PATH}/update"
-        dialog --backtitle "$(backtitle)" --title "Update Loader" \
-          --infobox "Updating Loader..." 3 50
-        if unzip -oq "${TMP_PATH}/update.zip" -d "${TMP_PATH}/update"; then
-          cp -rf "${TMP_PATH}/update"/* "/mnt"
-          rm -rf "${TMP_PATH}/update"
-          rm -f "${TMP_PATH}/update.zip"
-        fi
-      fi
-      if [ "$(cat "${PART1_PATH}/ARC-VERSION")" = "${TAG}" ]; then
+      dialog --backtitle "$(backtitle)" --title "Update Loader" \
+        --infobox "Updating Loader..." 3 50
+      if unzip -oq "${TMP_PATH}/update.zip" -d "/mnt"; then
        dialog --backtitle "$(backtitle)" --title "Update Loader" \
        --infobox "Update Loader successful!" 3 50
        sleep 2
@@ -92,13 +76,13 @@ function updateLoader() {
      --infobox "Update Loader successful! -> Reboot to automated Build Mode..." 3 60
    sleep 3
    writeConfigKey "arc.builddone" "false" "${USER_CONFIG_FILE}"
-    rebootTo automated
+    rebootTo "automated"
  else
    dialog --backtitle "$(backtitle)" --title "Update Loader" --aspect 18 \
      --infobox "Update Loader successful! -> Reboot to Config Mode..." 3 50
    sleep 3
    writeConfigKey "arc.builddone" "false" "${USER_CONFIG_FILE}"
-    rebootTo config
+    rebootTo "config"
  fi
 }

--- a/files/initrd/opt/arc/init.sh
+++ b/files/initrd/opt/arc/init.sh
@@ -8,10 +8,6 @@ set -e
 # Get Loader Disk Bus
 [ -z "${LOADER_DISK}" ] && die "Loader Disk not found!"
 checkBootLoader || die "The loader is corrupted, please rewrite it!"
-
-[ -f "${HOME}/.initialized" ] && exec arc.sh || true
-[ -f "${USER_CONFIG_FILE}" ] && sed -i "s/'/\"/g" "${USER_CONFIG_FILE}" >/dev/null 2>&1 || true
-
 BUS=$(getBus "${LOADER_DISK}")
 EFI=$([ -d /sys/firmware/efi ] && echo 1 || echo 0)

@@ -42,20 +38,15 @@ initConfigKey "arc.confdone" "false" "${USER_CONFIG_FILE}"
 initConfigKey "arc.dynamic" "false" "${USER_CONFIG_FILE}"
 initConfigKey "arc.offline" "false" "${USER_CONFIG_FILE}"
 initConfigKey "arc.patch" "false" "${USER_CONFIG_FILE}"
-initConfigKey "arc.hardwareid" "" "${USER_CONFIG_FILE}"
-initConfigKey "arc.userid" "" "${USER_CONFIG_FILE}"
 initConfigKey "arc.version" "${ARC_VERSION}" "${USER_CONFIG_FILE}"
-initConfigKey "bootscreen" "{}" "${USER_CONFIG_FILE}"
-initConfigKey "bootscreen.dsminfo" "true" "${USER_CONFIG_FILE}"
-initConfigKey "bootscreen.systeminfo" "true" "${USER_CONFIG_FILE}"
-initConfigKey "bootscreen.diskinfo" "false" "${USER_CONFIG_FILE}"
-initConfigKey "bootscreen.hwidinfo" "false" "${USER_CONFIG_FILE}"
-initConfigKey "bootscreen.dsmlogo" "true" "${USER_CONFIG_FILE}"
+initConfigKey "boot" "{}" "${USER_CONFIG_FILE}"
+initConfigKey "boot.dsminfo" "true" "${USER_CONFIG_FILE}"
+initConfigKey "boot.systeminfo" "true" "${USER_CONFIG_FILE}"
+initConfigKey "boot.dsmlogo" "true" "${USER_CONFIG_FILE}"
 initConfigKey "bootipwait" "30" "${USER_CONFIG_FILE}"
 initConfigKey "device" "{}" "${USER_CONFIG_FILE}"
 initConfigKey "directboot" "false" "${USER_CONFIG_FILE}"
 initConfigKey "emmcboot" "false" "${USER_CONFIG_FILE}"
-initConfigKey "governor" "performance" "${USER_CONFIG_FILE}"
 initConfigKey "hddsort" "false" "${USER_CONFIG_FILE}"
 initConfigKey "kernel" "official" "${USER_CONFIG_FILE}"
 initConfigKey "kernelload" "power" "${USER_CONFIG_FILE}"
@@ -82,7 +73,7 @@ initConfigKey "rd-compressed" "false" "${USER_CONFIG_FILE}"
 initConfigKey "satadom" "2" "${USER_CONFIG_FILE}"
 initConfigKey "synoinfo" "{}" "${USER_CONFIG_FILE}"
 initConfigKey "time" "{}" "${USER_CONFIG_FILE}"
-initConfigKey "usbmount" "false" "${USER_CONFIG_FILE}"
+initConfigKey "usbmount" "auto" "${USER_CONFIG_FILE}"
 initConfigKey "zimage-hash" "" "${USER_CONFIG_FILE}"
 if grep -q "automated_arc" /proc/cmdline; then
  writeConfigKey "arc.mode" "automated" "${USER_CONFIG_FILE}"
@@ -102,9 +93,9 @@ if arrayExistItem "sortnetif:" $(readConfigMap "addons" "${USER_CONFIG_FILE}");
  _sort_netif "$(readConfigKey "addons.sortnetif" "${USER_CONFIG_FILE}")"
 fi
 # Read/Write IP/Mac to config
-ETHX=$(ls /sys/class/net/ 2>/dev/null | grep eth) || true
+ETHX=$(ip -o link show | awk -F': ' '{print $2}' | grep eth)
  for N in ${ETHX}; do
-    MACR="$(cat /sys/class/net/${N}/address 2>/dev/null | sed 's/://g' | tr '[:upper:]' '[:lower:]')"
+    MACR="$(cat /sys/class/net/${N}/address 2>/dev/null | sed 's/://g')"
    IPR="$(readConfigKey "network.${MACR}" "${USER_CONFIG_FILE}")"
    if [ -n "${IPR}" ] && [ "1" = "$(cat /sys/class/net/${N}/carrier 2>/dev/null)" ]; then
      IFS='/' read -r -a IPRA <<<"${IPR}"
@@ -121,7 +112,7 @@ ETHX=$(ls /sys/class/net/ 2>/dev/null | grep eth) || true
    fi
    [ "${N::3}" = "eth" ] && ethtool -s "${N}" wol g 2>/dev/null || true
    # [ "${N::3}" = "eth" ] && ethtool -K ${N} rxhash off 2>/dev/null || true
-    initConfigKey "${N}" "${MACR}" "${USER_CONFIG_FILE}"
+    initConfigKey "${ETH}" "${MACR}" "${USER_CONFIG_FILE}"
  done
 ETHN=$(echo ${ETHX} | wc -w)
 writeConfigKey "device.nic" "${ETHN}" "${USER_CONFIG_FILE}"
@@ -135,8 +126,8 @@ PID="0x0001"

 BUSLIST="usb sata sas scsi nvme mmc ide virtio vmbus xen"
 if [ "${BUS}" = "usb" ]; then
-  VID="0x$(udevadm info --query property --name "${LOADER_DISK}" 2>/dev/null | grep "ID_VENDOR_ID" | cut -d= -f2)"
-  PID="0x$(udevadm info --query property --name "${LOADER_DISK}" 2>/dev/null | grep "ID_MODEL_ID" | cut -d= -f2)"
+  VID="0x$(udevadm info --query property --name "${LOADER_DISK}" | grep ID_VENDOR_ID | cut -d= -f2)"
+  PID="0x$(udevadm info --query property --name "${LOADER_DISK}" | grep ID_MODEL_ID | cut -d= -f2)"
 elif ! echo "${BUSLIST}" | grep -wq "${BUS}"; then
  die "$(printf "The boot disk does not support the current %s, only %s are supported." "${BUS}" "${BUSLIST// /\/}")"
 fi
@@ -161,7 +152,11 @@ elif [ "${ARCMODE}" = "update" ]; then
  echo -e "\033[1;34mStarting Update Mode...\033[0m"
 elif [ "${BUILDDONE}" = "true" ] && [ "${ARCMODE}" = "dsm" ]; then
  echo -e "\033[1;34mStarting DSM Mode...\033[0m"
-  exec boot.sh && exit 0
+  if [ -f "${ARC_PATH}/boot.sh" ]; then
+    exec boot.sh && exit 0
+  else
+    echo -e "\033[1;31mError: Can't find Arc System Files...\033[0m"
+  fi
 else
  echo -e "\033[1;34mStarting Config Mode...\033[0m"
 fi
@@ -215,19 +210,17 @@ mkdir -p "${MODULES_PATH}"
 mkdir -p "${PATCH_PATH}"
 mkdir -p "${USER_UP_PATH}"

-# Tell webterminal that the loader is ready
-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}:${TTYDPORT}\033[0m to configure Loader."

 # Check memory and load Arc
 RAM=$(awk '/MemTotal:/ {printf "%.0f", $2 / 1024}' /proc/meminfo 2>/dev/null)
 if [ ${RAM} -le 3500 ]; then
  echo -e "\033[1;31mYou have less than 4GB of RAM, if errors occur in loader creation, please increase the amount of RAM.\033[0m\n\033[1;31mUse arc.sh to proceed. Not recommended!\033[0m"
 else
-  exec arc.sh
+  arc.sh
 fi
+
 exit 0
--- a/files/initrd/opt/arc/kpatch
+++ b/files/initrd/opt/arc/kpatch
--- a/files/initrd/opt/arc/ramdisk-patch.sh
+++ b/files/initrd/opt/arc/ramdisk-patch.sh
@@ -93,21 +93,21 @@ while IFS=': ' read -r KEY VALUE; do
 done < <(readConfigMap "modules" "${USER_CONFIG_FILE}")

 # Patches (diff -Naru OLDFILE NEWFILE > xxx.patch)
-PATCHS=(
-  "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
+PATCHES=()
+PATCHES+=("ramdisk-etc-rc-*.patch")
+PATCHES+=("ramdisk-init-script-*.patch")
+PATCHES+=("ramdisk-post-init-script-*.patch")
+PATCHES+=("ramdisk-disable-root-pwd-*.patch")
+PATCHES+=("ramdisk-disable-disabled-ports-*.patch")
+for PE in ${PATCHES[@]}; 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
+    (
+      cd "${RAMDISK_PATH}"
+      busybox patch -p1 -i "${PF}" >>"${LOG_FILE}" 2>&1 # busybox patch and gun patch have different processing methods and parameters.
+    )
    RET=$?
    [ ${RET} -eq 0 ] && break
  done
@@ -128,17 +128,13 @@ done
 grep -v -e '^[\t ]*#' -e '^$' "${PATCH_PATH}/config-manipulators.sh" >"${TMP_PATH}/rp.txt"
 sed -e "/@@@CONFIG-MANIPULATORS-TOOLS@@@/ {" -e "r ${TMP_PATH}/rp.txt" -e 'd' -e '}' -i "${RAMDISK_PATH}/sbin/init.post"
 rm -f "${TMP_PATH}/rp.txt"
-
-# Generate synoinfo configurations
-{
-  echo "_set_conf_kv 'SN' '${SN}' '/tmpRoot/etc/synoinfo.conf'"
-  echo "_set_conf_kv 'SN' '${SN}' '/tmpRoot/etc.defaults/synoinfo.conf'"
-  for KEY in "${!SYNOINFO[@]}"; do
-    echo "_set_conf_kv '${KEY}' '${SYNOINFO[${KEY}]}' '/tmpRoot/etc/synoinfo.conf'"
-    echo "_set_conf_kv '${KEY}' '${SYNOINFO[${KEY}]}' '/tmpRoot/etc.defaults/synoinfo.conf'"
-  done
-} >"${TMP_PATH}/rp.txt"
-
+touch "${TMP_PATH}/rp.txt"
+echo "_set_conf_kv 'SN' '${SN}' '/tmpRoot/etc/synoinfo.conf'" >>"${TMP_PATH}/rp.txt"
+echo "_set_conf_kv 'SN' '${SN}' '/tmpRoot/etc.defaults/synoinfo.conf'" >>"${TMP_PATH}/rp.txt"
+for KEY in ${!SYNOINFO[@]}; do
+  echo "_set_conf_kv '${KEY}' '${SYNOINFO[${KEY}]}' '/tmpRoot/etc/synoinfo.conf'" >>"${TMP_PATH}/rp.txt"
+  echo "_set_conf_kv '${KEY}' '${SYNOINFO[${KEY}]}' '/tmpRoot/etc.defaults/synoinfo.conf'" >>"${TMP_PATH}/rp.txt"
+done
 sed -e "/@@@CONFIG-GENERATED@@@/ {" -e "r ${TMP_PATH}/rp.txt" -e 'd' -e '}' -i "${RAMDISK_PATH}/sbin/init.post"
 rm -f "${TMP_PATH}/rp.txt"

@@ -153,22 +149,20 @@ gzip -dc "${LKMS_PATH}/rp-${PLATFORM}-${KVERP}-${LKM}.ko.gz" >"${RAMDISK_PATH}/u
 # Addons
 echo "Create addons.sh" >"${LOG_FILE}"
 mkdir -p "${RAMDISK_PATH}/addons"
-{
-  echo "#!/bin/sh"
-  echo 'echo "addons.sh called with params ${@}"'
-  echo "export LOADERLABEL=\"ARC\""
-  echo "export LOADERVERSION=\"${ARC_VERSION}\""
-  echo "export LOADERBUILD=\"${ARC_BUILD}\""
-  echo "export LOADERBRANCH=\"${ARCBRANCH}\""
-  echo "export PLATFORM=\"${PLATFORM}\""
-  echo "export MODEL=\"${MODEL}\""
-  echo "export MODELID=\"${MODELID}\""
-  echo "export PRODUCTVER=\"${PRODUCTVER}\""
-  echo "export MLINK=\"${PAT_URL}\""
-  echo "export MCHECKSUM=\"${PAT_HASH}\""
-  echo "export LAYOUT=\"${LAYOUT:-qwerty}\""
-  echo "export KEYMAP=\"${KEYMAP:-en}\""
-} >"${RAMDISK_PATH}/addons/addons.sh"
+echo "#!/bin/sh" >"${RAMDISK_PATH}/addons/addons.sh"
+echo 'echo "addons.sh called with params ${@}"' >>"${RAMDISK_PATH}/addons/addons.sh"
+echo "export LOADERLABEL=\"ARC\"" >>"${RAMDISK_PATH}/addons/addons.sh"
+echo "export LOADERVERSION=\"${ARC_VERSION}\"" >>"${RAMDISK_PATH}/addons/addons.sh"
+echo "export LOADERBUILD=\"${ARC_BUILD}\"" >>"${RAMDISK_PATH}/addons/addons.sh"
+echo "export LOADERBRANCH=\"${ARCBRANCH}\"" >>"${RAMDISK_PATH}/addons/addons.sh"
+echo "export PLATFORM=\"${PLATFORM}\"" >>"${RAMDISK_PATH}/addons/addons.sh"
+echo "export PRODUCTVER=\"${PRODUCTVER}\"" >>"${RAMDISK_PATH}/addons/addons.sh"
+echo "export MODEL=\"${MODEL}\"" >>"${RAMDISK_PATH}/addons/addons.sh"
+echo "export MODELID=\"${MODELID}\"" >>"${RAMDISK_PATH}/addons/addons.sh"
+echo "export MLINK=\"${PAT_URL}\"" >>"${RAMDISK_PATH}/addons/addons.sh"
+echo "export MCHECKSUM=\"${PAT_HASH}\"" >>"${RAMDISK_PATH}/addons/addons.sh"
+echo "export LAYOUT=\"${LAYOUT}\"" >>"${RAMDISK_PATH}/addons/addons.sh"
+echo "export KEYMAP=\"${KEYMAP}\"" >>"${RAMDISK_PATH}/addons/addons.sh"
 chmod +x "${RAMDISK_PATH}/addons/addons.sh"

 # System Addons
@@ -176,7 +170,8 @@ for ADDON in "redpill" "revert" "misc" "eudev" "disks" "localrss" "notify" "wol"
  PARAMS=""
  if [ "${ADDON}" = "disks" ]; then
    HDDSORT="$(readConfigKey "hddsort" "${USER_CONFIG_FILE}")"
-    PARAMS="${HDDSORT}"
+    USBMOUNT="$(readConfigKey "usbmount" "${USER_CONFIG_FILE}")"
+    PARAMS="${HDDSORT} ${USBMOUNT}"
    [ -f "${USER_UP_PATH}/${MODEL}.dts" ] && cp -f "${USER_UP_PATH}/${MODEL}.dts" "${RAMDISK_PATH}/addons/model.dts"
  fi
  installAddon "${ADDON}" "${PLATFORM}" || exit 1
--- a/files/initrd/opt/arc/vmlinux-to-bzImage.sh
+++ b/files/initrd/opt/arc/vmlinux-to-bzImage.sh
@@ -3,36 +3,11 @@

 [[ -z "${ARC_PATH}" || ! -d "${ARC_PATH}/include" ]] && ARC_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" 2>/dev/null && pwd)"

-calculate_run_size() {
-  NUM='\([0-9a-fA-F]*[ \t]*\)'
-  OUT=$(sed -n 's/^[ \t0-9]*.b[sr][sk][ \t]*'"${NUM}${NUM}${NUM}${NUM}"'.*/0x\1 0x\4/p')
+. "${ARC_PATH}/include/functions.sh"

-  if [ -z "${OUT}" ]; then
-    echo "Never found .bss or .brk file offset" >&2
-    return 1
-  fi
-
-  read -r sizeA offsetA sizeB offsetB <<<$(echo ${OUT} | awk '{printf "%d %d %d %d", strtonum($1), strtonum($2), strtonum($3), strtonum($4)}')
-
-  runSize=$((offsetA + sizeA + sizeB))
-
-  # BFD linker shows the same file offset in ELF.
-  if [ "${offsetA}" -ne "${offsetB}" ]; then
-    # Gold linker shows them as consecutive.
-    endSize=$((offsetB + sizeB))
-    if [ "${endSize}" -ne "${runSize}" ]; then
-      printf "sizeA: 0x%x\n" ${sizeA} >&2
-      printf "offsetA: 0x%x\n" ${offsetA} >&2
-      printf "sizeB: 0x%x\n" ${sizeB} >&2
-      printf "offsetB: 0x%x\n" ${offsetB} >&2
-      echo ".bss and .brk are non-contiguous" >&2
-      return 1
-    fi
-  fi
-
-  printf "%d\n" ${runSize}
-  return 0
-}
+PLATFORM="$(readConfigKey "platform" "${USER_CONFIG_FILE}")"
+PRODUCTVER="$(readConfigKey "productver" "${USER_CONFIG_FILE}")"
+KVER="$(readConfigKey "platforms.${PLATFORM}.productvers.\"${PRODUCTVER}\".kver" "${P_FILE}")"

 # Adapted from: scripts/Makefile.lib
 # Usage: size_append FILE [FILE2] [FILEn]...
@@ -59,8 +34,6 @@ size_le() {

 VMLINUX_MOD=${1}
 ZIMAGE_MOD=${2}
-
-KVER=$(strings "${VMLINUX_MOD}" | grep -Eo "Linux version [0-9]+\.[0-9]+\.[0-9]+" | head -1 | awk '{print $3}')
 if [ "$(echo "${KVER:-4}" | cut -d'.' -f1)" -lt 5 ]; then
  # Kernel version 4.x or 3.x (bromolow)
  # zImage_head           16494
@@ -83,7 +56,7 @@ if [ "$(echo "${KVER:-4}" | cut -d'.' -f1)" -lt 5 ]; then
  file_size_le "${VMLINUX_MOD}" | dd of="${ZIMAGE_MOD}" bs=15745134 seek=1 conv=notrunc || exit 1
  file_size_le "${VMLINUX_MOD}" | dd of="${ZIMAGE_MOD}" bs=15745244 seek=1 conv=notrunc || exit 1

-  RUN_SIZE=$(objdump -h "${VMLINUX_MOD}" | calc_run_size)
+  RUN_SIZE=$(objdump -h "${VMLINUX_MOD}" | sh "${ARC_PATH}/calc_run_size.sh")
  size_le "${RUN_SIZE}" | dd of="${ZIMAGE_MOD}" bs=15745210 seek=1 conv=notrunc || exit 1
  size_le "$((16#$(crc32 "${ZIMAGE_MOD}" | awk '{print $1}') ^ 0xFFFFFFFF))" | dd of="${ZIMAGE_MOD}" conv=notrunc oflag=append || exit 1
 else
@@ -93,7 +66,7 @@ else
  dd if="${VMLINUX_MOD}" of="${ZIMAGE_MOD}" bs=14561 seek=1 conv=notrunc || exit 1
  file_size_le "${VMLINUX_MOD}" | dd of="${ZIMAGE_MOD}" bs=34463421 seek=1 conv=notrunc || exit 1
  file_size_le "${VMLINUX_MOD}" | dd of="${ZIMAGE_MOD}" bs=34479132 seek=1 conv=notrunc || exit 1
-  #  RUN_SIZE=$(objdump -h "${VMLINUX_MOD}" | calc_run_size)
+  #  RUN_SIZE=$(objdump -h "${VMLINUX_MOD}" | sh "${ARC_PATH}/calc_run_size.sh")
  #  size_le "${RUN_SIZE}" | dd of="${ZIMAGE_MOD}" bs=34626904 seek=1 conv=notrunc || exit 1
  size_le "$((16#$(crc32 "${ZIMAGE_MOD}" | awk '{print $1}') ^ 0xFFFFFFFF))" | dd of="${ZIMAGE_MOD}" conv=notrunc oflag=append || exit 1
 fi
--- a/files/p1/boot/grub/grub.cfg
+++ b/files/p1/boot/grub/grub.cfg
@@ -1,13 +1,27 @@
+insmod search
+insmod echo
+insmod terminal
+insmod test
+insmod font
+insmod loadenv
+insmod serial
+insmod usb_keyboard
+insmod linux
+insmod gzio
+insmod fat
+insmod ext2
+insmod ata
+insmod btrfs
+insmod part_msdos
+insmod part_gpt
+
 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
+if [ -s $prefix/grubenv ]; then
+  load_env
 fi
 if [ "${next_entry}" ]; then
  set default="${next_entry}"
@@ -18,26 +32,25 @@ 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
-fi
-
-if loadfont unicode; then
-  if [ "${grub_platform}" = "efi" ]; then
-    set gfxmode=auto
+function load_video {
+  if [ x$feature_all_video_module = xy ]; then
+    insmod all_video
  else
-    set gfxmode=1024x768
+    insmod efi_gop
+    insmod efi_uga
+    insmod ieee1275_fb
+    insmod vbe
+    insmod vga
+    insmod video_bochs
+    insmod video_cirrus
  fi
+}
+
+load_video
+if loadfont unicode; then
+  insmod gfxterm
+  set gfxmode=1024x768
+  set gfxpayload=auto
  terminal_output gfxterm
  insmod gfxmenu
  loadfont ${prefix}/theme/dejavu_bold_14.pf2
@@ -47,9 +60,9 @@ if loadfont unicode; then
  export theme
 fi

-if serial --unit=0 --speed=115200 --word=8 --parity=no --stop=1; then
-  terminal_input --append serial
-  terminal_output --append serial
+if serial --unit=0 --speed=115200; then
+  terminal_input --append serial_com0
+  terminal_output --append serial_com0
 fi

 function set_gfxpayload {
@@ -60,7 +73,11 @@ function set_gfxpayload {
  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"
+set menu_color_normal=white/black
+set menu_color_highlight=white/red
+set color_normal=white/black
+
+set ARC_CMDLINE="earlyprintk earlycon=uart8250,io,0x3f8,115200n8 console=ttyS0,115200n8 root=/dev/ram rootwait nointremap net.ifnames=0 panic=5 split_lock_detect=off pcie_aspm=off intel_pstate=passive nox2apic nomodeset"

 search --set=root --label "ARC3"
 if [ -s /zImage-dsm -a -s /initrd-dsm ]; then
@@ -166,11 +183,6 @@ menuentry 'Start Memtest86+' --id memtest {
  linux ${prefix}/memtest 
 }

-menuentry 'Poweroff' --id poweroff {
-  echo "System is powering off..."
-  halt
-}
-
 if [ ${vesa_mode} = 1 ]; then
  menuentry 'Change Vesa to Text Output' --id videomode {
    set vesa_mode=0
--- a/files/p3/extractor/libcurl.so.4
+++ b/files/p3/extractor/libcurl.so.4
--- a/files/p3/extractor/libmbedcrypto.so.5
+++ b/files/p3/extractor/libmbedcrypto.so.5
--- a/files/p3/extractor/libmbedtls.so.13
+++ b/files/p3/extractor/libmbedtls.so.13
--- a/files/p3/extractor/libmbedx509.so.1
+++ b/files/p3/extractor/libmbedx509.so.1
--- a/files/p3/extractor/libmsgpackc.so.2
+++ b/files/p3/extractor/libmsgpackc.so.2
--- a/files/p3/extractor/libsodium.so
+++ b/files/p3/extractor/libsodium.so
--- a/files/p3/extractor/libsynocodesign-ng-virtual-junior-wins.so.7
+++ b/files/p3/extractor/libsynocodesign-ng-virtual-junior-wins.so.7
--- a/files/p3/extractor/syno_extract_system_patch
+++ b/files/p3/extractor/syno_extract_system_patch
--- a/img-gen-n.sh
+++ b/img-gen-n.sh
@@ -1,10 +1,4 @@
 #!/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

@@ -13,10 +7,6 @@ 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"
@@ -31,8 +21,8 @@ mkdir -p "brx"
 [ ! -f "../brx/bzImage" ] && getBuildrootx "brx" || copyBuildroot "brx"

 # 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)
@@ -47,8 +37,8 @@ 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"
+ARC_VERSION="13.37.dev"
+ARC_BRANCH="next"
 echo "${ARC_BUILD}" >files/p1/ARC-BUILD
 echo "${ARC_VERSION}" >files/p1/ARC-VERSION
 echo "${ARC_BRANCH}" >files/p1/ARC-BRANCH
@@ -58,6 +48,8 @@ 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
+    sudo umount "/tmp/p1"
+    sudo umount "/tmp/p3"
    exit 1
 fi

@@ -69,14 +61,9 @@ sync
 echo "Unmount image file"
 sudo umount "/tmp/p1"
 sudo umount "/tmp/p3"
-sudo rm -rf "/tmp/p1"
-sudo rm -rf "/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}"
-
-IMAGE_FILE="arc.img"
 qemu-img convert -p -f raw -o subformat=monolithicFlat -O vmdk ${IMAGE_FILE} arc.vmdk
--- a/img-gen-s.sh
+++ b/img-gen-s.sh
@@ -1,10 +1,4 @@
 #!/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

@@ -13,10 +7,6 @@ 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"
@@ -30,8 +20,8 @@ getOffline "files/p3/configs"
 [ -f "../brs/bzImage" ] && copyBuildroot "brs" || getBuildroots "brs"

 # 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)
@@ -46,8 +36,8 @@ 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="minimal"
+ARC_VERSION="13.37.dev"
+ARC_BRANCH="stable"
 echo "${ARC_BUILD}" >files/p1/ARC-BUILD
 echo "${ARC_VERSION}" >files/p1/ARC-VERSION
 echo "${ARC_BRANCH}" >files/p1/ARC-BRANCH
@@ -57,6 +47,8 @@ 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"
 else
+    sudo umount "/tmp/p1"
+    sudo umount "/tmp/p3"
    exit 1
 fi

@@ -68,14 +60,9 @@ sync
 echo "Unmount image file"
 sudo umount "/tmp/p1"
 sudo umount "/tmp/p3"
-sudo rm -rf "/tmp/p1"
-sudo rm -rf "/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}"
-
-IMAGE_FILE="arc.img"
 qemu-img convert -p -f raw -o subformat=monolithicFlat -O vmdk ${IMAGE_FILE} arc.vmdk
--- a/kpatch/kpatch
+++ b/kpatch/kpatch
--- a/kpatch/main.c
+++ b/kpatch/main.c
@@ -489,4 +489,4 @@ int main(int argc, char *argv[])
    close(fd);
    printf("Finish!\n");
    return 0;
-}
+}
--- a/scripts/func.sh
+++ b/scripts/func.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 #
-# Copyright (C) 2025 AuxXxilium <https://github.com/AuxXxilium>
-#
+# Copyright (C) 2024 AuxXxilium <https://github.com/AuxXxilium>
+# 
 # This is free software, licensed under the MIT License.
 # See /LICENSE for more information.
 #
@@ -15,21 +15,19 @@ function getLKMs() {
  local DEST_PATH="${1}"
  local CACHE_FILE="/tmp/rp-lkms.zip"
  rm -f "${CACHE_FILE}"
-  TAG=$(curl -skL -H "Authorization: token ${TOKEN}" "https://api.github.com/repos/AuxXxilium/arc-lkm/releases" | jq -r ".[].tag_name" | sort -rV | head -1)
+  TAG="$(curl -s "https://api.github.com/repos/AuxXxilium/arc-lkm/releases/latest" | grep -oP '"tag_name": "\K(.*)(?=")')"
  export LKMTAG="${TAG}"
-  while read -r ID NAME; do
-    if [ "${NAME}" = "rp-lkms.zip" ]; then
-      curl -kL -H "Authorization: token ${TOKEN}" -H "Accept: application/octet-stream" "https://api.github.com/repos/AuxXxilium/arc-lkm/releases/assets/${ID}" -o "${CACHE_FILE}"
-      # Unzip LKMs
-      rm -rf "${DEST_PATH}"
-      mkdir -p "${DEST_PATH}"
-      if unzip -o "${CACHE_FILE}" -d "${DEST_PATH}"; then
-        rm -f "${CACHE_FILE}"
-        echo "Getting LKMs end - ${TAG}"
-        break
-      fi
-    fi
-  done < <(curl -skL -H "Authorization: token ${TOKEN}" "https://api.github.com/repos/AuxXxilium/arc-lkm/releases/tags/${TAG}" | jq -r '.assets[] | "\(.id) \(.name)"')
+  if curl -skL "https://github.com/AuxXxilium/arc-lkm/releases/download/${TAG}/rp-lkms.zip" -o "${CACHE_FILE}"; then
+    # Unzip LKMs
+    rm -rf "${DEST_PATH}"
+    mkdir -p "${DEST_PATH}"
+    unzip -o "${CACHE_FILE}" -d "${DEST_PATH}"
+    rm -f "${CACHE_FILE}"
+    echo "Getting LKMs end - ${TAG}"
+  else
+    echo "Failed to get LKMs"
+    exit 1
+  fi
 }

 # Get latest Addons
@@ -39,31 +37,28 @@ function getAddons() {
  local DEST_PATH="${1}"
  local CACHE_DIR="/tmp/addons"
  local CACHE_FILE="/tmp/addons.zip"
-  rm -f "${CACHE_FILE}"
-  TAG=$(curl -skL -H "Authorization: token ${TOKEN}" "https://api.github.com/repos/AuxXxilium/arc-addons/releases" | jq -r ".[].tag_name" | sort -rV | head -1)
+  TAG="$(curl -s https://api.github.com/repos/AuxXxilium/arc-addons/releases/latest | grep -oP '"tag_name": "\K(.*)(?=")')"
  export ADDONTAG="${TAG}"
-  while read -r ID NAME; do
-    if [ "${NAME}" = "addons-${TAG}.zip" ]; then
-      curl -kL -H "Authorization: token ${TOKEN}" -H "Accept: application/octet-stream" "https://api.github.com/repos/AuxXxilium/arc-addons/releases/assets/${ID}" -o "${CACHE_FILE}"
-      # Unzip Addons
-      rm -rf "${CACHE_DIR}"
-      mkdir -p "${CACHE_DIR}"
-      mkdir -p "${DEST_PATH}"
-      if unzip -o "${CACHE_FILE}" -d "${CACHE_DIR}"; then
-        echo "Installing Addons to ${DEST_PATH}"
-        [ -f /tmp/addons/VERSION ] && cp -f /tmp/addons/VERSION ${DEST_PATH}/
-        for PKG in $(ls ${CACHE_DIR}/*.addon); do
-          ADDON=$(basename "${PKG}" .addon)
-          mkdir -p "${DEST_PATH}/${ADDON}"
-          echo "Extracting ${PKG} to ${DEST_PATH}/${ADDON}"
-          tar -xaf "${PKG}" -C "${DEST_PATH}/${ADDON}"
-        done
-        rm -f "${CACHE_FILE}"
-        echo "Getting Addons end - ${TAG}"
-        break
-      fi
-    fi
-  done < <(curl -skL -H "Authorization: token ${TOKEN}" "https://api.github.com/repos/AuxXxilium/arc-addons/releases/tags/${TAG}" | jq -r '.assets[] | "\(.id) \(.name)"')
+  if curl -skL "https://github.com/AuxXxilium/arc-addons/releases/download/${TAG}/addons-${TAG}.zip" -o "${CACHE_FILE}"; then
+    # Unzip Addons
+    rm -rf "${CACHE_DIR}"
+    mkdir -p "${CACHE_DIR}"
+    mkdir -p "${DEST_PATH}"
+    unzip -o "${CACHE_FILE}" -d "${CACHE_DIR}"
+    echo "Installing Addons to ${DEST_PATH}"
+    [ -f /tmp/addons/VERSION ] && cp -f /tmp/addons/VERSION ${DEST_PATH}/
+    for PKG in $(ls ${CACHE_DIR}/*.addon); do
+      ADDON=$(basename "${PKG}" .addon)
+      mkdir -p "${DEST_PATH}/${ADDON}"
+      echo "Extracting ${PKG} to ${DEST_PATH}/${ADDON}"
+      tar -xaf "${PKG}" -C "${DEST_PATH}/${ADDON}"
+    done
+    rm -f "${CACHE_FILE}"
+    echo "Getting Addons end - ${TAG}"
+  else
+    echo "Failed to get Addons"
+    exit 1
+  fi
 }

 # Get latest Modules
@@ -73,21 +68,18 @@ function getModules() {
  local DEST_PATH="${1}"
  local CACHE_FILE="/tmp/modules.zip"
  rm -f "${CACHE_FILE}"
-  TAG=$(curl -skL -H "Authorization: token ${TOKEN}" "https://api.github.com/repos/AuxXxilium/arc-modules/releases" | jq -r ".[].tag_name" | sort -rV | head -1)
+  TAG="$(curl -s https://api.github.com/repos/AuxXxilium/arc-modules/releases/latest | grep -oP '"tag_name": "\K(.*)(?=")')"
  export MODULETAG="${TAG}"
-  while read -r ID NAME; do
-    if [ "${NAME}" = "modules-${TAG}.zip" ]; then
-      curl -kL -H "Authorization: token ${TOKEN}" -H "Accept: application/octet-stream" "https://api.github.com/repos/AuxXxilium/arc-modules/releases/assets/${ID}" -o "${CACHE_FILE}"
-      # Unzip Modules
-      rm -rf "${DEST_PATH}"
-      mkdir -p "${DEST_PATH}"
-      if unzip -o "${CACHE_FILE}" -d "${DEST_PATH}"; then
-        rm -f "${CACHE_FILE}"
-        echo "Getting Modules end - ${TAG}"
-        break
-      fi
-    fi
-  done < <(curl -skL -H "Authorization: token ${TOKEN}" "https://api.github.com/repos/AuxXxilium/arc-modules/releases/tags/${TAG}" | jq -r '.assets[] | "\(.id) \(.name)"')
+  if curl -skL "https://github.com/AuxXxilium/arc-modules/releases/download/${TAG}/modules-${TAG}.zip" -o "${CACHE_FILE}"; then
+    # Unzip Modules
+    rm -rf "${DEST_PATH}"
+    mkdir -p "${DEST_PATH}"
+    unzip -o "${CACHE_FILE}" -d "${DEST_PATH}"
+    echo "Getting Modules end - ${TAG}"
+  else
+    echo "Failed to get Modules"
+    exit 1
+  fi
 }

 # Get latest Configs
@@ -97,21 +89,19 @@ function getConfigs() {
  local DEST_PATH="${1}"
  local CACHE_FILE="/tmp/configs.zip"
  rm -f "${CACHE_FILE}"
-  TAG=$(curl -skL -H "Authorization: token ${TOKEN}" "https://api.github.com/repos/AuxXxilium/arc-configs/releases" | jq -r ".[].tag_name" | sort -rV | head -1)
+  TAG="$(curl -s https://api.github.com/repos/AuxXxilium/arc-configs/releases/latest | grep -oP '"tag_name": "\K(.*)(?=")')"
  export CONFIGTAG="${TAG}"
-  while read -r ID NAME; do
-    if [ "${NAME}" = "configs-${TAG}.zip" ]; then
-      curl -kL -H "Authorization: token ${TOKEN}" -H "Accept: application/octet-stream" "https://api.github.com/repos/AuxXxilium/arc-configs/releases/assets/${ID}" -o "${CACHE_FILE}"
-      # Unzip Configs
-      rm -rf "${DEST_PATH}"
-      mkdir -p "${DEST_PATH}"
-      if unzip -o "${CACHE_FILE}" -d "${DEST_PATH}"; then
-        rm -f "${CACHE_FILE}"
-        echo "Getting Configs end - ${TAG}"
-        break
-      fi
-    fi
-  done < <(curl -skL -H "Authorization: token ${TOKEN}" "https://api.github.com/repos/AuxXxilium/arc-configs/releases/tags/${TAG}" | jq -r '.assets[] | "\(.id) \(.name)"')
+  if curl -skL "https://github.com/AuxXxilium/arc-configs/releases/download/${TAG}/configs-${TAG}.zip" -o "${CACHE_FILE}"; then
+    # Unzip Configs
+    rm -rf "${DEST_PATH}"
+    mkdir -p "${DEST_PATH}"
+    unzip -o "${CACHE_FILE}" -d "${DEST_PATH}"
+    rm -f "${CACHE_FILE}"
+    echo "Getting Configs end - ${TAG}"
+  else
+    echo "Failed to get Configs"
+    exit 1
+  fi
 }

 # Get latest Patches
@@ -121,21 +111,19 @@ function getPatches() {
  local DEST_PATH="${1}"
  local CACHE_FILE="/tmp/patches.zip"
  rm -f "${CACHE_FILE}"
-  TAG=$(curl -skL -H "Authorization: token ${TOKEN}" "https://api.github.com/repos/AuxXxilium/arc-patches/releases" | jq -r ".[].tag_name" | sort -rV | head -1)
+  TAG="$(curl -s https://api.github.com/repos/AuxXxilium/arc-patches/releases/latest | grep -oP '"tag_name": "\K(.*)(?=")')"
  export PATCHTAG="${TAG}"
-  while read -r ID NAME; do
-    if [ "${NAME}" = "patches-${TAG}.zip" ]; then
-      curl -kL -H "Authorization: token ${TOKEN}" -H "Accept: application/octet-stream" "https://api.github.com/repos/AuxXxilium/arc-patches/releases/assets/${ID}" -o "${CACHE_FILE}"
-      # Unzip Patches
-      rm -rf "${DEST_PATH}"
-      mkdir -p "${DEST_PATH}"
-      if unzip -o "${CACHE_FILE}" -d "${DEST_PATH}"; then
-        rm -f "${CACHE_FILE}"
-        echo "Getting Patches end - ${TAG}"
-        break
-      fi
-    fi
-  done < <(curl -skL -H "Authorization: token ${TOKEN}" "https://api.github.com/repos/AuxXxilium/arc-patches/releases/tags/${TAG}" | jq -r '.assets[] | "\(.id) \(.name)"')
+  if curl -skL "https://github.com/AuxXxilium/arc-patches/releases/download/${TAG}/patches-${TAG}.zip" -o "${CACHE_FILE}"; then
+    # Unzip Patches
+    rm -rf "${DEST_PATH}"
+    mkdir -p "${DEST_PATH}"
+    unzip -o "${CACHE_FILE}" -d "${DEST_PATH}"
+    rm -f "${CACHE_FILE}"
+    echo "Getting Patches end - ${TAG}"
+  else
+    echo "Failed to get Patches"
+    exit 1
+  fi
 }

 # Get latest Custom
@@ -145,21 +133,19 @@ function getCustom() {
  local DEST_PATH="${1}"
  local CACHE_FILE="/tmp/custom.zip"
  rm -f "${CACHE_FILE}"
-  TAG=$(curl -skL -H "Authorization: token ${TOKEN}" "https://api.github.com/repos/AuxXxilium/arc-custom/releases" | jq -r ".[].tag_name" | sort -rV | head -1)
+  TAG="$(curl -s https://api.github.com/repos/AuxXxilium/arc-custom/releases/latest | grep -oP '"tag_name": "\K(.*)(?=")')"
  export CUSTOMTAG="${TAG}"
-  while read -r ID NAME; do
-    if [ "${NAME}" = "custom-${TAG}.zip" ]; then
-      curl -kL -H "Authorization: token ${TOKEN}" -H "Accept: application/octet-stream" "https://api.github.com/repos/AuxXxilium/arc-custom/releases/assets/${ID}" -o "${CACHE_FILE}"
-      # Unzip Custom
-      rm -rf "${DEST_PATH}"
-      mkdir -p "${DEST_PATH}"
-      if unzip -o "${CACHE_FILE}" -d "${DEST_PATH}"; then
-        rm -f "${CACHE_FILE}"
-        echo "Getting Custom end - ${TAG}"
-        break
-      fi
-    fi
-  done < <(curl -skL -H "Authorization: token ${TOKEN}" "https://api.github.com/repos/AuxXxilium/arc-custom/releases/tags/${TAG}" | jq -r '.assets[] | "\(.id) \(.name)"')
+  if curl -skL "https://github.com/AuxXxilium/arc-custom/releases/download/${TAG}/custom-${TAG}.zip" -o "${CACHE_FILE}"; then
+    # Unzip Custom
+    rm -rf "${DEST_PATH}"
+    mkdir -p "${DEST_PATH}"
+    unzip -o "${CACHE_FILE}" -d "${DEST_PATH}"
+    rm -f "${CACHE_FILE}"
+    echo "Getting Custom end - ${TAG}"
+  else
+    echo "Failed to get Custom"
+    exit 1
+  fi
 }

 # Get latest Theme
@@ -169,20 +155,18 @@ function getTheme() {
  local DEST_PATH="${1}"
  local CACHE_FILE="/tmp/theme.zip"
  rm -f "${CACHE_FILE}"
-  TAG=$(curl -skL -H "Authorization: token ${TOKEN}" "https://api.github.com/repos/AuxXxilium/arc-theme/releases" | jq -r ".[].tag_name" | sort -rV | head -1)
+  TAG="$(curl -s https://api.github.com/repos/AuxXxilium/arc-theme/releases/latest | grep -oP '"tag_name": "\K(.*)(?=")')"
  export THEMETAG="${TAG}"
-  while read -r ID NAME; do
-    if [ "${NAME}" = "arc-theme-${TAG}.zip" ]; then
-      curl -kL -H "Authorization: token ${TOKEN}" -H "Accept: application/octet-stream" "https://api.github.com/repos/AuxXxilium/arc-theme/releases/assets/${ID}" -o "${CACHE_FILE}"
-      # Unzip Theme
-      mkdir -p "${DEST_PATH}"
-      if unzip -o "${CACHE_FILE}" -d "${DEST_PATH}"; then
-        rm -f "${CACHE_FILE}"
-        echo "Getting Theme end - ${TAG}"
-        break
-      fi
-    fi
-  done < <(curl -skL -H "Authorization: token ${TOKEN}" "https://api.github.com/repos/AuxXxilium/arc-theme/releases/tags/${TAG}" | jq -r '.assets[] | "\(.id) \(.name)"')
+  if curl -skL "https://github.com/AuxXxilium/arc-theme/releases/download/${TAG}/arc-theme-${TAG}.zip" -o "${CACHE_FILE}"; then
+    # Unzip Theme
+    mkdir -p "${DEST_PATH}"
+    unzip -o "${CACHE_FILE}" -d "${DEST_PATH}"
+    rm -f "${CACHE_FILE}"
+    echo "Getting Theme end - ${TAG}"
+  else
+    echo "Failed to get Theme"
+    exit 1
+  fi
 }

 # Get latest Buildroot-X
@@ -205,7 +189,7 @@ function getBuildrootx() {
      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)"')
+  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
@@ -228,7 +212,7 @@ function getBuildroots() {
      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/arc-buildroot-s/releases/tags/${TAG}" | jq -r '.assets[] | "\(.id) \(.name)"')
 }

 # Get latest Offline
@@ -259,9 +243,9 @@ function repackInitrd() {
  [ -z "${INITRD_FILE}" ] || [ ! -f "${INITRD_FILE}" ] && exit 1
  [ -z "${PLUGIN_PATH}" ] || [ ! -d "${PLUGIN_PATH}" ] && exit 1

-  INITRD_FILE="$(realpath "${INITRD_FILE}")"
-  PLUGIN_PATH="$(realpath "${PLUGIN_PATH}")"
-  OUTPUT_PATH="$(realpath "${OUTPUT_PATH}")"
+  INITRD_FILE="$(readlink -f "${INITRD_FILE}")"
+  PLUGIN_PATH="$(readlink -f "${PLUGIN_PATH}")"
+  OUTPUT_PATH="$(readlink -f "${OUTPUT_PATH}")"

  local RDXZ_PATH="rdxz_tmp"
  mkdir -p "${RDXZ_PATH}"
@@ -306,8 +290,8 @@ function resizeImg() {
  [[ -z "${INPUT_FILE}" || ! -f "${INPUT_FILE}" ]] && exit 1
  [ -z "${CHANGE_SIZE}" ] && exit 1

-  INPUT_FILE="$(realpath "${INPUT_FILE}")"
-  OUTPUT_FILE="$(realpath "${OUTPUT_FILE}")"
+  INPUT_FILE="$(readlink -f "${INPUT_FILE}")"
+  OUTPUT_FILE="$(readlink -f "${OUTPUT_FILE}")"


  SIZE=$(($(du -m "${INPUT_FILE}" | awk '{print $1}')$(echo "${CHANGE_SIZE}" | sed 's/M//g; s/b//g')))
@@ -326,28 +310,47 @@ function resizeImg() {
  sudo losetup -d ${LOOPX}
 }

-# createvmx
+# convertova
 # $1 bootloader file
-# $2 vmx name
-function createvmx() {
+# $2 ova file
+function convertova() {
  BLIMAGE=${1}
-  VMNAME=${2}
+  OVAPATH=${2}

+  BLIMAGE="$(readlink -f "${BLIMAGE}")"
+  OVAPATH="$(readlink -f "${OVAPATH}")"
+  VMNAME="$(basename "${OVAPATH}" .ova)"
+
+  # Download and install ovftool if it doesn't exist
+  if [ ! -x ovftool/ovftool ]; then
+    rm -rf ovftool ovftool.zip
+    curl -skL https://github.com/rgl/ovftool-binaries/raw/main/archive/VMware-ovftool-4.6.0-21452615-lin.x86_64.zip -o ovftool.zip
+    if [ $? -ne 0 ]; then
+      echo "Failed to download ovftool"
+      exit 1
+    fi
+    unzip ovftool.zip -d . >/dev/null 2>&1
+    if [ $? -ne 0 ]; then
+      echo "Failed to extract ovftool"
+      exit 1
+    fi
+    chmod +x ovftool/ovftool
+  fi
  if ! command -v qemu-img &>/dev/null; then
    sudo apt install -y qemu-utils
  fi

  # Convert raw image to VMDK
-  rm -rf "VMX_${VMNAME}"
-  mkdir -p "VMX_${VMNAME}"
-  qemu-img convert -O vmdk -o 'adapter_type=lsilogic,subformat=streamOptimized,compat6' "${BLIMAGE}" "VMX_${VMNAME}/${VMNAME}-disk1.vmdk"
-  qemu-img create -f vmdk "VMX_${VMNAME}/${VMNAME}-disk2.vmdk" "32G"
+  rm -rf "OVA_${VMNAME}"
+  mkdir -p "OVA_${VMNAME}"
+  qemu-img convert -O vmdk -o 'adapter_type=lsilogic,subformat=streamOptimized,compat6' "${BLIMAGE}" "OVA_${VMNAME}/${VMNAME}-disk1.vmdk"
+  qemu-img create -f vmdk "OVA_${VMNAME}/${VMNAME}-disk2.vmdk" "32G"

  # Create VM configuration
-  cat <<_EOF_ >"VMX_${VMNAME}/${VMNAME}.vmx"
+  cat <<_EOF_ >"OVA_${VMNAME}/${VMNAME}.vmx"
 .encoding = "UTF-8"
 config.version = "8"
-virtualHW.version = "17"
+virtualHW.version = "21"
 displayName = "${VMNAME}"
 annotation = "https://github.com/AuxXxilium/arc"
 guestOS = "ubuntu-64"
@@ -404,92 +407,10 @@ sata0:0.present = "TRUE"
 sata0:1.fileName = "${VMNAME}-disk2.vmdk"
 sata0:1.present = "TRUE"
 _EOF_
-}
-
-# convertvmx
-# $1 bootloader file
-# $2 vmx file
-function convertvmx() {
-  local BLIMAGE=${1}
-  local VMXPATH=${2}
-
-  BLIMAGE="$(realpath "${BLIMAGE}")"
-  VMXPATH="$(realpath "${VMXPATH}")"
-  local VMNAME="$(basename "${VMXPATH}" .vmx)"
-
-  createvmx "${BLIMAGE}" "${VMNAME}"
-
-  rm -rf "${VMXPATH}"
-  mv -f "VMX_${VMNAME}" "${VMXPATH}"
-}
-
-# convertova
-# $1 bootloader file
-# $2 ova file
-function convertova() {
-  local BLIMAGE=${1}
-  local OVAPATH=${2}
-
-  BLIMAGE="$(realpath "${BLIMAGE}")"
-  OVAPATH="$(realpath "${OVAPATH}")"
-  local VMNAME="$(basename "${OVAPATH}" .ova)"
-
-  createvmx "${BLIMAGE}" "${VMNAME}"
-
-  # Download and install ovftool if it doesn't exist
-  if [ ! -x ovftool/ovftool ]; then
-    rm -rf ovftool ovftool.zip
-    curl -skL https://github.com/rgl/ovftool-binaries/raw/main/archive/VMware-ovftool-4.6.0-21452615-lin.x86_64.zip -o ovftool.zip
-    if [ $? -ne 0 ]; then
-      echo "Failed to download ovftool"
-      exit 1
-    fi
-    unzip ovftool.zip -d . >/dev/null 2>&1
-    if [ $? -ne 0 ]; then
-      echo "Failed to extract ovftool"
-      exit 1
-    fi
-    chmod +x ovftool/ovftool
-  fi

  rm -f "${OVAPATH}"
-  ovftool/ovftool "VMX_${VMNAME}/${VMNAME}.vmx" "${OVAPATH}"
-  rm -rf "VMX_${VMNAME}"
-}
-
-# createvmc
-# $1 vhd file
-# $2 vmc file
-function createvmc() {
-  local BLIMAGE=${1:-arc.vhd}
-  local VMCPATH=${2:-arc.vmc}
-
-  BLIMAGE="$(basename "${BLIMAGE}")"
-  VMCPATH="$(realpath "${VMCPATH}")"
-
-  cat <<_EOF_ >"${VMCPATH}"
-<?xml version="1.0" encoding="UTF-8"?>
-<preferences>
-    <version type="string">2.0</version>
-    <hardware>
-        <memory>
-          <ram_size type="integer">4096</ram_size>
-        </memory>
-        <pci_bus>
-            <ide_adapter>
-                <ide_controller id="0">
-                    <location id="0">
-                        <drive_type type="integer">1</drive_type>
-                        <pathname>
-                            <relative type="string">${BLIMAGE}</relative>
-                        </pathname>
-                    </location>
-                </ide_controller>
-            </ide_adapter>
-        </pci_bus>
-    </hardware>
-</preferences>
-_EOF_
+  ovftool/ovftool "OVA_${VMNAME}/${VMNAME}.vmx" "${OVAPATH}"
+  rm -rf "OVA_${VMNAME}"
 }

 # copy buildroot
Author	SHA1	Message	Date
AuxXxilium	efec7f730f	Merge pull request #4886 from AuxXxilium/dev Dev	2024-11-25 00:18:45 +01:00
AuxXxilium	d194a36e35	Merge pull request #4885 from AuxXxilium/dev arc: fix menu bug	2024-11-24 23:53:23 +01:00
AuxXxilium	bfc108ef87	Merge pull request #4884 from AuxXxilium/dev boot: add sections	2024-11-24 23:21:48 +01:00
				`@@ -0,0 +1 @@`
				`###############################################################################`