Merge pull request #4661 from AuxXxilium/dev

Dev
Merge pull request #4636 from AuxXxilium/dev
2024-11-13 23:54:00 +01:00 · 2024-11-13 00:39:22 +01:00 · 2024-11-12 17:02:32 +01:00 · 2024-11-12 16:51:32 +01:00 · 2024-11-12 16:11:25 +01:00 · 2024-11-12 16:04:52 +01:00
42 changed files with 1608 additions and 3580 deletions
--- a/.github/workflows/autobuild.yml
+++ b/.github/workflows/autobuild.yml
@@ -45,19 +45,15 @@ 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 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
+          sudo apt install -y jq gawk cpio gettext libelf-dev qemu-utils busybox dialog curl sed
+          sudo snap install yq

          df -h

      # Get extractor, LKM, Addons, Modules, Theme and Configs
      - name: Get Buildroot
        run: |
-          . scripts/func.sh "${{ secrets.BUILD_TOKEN }}"
+          . scripts/func.sh

          echo "Get Dependencies"
          getAddons "files/p3/addons"
@@ -68,6 +64,8 @@ jobs:
          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
@@ -89,8 +87,6 @@ jobs:
        run: |
          . scripts/func.sh

-          getBuildrootx "brx"
-
          # Modify Source File
          ARC_BUILD="`date +'%y%m%d'`"
          ARC_VERSION="${{ inputs.version }}-dev"
@@ -104,7 +100,7 @@ jobs:

          echo "Create Arc Image"
          IMAGE_FILE="arc.img"
-          gzip -dc "grub.img.gz" >"${IMAGE_FILE}"
+          gzip -dc "files/initrd/opt/arc/grub.img.gz" >"${IMAGE_FILE}"
          fdisk -l "${IMAGE_FILE}"
          
          LOOPX=$(sudo losetup -f)
@@ -120,7 +116,7 @@ jobs:
          
          echo "Repack initrd"
          cp -f "brx/bzImage-arc" "files/p3/bzImage-arc"
-          createArc
+          #cp -f "brx/initrd-arc" "files/p3/initrd-arc"
          repackInitrd "brx/initrd-arc" "files/initrd" "files/p3/initrd-arc"

          echo "Copying files"
@@ -137,15 +133,9 @@ jobs:
          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
-
-          echo "Create Arc vhd"
-          createvmc "arc.vmc"
-          qemu-img convert -p -f raw -O vpc ${IMAGE_FILE} arc.vhd
-
-          echo "Create Arc ova"
-          convertova "${IMAGE_FILE}" "arc.ova"
+          qemu-img convert ${IMAGE_FILE} -O vmdk -o adapter_type=lsilogic arc-dyn.vmdk
+          qemu-img convert ${IMAGE_FILE} -O vmdk -o adapter_type=lsilogic,subformat=monolithicFlat arc.vmdk
+          qemu-img convert ${IMAGE_FILE} -O vhdx -o subformat=dynamic arc.vhdx

      # Zip image and generate checksum
      - name: Pack Next Image
@@ -162,7 +152,7 @@ jobs:
      # Cleanup
      - name: Cleanup
        run: |
-          rm -rf "arc.img" "arc.vmdk" "arc-dyn.vmdk" "arc-flat.vmdk" "arc.vhd" "arc.ova" "arc.vmc"
+          rm -rf "arc.img" "arc.vmdk" "arc-dyn.vmdk" "arc.vhdx" "arc-flat.vmdk"

       # Build incremental
      - name: Build Stable Image
@@ -170,8 +160,6 @@ jobs:
        run: |
          . scripts/func.sh

-          getBuildroots "brs"
-
          # Modify Source File
          ARC_BUILD="`date +'%y%m%d'`"
          ARC_VERSION="${{ inputs.version }}-dev"
@@ -185,7 +173,7 @@ jobs:

          echo "Create Arc Image"
          IMAGE_FILE="arc.img"
-          gzip -dc "grub.img.gz" >"${IMAGE_FILE}"
+          gzip -dc "files/initrd/opt/arc/grub.img.gz" >"${IMAGE_FILE}"
          fdisk -l "${IMAGE_FILE}"
          
          LOOPX=$(sudo losetup -f)
@@ -201,7 +189,7 @@ jobs:
          
          echo "Repack initrd"
          cp -f "brs/bzImage-arc" "files/p3/bzImage-arc"
-          createArc
+          #cp -f "brs/initrd-arc" "files/p3/initrd-arc"
          repackInitrd "brs/initrd-arc" "files/initrd" "files/p3/initrd-arc"

          echo "Copying files"
@@ -218,15 +206,9 @@ jobs:
          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
-
-          echo "Create Arc vhd"
-          createvmc "arc.vmc"
-          qemu-img convert -p -f raw -O vpc ${IMAGE_FILE} arc.vhd
-
-          echo "Create Arc ova"
-          convertova "${IMAGE_FILE}" "arc.ova"
+          qemu-img convert ${IMAGE_FILE} -O vmdk -o adapter_type=lsilogic arc-dyn.vmdk
+          qemu-img convert ${IMAGE_FILE} -O vmdk -o adapter_type=lsilogic,subformat=monolithicFlat arc.vmdk
+          qemu-img convert ${IMAGE_FILE} -O vhdx -o subformat=dynamic arc.vhdx

      # Zip image and generate checksum
      - name: Pack Stable Image
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -71,19 +71,15 @@ 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 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
+          sudo apt install -y jq gawk cpio gettext libelf-dev qemu-utils busybox dialog curl sed
+          sudo snap install yq

          df -h

      # Get extractor, LKM, Addons, Modules, Theme and Configs
      - name: Get Dependencies for all Image
        run: |
-          . scripts/func.sh "${{ secrets.BUILD_TOKEN }}"
+          . scripts/func.sh

          echo "Get Dependencies"
          getAddons "files/p3/addons"
@@ -94,7 +90,7 @@ jobs:
          getOffline "files/p3/configs"
          getLKMs "files/p3/lkms"
          getTheme "files/p1/boot/grub"
-          getBuildrootx "brx" 
+          getBuildrootx "brx"
          getBuildroots "brs"

          # Export Dependencies Version to env
@@ -130,7 +126,7 @@ jobs:

          echo "Create Arc Image"
          IMAGE_FILE="arc.img"
-          gzip -dc "grub.img.gz" >"${IMAGE_FILE}"
+          gzip -dc "files/initrd/opt/arc/grub.img.gz" >"${IMAGE_FILE}"
          fdisk -l "${IMAGE_FILE}"
          
          LOOPX=$(sudo losetup -f)
@@ -146,7 +142,7 @@ jobs:
          
          echo "Repack initrd"
          cp -f "brx/bzImage-arc" "files/p3/bzImage-arc"
-          createArc
+          #cp -f "brx/initrd-arc" "files/p3/initrd-arc"
          repackInitrd "brx/initrd-arc" "files/initrd" "files/p3/initrd-arc"

          echo "Copying files"
@@ -163,12 +159,9 @@ jobs:
          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
-
-          echo "Create Arc vhd"
-          createvmc "arc.vmc"
-          qemu-img convert -p -f raw -O vpc ${IMAGE_FILE} arc.vhd
+          qemu-img convert ${IMAGE_FILE} -O vmdk -o adapter_type=lsilogic arc-dyn.vmdk
+          qemu-img convert ${IMAGE_FILE} -O vmdk -o adapter_type=lsilogic,subformat=monolithicFlat arc.vmdk
+          qemu-img convert ${IMAGE_FILE} -O vhdx -o subformat=dynamic arc.vhdx

          echo "Create Arc ova"
          convertova "${IMAGE_FILE}" "arc.ova"
@@ -181,7 +174,7 @@ jobs:
            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)
          fi
@@ -189,7 +182,7 @@ jobs:
      # Cleanup
      - name: Cleanup
        run: |
-          rm -rf "arc.img" "arc.vmdk" "arc-dyn.vmdk" "arc-flat.vmdk" "arc.vhd" "arc.ova" "arc.vmc"
+          rm -rf "arc.img" "arc.ova" "arc.vmdk" "arc-dyn.vmdk" "arc.vhdx" "arc-flat.vmdk"

       # Build incremental
      - name: Build Stable Image
@@ -210,7 +203,7 @@ jobs:

          echo "Create Arc Image"
          IMAGE_FILE="arc.img"
-          gzip -dc "grub.img.gz" >"${IMAGE_FILE}"
+          gzip -dc "files/initrd/opt/arc/grub.img.gz" >"${IMAGE_FILE}"
          fdisk -l "${IMAGE_FILE}"
          
          LOOPX=$(sudo losetup -f)
@@ -226,7 +219,7 @@ jobs:
          
          echo "Repack initrd"
          cp -f "brs/bzImage-arc" "files/p3/bzImage-arc"
-          createArc
+          #cp -f "brs/initrd-arc" "files/p3/initrd-arc"
          repackInitrd "brs/initrd-arc" "files/initrd" "files/p3/initrd-arc"

          echo "Copying files"
@@ -243,12 +236,9 @@ jobs:
          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
-
-          echo "Create Arc vhd"
-          createvmc "arc.vmc"
-          qemu-img convert -p -f raw -O vpc ${IMAGE_FILE} arc.vhd
+          qemu-img convert ${IMAGE_FILE} -O vmdk -o adapter_type=lsilogic arc-dyn.vmdk
+          qemu-img convert ${IMAGE_FILE} -O vmdk -o adapter_type=lsilogic,subformat=monolithicFlat arc.vmdk
+          qemu-img convert ${IMAGE_FILE} -O vhdx -o subformat=dynamic arc.vhdx

          echo "Create Arc ova"
          convertova "${IMAGE_FILE}" "arc.ova"
@@ -261,7 +251,7 @@ jobs:
            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)
          fi
@@ -284,8 +274,8 @@ jobs:
              - Discord Account for Arc Patch needed

            ### Versions:
-              ${{ inputs.stable && '- stable: Stable Image (Full Image, all dependencies are included, less hardware support)' || '' }}
-              ${{ inputs.next && '- next: Next Image (Full Image, all dependencies are included, more hardware support, 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 }}
--- 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
@@ -39,6 +39,9 @@ jobs:
        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
@@ -5,13 +5,11 @@ version: "3"
 tasks:
  build-img-n:
    cmds:
-      - git reset --hard
      - git pull
      - ./img-gen-n.sh

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

--- 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
@@ -4,19 +4,20 @@
 # Overlay Init Section
 [[ -z "${ARC_PATH}" || ! -d "${ARC_PATH}/include" ]] && ARC_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" 2>/dev/null && pwd)"

-. "${ARC_PATH}/include/functions.sh"
-. "${ARC_PATH}/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"
+. ${ARC_PATH}/include/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}")"

@@ -59,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)} | "
@@ -68,19 +69,19 @@ function backtitle() {
  BACKTITLE+="Build: ${BUILDDONE} | "
  BACKTITLE+="${MACHINE}(${BUS}) | "
  [ -n "${KEYMAP}" ] && BACKTITLE+="KB: ${KEYMAP}"
-  [ "${ARCOFFLINE}" = "true" ] && BACKTITLE+=" | Offline"
+  [ "${ARCOFFLINE}" == "true" ] && BACKTITLE+=" | Offline"
  echo "${BACKTITLE}"
 }

 function backtitlep() {
-  [ "${STEP}" = "model" ] && BACKTITLEP="CHOOSE MODEL >>> " || BACKTITLEP="Choose Model >>> "
-  [ "${STEP}" = "version" ] && BACKTITLEP+="CHOOSE VERSION >>> " || BACKTITLEP+="Choose Version >>> "
-  [ "${STEP}" = "snmac" ] && BACKTITLEP+="SET SN/MAC >>> " || BACKTITLEP+="Set SN/Mac >>> "
-  [ "${STEP}" = "network" ] && BACKTITLEP+="SET NETWORK >>> " || BACKTITLEP+="Set Network >>> "
-  [ "${STEP}" = "storagemap" ] && BACKTITLEP+="SET STORAGEMAP >>> " || BACKTITLEP+="Set StorageMap >>> "
-  [ "${STEP}" = "addons" ] && BACKTITLEP+="SET ADDONS >>> " || BACKTITLEP+="Set Addons >>> "
-  [ "${STEP}" = "build" ] && BACKTITLEP+="BUILD LOADER >>> " || BACKTITLEP+="Build Loader >>> "
-  [ "${STEP}" = "boot" ] && BACKTITLEP+="BOOT DSM" || BACKTITLEP+="Boot DSM"
+  [ "${STEP}" == "model" ] && BACKTITLEP="CHOOSE MODEL >>> " || BACKTITLEP="Choose Model >>> "
+  [ "${STEP}" == "version" ] && BACKTITLEP+="CHOOSE VERSION >>> " || BACKTITLEP+="Choose Version >>> "
+  [ "${STEP}" == "snmac" ] && BACKTITLEP+="SET SN/MAC >>> " || BACKTITLEP+="Set SN/Mac >>> "
+  [ "${STEP}" == "network" ] && BACKTITLEP+="SET NETWORK >>> " || BACKTITLEP+="Set Network >>> "
+  [ "${STEP}" == "storagemap" ] && BACKTITLEP+="SET STORAGEMAP >>> " || BACKTITLEP+="Set StorageMap >>> "
+  [ "${STEP}" == "addons" ] && BACKTITLEP+="SET ADDONS >>> " || BACKTITLEP+="Set Addons >>> "
+  [ "${STEP}" == "build" ] && BACKTITLEP+="BUILD LOADER >>> " || BACKTITLEP+="Build Loader >>> "
+  [ "${STEP}" == "boot" ] && BACKTITLEP+="BOOT DSM" || BACKTITLEP+="Boot DSM"
  echo "${BACKTITLEP}"
 }

@@ -88,7 +89,11 @@ function backtitlep() {
 # Model Selection
 function arcModel() {
  STEP="model"
-  [ "${ARCOFFLINE}" != "true" ] && checkHardwareID || true
+  if [ ! -f "${S_FILE}" ] || [ ! -f "${P_FILE}" ]; then
+    updateConfigs
+  fi
+  # Check for Hardware ID
+  checkHardwareID
  dialog --backtitle "$(backtitlep)" --title "Model" \
    --infobox "Reading Models..." 3 25
  ARCCONF="$(readConfigKey "${MODEL:-SA6400}.serial" "${S_FILE}")"
@@ -102,7 +107,7 @@ function arcModel() {
      echo "${M} ${P}" >>"${TMP_PATH}/modellist"
    done < <(echo "${PM}")
  done < <(echo "${PS}")
-  if [ "${ARCMODE}" = "config" ]; then
+  if [ "${ARCMODE}" == "config" ]; then
    while true; do
      echo -n "" >"${TMP_PATH}/menu"
      while read -r M A; do
@@ -113,16 +118,16 @@ function arcModel() {
        ARC=""
        BETA=""
        [ -n "${ARCCONFM}" ] && ARC="x" || ARC=""
-        [ "${DT}" = "true" ] && DTS="x" || DTS=""
+        [ "${DT}" == "true" ] && DTS="x" || DTS=""
        IGPUS=""
-        [[ "${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}" = "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="+"
+        [[ "${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}" == "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}" == "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
@@ -131,18 +136,18 @@ function arcModel() {
              break
            fi
          done
-          if [ "${A}" != "epyc7002" ] && [ "${DT}" = "true" ] && [ "${EXTERNALCONTROLLER}" = "true" ]; then
+          if [ "${A}" != "epyc7002" ] && [ "${DT}" == "true" ] && [ "${EXTERNALCONTROLLER}" == "true" ]; then
            COMPATIBLE=0
          fi
-          if [ "${A}" != "epyc7002" ] && [ ${SATACONTROLLER} -eq 0 ] && [ "${EXTERNALCONTROLLER}" = "false" ]; then
+          if [ "${A}" != "epyc7002" ] && [ ${SATACONTROLLER} -eq 0 ] && [ "${EXTERNALCONTROLLER}" == "false" ]; then
            COMPATIBLE=0
          fi
-          if [ "${A}" = "epyc7002" ] && [[ ${SCSICONTROLLER} -ne 0 || ${RAIDCONTROLLER} -ne 0 ]]; then
+          if [ "${A}" == "epyc7002" ] && [[ ${SCSICONTROLLER} -ne 0 || ${RAIDCONTROLLER} -ne 0 ]]; then
            COMPATIBLE=0
          fi
-          if [ "${A}" != "epyc7002" ] && [ ${NVMEDRIVES} -gt 0 ] && [ "${BUS}" = "usb" ] && [ ${SATADRIVES} -eq 0 ] && [ "${EXTERNALCONTROLLER}" = "false" ]; then
+          if [ "${A}" != "epyc7002" ] && [ ${NVMEDRIVES} -gt 0 ] && [ "${BUS}" == "usb" ] && [ ${SATADRIVES} -eq 0 ] && [ "${EXTERNALCONTROLLER}" == "false" ]; then
            COMPATIBLE=0
-          elif [ "${A}" != "epyc7002" ] && [ ${NVMEDRIVES} -gt 0 ] && [ "${BUS}" = "sata" ] && [ ${SATADRIVES} -eq 1 ] && [ "${EXTERNALCONTROLLER}" = "false" ]; then
+          elif [ "${A}" != "epyc7002" ] && [ ${NVMEDRIVES} -gt 0 ] && [ "${BUS}" == "sata" ] && [ ${SATADRIVES} -eq 1 ] && [ "${EXTERNALCONTROLLER}" == "false" ]; then
            COMPATIBLE=0
          fi
          [ -z "$(grep -w "${M}" "${S_FILE}")" ] && COMPATIBLE=0
@@ -165,21 +170,25 @@ 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 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
          ;;
-        *)
+        255) # ESC -> Exit
          return 1
          break
          ;;
@@ -187,7 +196,7 @@ function arcModel() {
    done
  fi
  # Reset Model Config if changed
-  if [ "${ARCMODE}" = "config" ] && [ "${MODEL}" != "${resp}" ]; then
+  if [ "${ARCMODE}" == "config" ] && [ "${MODEL}" != "${resp}" ]; then
    MODEL="${resp}"
    writeConfigKey "addons" "{}" "${USER_CONFIG_FILE}"
    writeConfigKey "arc.remap" "" "${USER_CONFIG_FILE}"
@@ -236,11 +245,11 @@ function arcVersion() {
  PAT_URL_CONF="$(readConfigKey "paturl" "${USER_CONFIG_FILE}")"
  PAT_HASH_CONF="$(readConfigKey "pathash" "${USER_CONFIG_FILE}")"
  # Check for Custom Build
-  if [ "${ARCMODE}" = "config" ] && [ "${ARCRESTORE}" != "true" ]; then
+  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 0
    resp=$(cat ${TMP_PATH}/resp)
@@ -255,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
@@ -265,7 +278,7 @@ function arcVersion() {
      PVS="$(readConfigEntriesArray "${PLATFORM}.\"${MODEL}\"" "${D_FILE}" | sort -r)"
      echo -n "" >"${TMP_PATH}/versions"
      while read -r V; do
-        if [ "${V:0:3}" != "${PRODUCTVER}" ] || [ "${V}" = "${PREV}" ]; then
+        if [ "${V:0:3}" != "${PRODUCTVER}" ] || [ "${V}" == "${PREV}" ]; then
          continue
        else
          echo "${V}" >>"${TMP_PATH}/versions"
@@ -273,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
@@ -307,23 +320,15 @@ 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
-  elif [ "${ARCMODE}" = "automated" ] || [ "${ARCRESTORE}" = "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
+    [ $? -eq 0 ] && ARCMODE="automated" || ARCMODE="config"
+  elif [ "${ARCMODE}" == "automated" ] || [ "${ARCRESTORE}" == "true" ]; then
    VALID="true"
  fi
  # Change Config if Files are valid
-  if [ "${VALID}" = "true" ]; then
+  if [ "${VALID}" == "true" ]; then
    dialog --backtitle "$(backtitlep)" --title "Arc Config" \
      --infobox "Reconfiguring Addons, Cmdline, Modules and Synoinfo" 3 60
    # Reset Synoinfo
@@ -331,38 +336,31 @@ 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}")"
    ARCCONF="$(readConfigKey "${MODEL}.serial" "${S_FILE}")"
-    if [ "${ADDONS}" = "{}" ]; then
+    if [ "${ADDONS}" == "{}" ]; then
      initConfigKey "addons.acpid" "" "${USER_CONFIG_FILE}"
      initConfigKey "addons.cpuinfo" "" "${USER_CONFIG_FILE}"
      initConfigKey "addons.storagepanel" "" "${USER_CONFIG_FILE}"
      initConfigKey "addons.updatenotify" "" "${USER_CONFIG_FILE}"
      if [ ${NVMEDRIVES} -gt 0 ]; then
-        if [ "${PLATFORM}" = "epyc7002" ] && [ ${SATADRIVES} -eq 0 ] && [ ${SASDRIVES} -eq 0 ]; then
+        if [ "${PLATFORM}" == "epyc7002" ] && [ ${SATADRIVES} -eq 0 ] && [ ${SASDRIVES} -eq 0 ]; then
          initConfigKey "addons.nvmesystem" "" "${USER_CONFIG_FILE}"
-        elif [ "${MODEL}" = "DS918+" ] || [ "${MODEL}" = "DS1019+" ] || [ "${MODEL}" = "DS1621xs+" ] || [ "${MODEL}" = "RS1619xs+" ]; then
+        elif [ "${MODEL}" == "DS918+" ] || [ "${MODEL}" == "DS1019+" ] || [ "${MODEL}" == "DS1621xs+" ] || [ "${MODEL}" == "RS1619xs+" ]; then
          initConfigKey "addons.nvmecache" "" "${USER_CONFIG_FILE}"
          initConfigKey "addons.nvmevolume" "" "${USER_CONFIG_FILE}"
        else
          initConfigKey "addons.nvmevolume" "" "${USER_CONFIG_FILE}"
        fi
      fi
-      if [ "${MACHINE}" = "Native" ]; then
+      if [ "${MACHINE}" == "Native" ]; then
        initConfigKey "addons.cpufreqscaling" "" "${USER_CONFIG_FILE}"
        initConfigKey "addons.powersched" "" "${USER_CONFIG_FILE}"
        initConfigKey "addons.sensors" "" "${USER_CONFIG_FILE}"
      fi
-      if [ "${PLATFORM}" = "apollolake" ] || [ "${PLATFORM}" = "geminilake" ]; then
+      if [ "${PLATFORM}" == "apollolake" ] || [ "${PLATFORM}" == "geminilake" ]; then
        initConfigKey "addons.i915" "" "${USER_CONFIG_FILE}"
      fi
      if echo "${PAT_URL}" 2>/dev/null | grep -q "7.2.2"; then
@@ -371,9 +369,6 @@ function arcVersion() {
      if [ -n "${ARCCONF}" ]; then
        initConfigKey "addons.arcdns" "" "${USER_CONFIG_FILE}"
      fi
-      if [ ${SASDRIVES} -gt 0 ] && [ "${DT}" = "false" ]; then
-        initConfigKey "addons.smartctl" "" "${USER_CONFIG_FILE}"
-      fi
    fi
    while IFS=': ' read -r ADDON PARAM; do
      [ -z "${ADDON}" ] && continue
@@ -381,8 +376,16 @@ 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
+    if [ "${ONLYVERSION}" == "true" ]; then
      writeConfigKey "arc.builddone" "false" "${USER_CONFIG_FILE}"
      BUILDDONE="$(readConfigKey "arc.builddone" "${USER_CONFIG_FILE}")"
      ONLYVERSION="false"
@@ -407,37 +410,32 @@ 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
+    [ -z "${ARCCONF}" ] && checkHardwareID || true
+    sleep 1
    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 \
+      --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}"
+      [ -z "${ARCCONF}" ] && checkHardwareID || true
+      sleep 1
+      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}"
    elif [ ${resp} -eq 2 ]; then
+      # Generate random Serial
      SN="$(generateSerial "${MODEL}" "false")"
      writeConfigKey "arc.patch" "false" "${USER_CONFIG_FILE}"
    elif [ ${resp} -eq 3 ]; then
@@ -455,8 +453,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
 }
@@ -472,22 +470,20 @@ 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 1
-  fi
-  if [ "${ONLYPATCH}" = "true" ]; then
+  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}")"
    ONLYPATCH="false"
    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
@@ -496,7 +492,7 @@ function arcSettings() {
    [ $? -ne 0 ] && return 1
  fi
  # Check for Custom Build
-  if [ "${ARCMODE}" = "config" ]; then
+  if [ "${ARCMODE}" == "config" ]; then
    # Select Addons
    STEP="addons"
    dialog --backtitle "$(backtitlep)" --colors --title "Addons" \
@@ -505,17 +501,17 @@ function arcSettings() {
    [ $? -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
+  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 1
-  elif [ "${ARCMODE}" = "automated" ] && [ "${MACHINE}" = "Native" ] && readConfigMap "addons" "${USER_CONFIG_FILE}" | grep -q "cpufreqscaling"; then
-    [ "${PLATFORM}" = "epyc7002" ] && writeConfigKey "addons.cpufreqscaling" "schedutil" "${USER_CONFIG_FILE}" || writeConfigKey "addons.cpufreqscaling" "conservative" "${USER_CONFIG_FILE}"
+  elif [ "${ARCMODE}" == "automated" ] && [ "${MACHINE}" == "Native" ] && readConfigMap "addons" "${USER_CONFIG_FILE}" | grep -q "cpufreqscaling"; then
+    [ "${PLATFORM}" == "epyc7002" ] && writeConfigKey "addons.cpufreqscaling" "schedutil" "${USER_CONFIG_FILE}" || writeConfigKey "addons.cpufreqscaling" "conservative" "${USER_CONFIG_FILE}"
  fi
-  if [ "${ARCMODE}" = "config" ]; then
+  if [ "${ARCMODE}" == "config" ]; then
    # Check for DT and HBA/Raid Controller
-    if [ "${DT}" = "true" ] && [ "${EXTERNALCONTROLLER}" = "true" ]; then
+    if [ "${DT}" == "true" ] && [ "${EXTERNALCONTROLLER}" == "true" ]; then
      dialog --backtitle "$(backtitlep)" --title "Arc Warning" \
        --msgbox "WARN: You use a HBA/Raid Controller and selected a DT Model.\nThis is still an experimental." 6 70
    fi
@@ -526,24 +522,24 @@ function arcSettings() {
      dialog --backtitle "$(backtitlep)" --title "Arc Warning" \
        --msgbox "WARN: You have more NIC (${DEVICENIC}) then 8 NIC.\nOnly 8 supported by DSM." 6 60
    fi
-    if [ ${DEVICENIC} -gt ${MODELNIC} ] && [ "${ARCPATCH}" = "true" ]; then
+    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
+    if [ "${AESSYS}" == "false" ]; then
      dialog --backtitle "$(backtitlep)" --title "Arc Warning" \
        --msgbox "WARN: Your System doesn't support Hardwareencryption in DSM. (AES)" 5 70
    fi
    # Check for CPUFREQ
-    if [[ "${CPUFREQ}" = "false" || "${ACPISYS}" = "false" ]] && readConfigMap "addons" "${USER_CONFIG_FILE}" | grep -q "cpufreqscaling"; then
+    if [[ "${CPUFREQ}" == "false" || "${ACPISYS}" == "false" ]] && readConfigMap "addons" "${USER_CONFIG_FILE}" | grep -q "cpufreqscaling"; then
      dialog --backtitle "$(backtitlep)" --title "Arc Warning" \
        --msgbox "WARN: It is possible that CPU Frequency Scaling is not working properly with your System." 6 80
    fi
  fi
  EMMCBOOT="$(readConfigKey "emmcboot" "${USER_CONFIG_FILE}")"
  # eMMC Boot Support
-  if [ "${EMMCBOOT}" = "true" ]; then
+  if [ "${EMMCBOOT}" == "true" ]; then
    writeConfigKey "modules.mmc_block" "" "${USER_CONFIG_FILE}"
    writeConfigKey "modules.mmc_core" "" "${USER_CONFIG_FILE}"
  else
@@ -555,7 +551,7 @@ function arcSettings() {
    writeConfigKey "arc.confdone" "true" "${USER_CONFIG_FILE}"
    CONFDONE="$(readConfigKey "arc.confdone" "${USER_CONFIG_FILE}")"
    # Check for Custom Build
-    if [ "${ARCMODE}" = "config" ]; then
+    if [ "${ARCMODE}" == "config" ]; then
      # Ask for Build
      dialog --clear --backtitle "$(backtitlep)" --title "Config done" \
        --no-cancel --menu "Build now?" 7 40 0 \
@@ -595,12 +591,12 @@ function arcSummary() {
  ARCPATCH="$(readConfigKey "arc.patch" "${USER_CONFIG_FILE}")"
  ADDONSINFO="$(readConfigEntriesArray "addons" "${USER_CONFIG_FILE}")"
  REMAP="$(readConfigKey "arc.remap" "${USER_CONFIG_FILE}")"
-  if [ "${REMAP}" = "acports" ] || [ "${REMAP}" = "maxports" ]; then
+  if [ "${REMAP}" == "acports" ] || [ "${REMAP}" == "maxports" ]; then
    PORTMAP="$(readConfigKey "cmdline.SataPortMap" "${USER_CONFIG_FILE}")"
    DISKMAP="$(readConfigKey "cmdline.DiskIdxMap" "${USER_CONFIG_FILE}")"
-  elif [ "${REMAP}" = "remap" ]; then
+  elif [ "${REMAP}" == "remap" ]; then
    PORTREMAP="$(readConfigKey "cmdline.sata_remap" "${USER_CONFIG_FILE}")"
-  elif [ "${REMAP}" = "ahci" ]; then
+  elif [ "${REMAP}" == "ahci" ]; then
    AHCIPORTREMAP="$(readConfigKey "cmdline.ahci_remap" "${USER_CONFIG_FILE}")"
  else
    PORTMAP="$(readConfigKey "cmdline.SataPortMap" "${USER_CONFIG_FILE}")"
@@ -617,7 +613,7 @@ function arcSummary() {
  DRIVES="$(readConfigKey "device.drives" "${USER_CONFIG_FILE}")"
  EMMCBOOT="$(readConfigKey "emmcboot" "${USER_CONFIG_FILE}")"
  KERNEL="$(readConfigKey "kernel" "${USER_CONFIG_FILE}")"
-  if [ "${DT}" = "false" ] && [ "${REMAP}" = "user" ]; then
+  if [ "${DT}" == "false" ] && [ "${REMAP}" == "user" ]; then
    if [ -z "${PORTMAP}" ] && [ -z "${DISKMAP}"] && [ -z "${PORTREMAP}" ] && [ -z "${AHCIPORTREMAP}" ]; then
      dialog --backtitle "$(backtitle)" --title "Arc Error" \
        --msgbox "ERROR: You selected Portmap: User and not set any values. -> Can't build Loader!\nGo need to go Cmdline Options and add your Values." 6 80
@@ -632,7 +628,7 @@ function arcSummary() {
  SUMMARY+="\n>> DT: \Zb${DT}\Zn"
  SUMMARY+="\n>> PAT URL: \Zb${PAT_URL}\Zn"
  SUMMARY+="\n>> PAT Hash: \Zb${PAT_HASH}\Zn"
-  [ "${MODEL}" = "SA6400" ] && SUMMARY+="\n>> Kernel: \Zb${KERNEL}\Zn"
+  [ "${MODEL}" == "SA6400" ] && SUMMARY+="\n>> Kernel: \Zb${KERNEL}\Zn"
  SUMMARY+="\n>> Kernel Version: \Zb${KVER}\Zn"
  SUMMARY+="\n"
  SUMMARY+="\n\Z4> Arc Information\Zn"
@@ -641,7 +637,7 @@ function arcSummary() {
  [ -n "${DISKMAP}" ] && SUMMARY+="\n>> DiskIdxMap: \Zb${DISKMAP}\Zn"
  [ -n "${PORTREMAP}" ] && SUMMARY+="\n>> SataRemap: \Zb${PORTREMAP}\Zn"
  [ -n "${AHCIPORTREMAP}" ] && SUMMARY+="\n>> AhciRemap: \Zb${AHCIPORTREMAP}\Zn"
-  [ "${DT}" = "true" ] && SUMMARY+="\n>> Sort Drives: \Zb${HDDSORT}\Zn"
+  [ "${DT}" == "true" ] && SUMMARY+="\n>> Sort Drives: \Zb${HDDSORT}\Zn"
  SUMMARY+="\n>> Directboot: \Zb${DIRECTBOOT}\Zn"
  SUMMARY+="\n>> eMMC Boot: \Zb${EMMCBOOT}\Zn"
  SUMMARY+="\n>> Kernelload: \Zb${KERNELLOAD}\Zn"
@@ -659,13 +655,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
@@ -675,6 +671,19 @@ function arcSummary() {
 # Building Loader
 function make() {
  STEP="build"
+  ARCCONF="$(readConfigKey "${MODEL}.serial" "${S_FILE}" 2>/dev/null)"
+  SN="$(readConfigKey "sn" "${USER_CONFIG_FILE}")"
+  BOOTMODE="$(readConfigKey "arc.mode" "${USER_CONFIG_FILE}")"
+  if [ "${BOOTMODE}" != "automated" ] && [ "${ARCOFFLINE}" != "true" ] && [[ "${ARCPATCH}" != "true" || -z "${ARCCONF}" ]]; then
+    if ! curl -skL "https://arc.auxxxilium.tech/check.yml" -o "${TMP_PATH}/check.yml" 2>/dev/null; then
+      SN=$(generateSerial "${MODEL}" "false")
+    else
+      if grep -q "${SN}" "${TMP_PATH}/check.yml"; then
+        SN=$(generateSerial "${MODEL}" "false")
+      fi
+    fi
+    writeConfigKey "sn" "${SN}" "${USER_CONFIG_FILE}"
+  fi
  # Read Model Config
  MODEL="$(readConfigKey "model" "${USER_CONFIG_FILE}")"
  PLATFORM="$(readConfigKey "platform" "${USER_CONFIG_FILE}")"
@@ -686,7 +695,7 @@ function make() {
  # Check for Arc Patch
  ARCCONF="$(readConfigKey "${MODEL}.serial" "${S_FILE}")"
  ARCPATCH="$(readConfigKey "arc.patch" "${USER_CONFIG_FILE}")"
-  if [ -z "${ARCCONF}" ] || [ "${ARCPATCH}" = "false" ]; then
+  if [ -z "${ARCCONF}" ] || [ "${ARCPATCH}" == "false" ]; then
    deleteConfigKey "addons.amepatch" "${USER_CONFIG_FILE}"
    deleteConfigKey "addons.arcdns" "${USER_CONFIG_FILE}"
  fi
@@ -704,12 +713,12 @@ function make() {
    sleep 2
    return 1
  fi
-  if [ -f "${ORI_ZIMAGE_FILE}" ] && [ -f "${ORI_RDGZ_FILE}" ] && [ "${CONFDONE}" = "true" ] && [ -n "${PAT_URL}" ] && [ -n "${PAT_HASH}" ]; then
+  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
@@ -719,8 +728,9 @@ function make() {
    sleep 2
    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
@@ -738,19 +748,18 @@ function make() {
 ###############################################################################
 # 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
    writeConfigKey "arc.builddone" "true" "${USER_CONFIG_FILE}"
    BUILDDONE="$(readConfigKey "arc.builddone" "${USER_CONFIG_FILE}")"
-    if [ "${ARCMODE}" = "automated" ] || [ "${UPDATEMODE}" = "true" ]; then
+    if [ "${ARCMODE}" == "automated" ] || [ "${UPDATEMODE}" == "true" ]; then
      boot
    else
      # Ask for Boot
      dialog --clear --backtitle "$(backtitle)" --title "Build done"\
        --no-cancel --menu "Boot now?" 7 40 0 \
-        1 "Yes - Boot DSM now" \
+        1 "Yes - Boot Arc Loader now" \
        2 "No - I want to make changes" \
      2>"${TMP_PATH}/resp"
      resp=$(cat ${TMP_PATH}/resp)
@@ -770,7 +779,7 @@ function juniorboot() {
  BUILDDONE="$(readConfigKey "arc.builddone" "${USER_CONFIG_FILE}")"
  MODEL="$(readConfigKey "model" "${USER_CONFIG_FILE}")"
  MODELID="$(readConfigKey "modelid" "${USER_CONFIG_FILE}")"
-  if [[ "${BUILDDONE}" = "false" && "${ARCMODE}" != "automated" ]] || [ "${MODEL}" != "${MODELID}" ]; then
+  if [[ "${BUILDDONE}" == "false" && "${ARCMODE}" != "automated" ]] || [ "${MODEL}" != "${MODELID}" ]; then
    dialog --backtitle "$(backtitle)" --title "Alert" \
      --yesno "Config changed, you need to rebuild the Loader?" 0 0
    if [ $? -eq 0 ]; then
@@ -790,7 +799,7 @@ function boot() {
  BUILDDONE="$(readConfigKey "arc.builddone" "${USER_CONFIG_FILE}")"
  MODEL="$(readConfigKey "model" "${USER_CONFIG_FILE}")"
  MODELID="$(readConfigKey "modelid" "${USER_CONFIG_FILE}")"
-  if [[ "${BUILDDONE}" = "false" && "${ARCMODE}" != "automated" ]] || [ "${MODEL}" != "${MODELID}" ]; then
+  if [[ "${BUILDDONE}" == "false" && "${ARCMODE}" != "automated" ]] || [ "${MODEL}" != "${MODELID}" ]; then
    dialog --backtitle "$(backtitle)" --title "Alert" \
      --yesno "Config changed, you need to rebuild the Loader?" 0 0
    if [ $? -eq 0 ]; then
@@ -800,7 +809,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
 }

@@ -808,7 +818,7 @@ function boot() {
 ###############################################################################
 # Main loop
 # Check for Arc Mode
-if [ "${ARCMODE}" = "update" ]; then
+if [ "${ARCMODE}" == "update" ]; then
  if [ "${ARCOFFLINE}" != "true" ]; then
    updateLoader
  else
@@ -817,48 +827,48 @@ if [ "${ARCMODE}" = "update" ]; then
    sleep 3
    exec reboot
  fi
-elif [ "${ARCMODE}" = "automated" ]; then
+elif [ "${ARCMODE}" == "automated" ]; then
  # Check for Custom Build
-  if [ "${BUILDDONE}" = "false" ] || [ "${MODEL}" != "${MODELID}" ]; then
+  if [ "${BUILDDONE}" == "false" ] || [ "${MODEL}" != "${MODELID}" ]; then
    arcModel
  else
    make
  fi
-elif [ "${ARCMODE}" = "config" ]; then
-  [ "${CONFDONE}" = "true" ] && NEXT="2" || NEXT="1"
-  [ "${BUILDDONE}" = "true" ] && NEXT="3" || NEXT="1"
+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
+    echo "= \"\Z4========== Main ==========\Zn \" "                                            >"${TMP_PATH}/menu"
+    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" ]; then
+    if [ "${CONFDONE}" == "true" ] && [ -n "${IPCON}" ]; then
      echo "2 \"Build Loader \" "                                                             >>"${TMP_PATH}/menu"
    fi
-    if [ "${BUILDDONE}" = "true" ]; then
+    if [ "${BUILDDONE}" == "true" ]; then
      echo "3 \"Boot Loader \" "                                                              >>"${TMP_PATH}/menu"
    fi
-    echo "= \"\Z4===== Info =====\Zn \" "                                                     >>"${TMP_PATH}/menu"
+    echo "= \"\Z4========== Info ==========\Zn \" "                                           >>"${TMP_PATH}/menu"
    echo "a \"Sysinfo \" "                                                                    >>"${TMP_PATH}/menu"
    echo "A \"Networkdiag \" "                                                                >>"${TMP_PATH}/menu"
-    echo "= \"\Z4===== System ====\Zn \" "                                                    >>"${TMP_PATH}/menu"
-    if [ "${CONFDONE}" = "true" ]; then
-      if [ "${ARCOPTS}" = "true" ]; then
+    echo "= \"\Z4========== System ========\Zn \" "                                           >>"${TMP_PATH}/menu"
+    if [ "${CONFDONE}" == "true" ]; then
+      if [ "${ARCOPTS}" == "true" ]; then
        echo "4 \"\Z1Hide Arc DSM Options\Zn \" "                                             >>"${TMP_PATH}/menu"
      else
        echo "4 \"\Z1Show Arc DSM Options\Zn \" "                                             >>"${TMP_PATH}/menu"
      fi
-      if [ "${ARCOPTS}" = "true" ]; then
-        echo "= \"\Z4==== Arc DSM ====\Zn \" "                                                >>"${TMP_PATH}/menu"
+      if [ "${ARCOPTS}" == "true" ]; then
+        echo "= \"\Z4======== Arc DSM ========\Zn \" "                                        >>"${TMP_PATH}/menu"
        echo "b \"Addons \" "                                                                 >>"${TMP_PATH}/menu"
        echo "d \"Modules \" "                                                                >>"${TMP_PATH}/menu"
        echo "e \"Version \" "                                                                >>"${TMP_PATH}/menu"
        echo "p \"SN/Mac Options \" "                                                         >>"${TMP_PATH}/menu"
-        if [ "${DT}" = "false" ] && [ ${SATACONTROLLER} -gt 0 ]; then
+        if [ "${DT}" == "false" ] && [ ${SATACONTROLLER} -gt 0 ]; then
          echo "S \"Sata PortMap \" "                                                         >>"${TMP_PATH}/menu"
        fi
-        if [ "${DT}" = "true" ]; then
+        if [ "${DT}" == "true" ]; then
          echo "o \"DTS Map Options \" "                                                      >>"${TMP_PATH}/menu"
        fi
        if readConfigMap "addons" "${USER_CONFIG_FILE}" | grep -q "cpufreqscaling"; then
@@ -870,77 +880,75 @@ elif [ "${ARCMODE}" = "config" ]; then
        if readConfigMap "addons" "${USER_CONFIG_FILE}" | grep -q "sequentialio"; then
          echo "Q \"SequentialIO Options \" "                                                 >>"${TMP_PATH}/menu"
        fi
-        if [ "${PLATFORM}" = "epyc7002" ]; then
-          echo "K \"Kernel: \Z4${KERNEL}\Zn \" "                                              >>"${TMP_PATH}/menu"
-        fi
-        if [ "${DT}" = "true" ]; then
-          echo "H \"Hotplug/SortDrives: \Z4${HDDSORT}\Zn \" "                                 >>"${TMP_PATH}/menu"
-        else
-          echo "h \"USB Mount: \Z4${USBMOUNT}\Zn \" "                                         >>"${TMP_PATH}/menu"
-        fi
      fi
-      if [ "${BOOTOPTS}" = "true" ]; then
+      if [ "${BOOTOPTS}" == "true" ]; then
        echo "6 \"\Z1Hide Boot Options\Zn \" "                                                >>"${TMP_PATH}/menu"
      else
        echo "6 \"\Z1Show Boot Options\Zn \" "                                                >>"${TMP_PATH}/menu"
      fi
-      if [ "${BOOTOPTS}" = "true" ]; then
-        echo "= \"\Z4===== Boot =====\Zn \" "                                                 >>"${TMP_PATH}/menu"
-        echo "m \"Boot Kernelload: \Z4${KERNELLOAD}\Zn \" "                                   >>"${TMP_PATH}/menu"
+      if [ "${BOOTOPTS}" == "true" ]; then
+        echo "= \"\Z4========== Boot =========\Zn \" "                                        >>"${TMP_PATH}/menu"
+        echo "m \"Boot Kernelload: \Z4${KERNELLOAD}\Zn \" "                                    >>"${TMP_PATH}/menu"
        echo "E \"eMMC Boot Support: \Z4${EMMCBOOT}\Zn \" "                                   >>"${TMP_PATH}/menu"
-        if [ "${DIRECTBOOT}" = "false" ]; then
+        if [ "${DIRECTBOOT}" == "false" ]; then
          echo "i \"Boot IP Waittime: \Z4${BOOTIPWAIT}\Zn \" "                                >>"${TMP_PATH}/menu"
        fi
        echo "q \"Directboot: \Z4${DIRECTBOOT}\Zn \" "                                        >>"${TMP_PATH}/menu"
      fi
-      if [ "${DSMOPTS}" = "true" ]; then
+      if [ "${DSMOPTS}" == "true" ]; then
        echo "7 \"\Z1Hide DSM Options\Zn \" "                                                 >>"${TMP_PATH}/menu"
      else
        echo "7 \"\Z1Show DSM Options\Zn \" "                                                 >>"${TMP_PATH}/menu"
      fi
-      if [ "${DSMOPTS}" = "true" ]; then
-        echo "= \"\Z4===== DSM =====\Zn \" "                                                  >>"${TMP_PATH}/menu"
+      if [ "${DSMOPTS}" == "true" ]; then
+        echo "= \"\Z4========== DSM ==========\Zn \" "                                        >>"${TMP_PATH}/menu"
        echo "j \"Cmdline \" "                                                                >>"${TMP_PATH}/menu"
        echo "k \"Synoinfo \" "                                                               >>"${TMP_PATH}/menu"
-        echo "N \"Add new User\" "                                                            >>"${TMP_PATH}/menu"
-        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 "l \"Edit User Config \" "                                                       >>"${TMP_PATH}/menu"
-        echo "s \"Allow Downgrade Version \" "                                                >>"${TMP_PATH}/menu"
+        echo "s \"Allow Downgrade \" "                                                        >>"${TMP_PATH}/menu"
+        echo "t \"Change User Password \" "                                                   >>"${TMP_PATH}/menu"
+        echo "N \"Add new User\" "                                                            >>"${TMP_PATH}/menu"
+        echo "J \"Reset Network Config \" "                                                   >>"${TMP_PATH}/menu"
+        echo "M \"Mount DSM Storage Pool (not SHR) \" "                                       >>"${TMP_PATH}/menu"
+        echo "T \"Disable all scheduled Tasks \" "                                            >>"${TMP_PATH}/menu"
+        if [ "${PLATFORM}" == "epyc7002" ]; then
+          echo "K \"Kernel: \Z4${KERNEL}\Zn \" "                                              >>"${TMP_PATH}/menu"
+        fi
+        if [ "${DT}" == "true" ]; then
+          echo "H \"Hotplug/SortDrives: \Z4${HDDSORT}\Zn \" "                                 >>"${TMP_PATH}/menu"
+        else
+          echo "h \"USB Mount: \Z4${USBMOUNT}\Zn \" "                                         >>"${TMP_PATH}/menu"
+        fi
        echo "O \"Official Driver Priority: \Z4${ODP}\Zn \" "                                 >>"${TMP_PATH}/menu"
+        echo "B \"Grep DSM Config from Backup \" "                                            >>"${TMP_PATH}/menu"
      fi
    fi
-    if [ "${LOADEROPTS}" = "true" ]; then
+    if [ "${LOADEROPTS}" == "true" ]; then
      echo "8 \"\Z1Hide Loader Options\Zn \" "                                                >>"${TMP_PATH}/menu"
    else
      echo "8 \"\Z1Show Loader Options\Zn \" "                                                >>"${TMP_PATH}/menu"
    fi
-    if [ "${LOADEROPTS}" = "true" ]; then
-      echo "= \"\Z4===== Loader =====\Zn \" "                                                 >>"${TMP_PATH}/menu"
-      echo "c \"Offline Mode: \Z4${ARCOFFLINE}\Zn \" "                                        >>"${TMP_PATH}/menu"
+    if [ "${LOADEROPTS}" == "true" ]; then
+      echo "= \"\Z4========= Loader =========\Zn \" "                                         >>"${TMP_PATH}/menu"
+      echo "= \"\Z1=== Edit with caution! ===\Zn \" "                                         >>"${TMP_PATH}/menu"
      echo "D \"StaticIP for Loader/DSM \" "                                                  >>"${TMP_PATH}/menu"
+      echo "c \"Offline Mode: \Z4${ARCOFFLINE}\Zn \" "                                        >>"${TMP_PATH}/menu"
      echo "f \"Bootscreen Options \" "                                                       >>"${TMP_PATH}/menu"
-      echo "U \"Change Loader Password \" "                                                   >>"${TMP_PATH}/menu"
-      echo "Z \"Change Loader Ports \" "                                                      >>"${TMP_PATH}/menu"
-      echo "w \"Reset Loader to Defaults \" "                                                 >>"${TMP_PATH}/menu"
-      echo "L \"Grep Logs from dbgutils \" "                                                  >>"${TMP_PATH}/menu"
-      echo "B \"Grep DSM Config from Backup \" "                                              >>"${TMP_PATH}/menu"
-      echo "= \"\Z1== Edit with caution! ==\Zn \" "                                           >>"${TMP_PATH}/menu"
      echo "W \"RD Compression: \Z4${RD_COMPRESSED}\Zn \" "                                   >>"${TMP_PATH}/menu"
      echo "X \"Sata DOM: \Z4${SATADOM}\Zn \" "                                               >>"${TMP_PATH}/menu"
      echo "u \"LKM Version: \Z4${LKM}\Zn \" "                                                >>"${TMP_PATH}/menu"
+      echo "L \"Grep Logs from dbgutils \" "                                                  >>"${TMP_PATH}/menu"
+      echo "U \"Change Loader Password \" "                                                   >>"${TMP_PATH}/menu"
+      echo "Z \"Change Loader Ports \" "                                                      >>"${TMP_PATH}/menu"
+      echo "w \"Reset Loader to Defaults \" "                                                 >>"${TMP_PATH}/menu"
      echo "C \"Clone Loader to another Disk \" "                                             >>"${TMP_PATH}/menu"
      echo "n \"Grub Bootloader Config \" "                                                   >>"${TMP_PATH}/menu"
      echo "y \"Choose a Keymap for Loader \" "                                               >>"${TMP_PATH}/menu"
      echo "F \"\Z1Formate Disks \Zn \" "                                                     >>"${TMP_PATH}/menu"
    fi
-    echo "= \"\Z4===== Misc =====\Zn \" "                                                     >>"${TMP_PATH}/menu"
+    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"

@@ -959,36 +967,36 @@ elif [ "${ARCMODE}" = "config" ]; then
      A) networkdiag; NEXT="A" ;;
      # System Section
      # Arc Section
-      4) [ "${ARCOPTS}" = "true" ] && ARCOPTS='false' || ARCOPTS='true'
+      4) [ "${ARCOPTS}" == "true" ] && ARCOPTS='false' || ARCOPTS='true'
        ARCOPTS="${ARCOPTS}"
        NEXT="4"
        ;;
      b) addonMenu; NEXT="b" ;;
      d) modulesMenu; NEXT="d" ;;
      e) ONLYVERSION="true" && arcVersion; NEXT="e" ;;
-      p) ONLYPATCH="true" && checkHardwareID && arcPatch; NEXT="p" ;;
+      p) ONLYPATCH="true" && arcPatch; NEXT="p" ;;
      S) storageMenu; NEXT="S" ;;
      o) dtsMenu; NEXT="o" ;;
      g) governorMenu; NEXT="g" ;;
      P) storagepanelMenu; NEXT="P" ;;
      Q) sequentialIOMenu; NEXT="Q" ;;
      # Boot Section
-      6) [ "${BOOTOPTS}" = "true" ] && BOOTOPTS='false' || BOOTOPTS='true'
+      6) [ "${BOOTOPTS}" == "true" ] && BOOTOPTS='false' || BOOTOPTS='true'
        BOOTOPTS="${BOOTOPTS}"
        NEXT="6"
        ;;
-      m) [ "${KERNELLOAD}" = "kexec" ] && KERNELLOAD='power' || KERNELLOAD='kexec'
+      m) [ "${KERNELLOAD}" == "kexec" ] && KERNELLOAD='power' || KERNELLOAD='kexec'
        writeConfigKey "kernelload" "${KERNELLOAD}" "${USER_CONFIG_FILE}"
        NEXT="m"
        ;;
-      E) [ "${EMMCBOOT}" = "true" ] && EMMCBOOT='false' || EMMCBOOT='true'
-        if [ "${EMMCBOOT}" = "false" ]; then
+      E) [ "${EMMCBOOT}" == "true" ] && EMMCBOOT='false' || EMMCBOOT='true'
+        if [ "${EMMCBOOT}" == "false" ]; then
          writeConfigKey "emmcboot" "false" "${USER_CONFIG_FILE}"
          deleteConfigKey "synoinfo.disk_swap" "${USER_CONFIG_FILE}"
          deleteConfigKey "synoinfo.supportraid" "${USER_CONFIG_FILE}"
          deleteConfigKey "synoinfo.support_emmc_boot" "${USER_CONFIG_FILE}"
          deleteConfigKey "synoinfo.support_install_only_dev" "${USER_CONFIG_FILE}"
-        elif [ "${EMMCBOOT}" = "true" ]; then
+        elif [ "${EMMCBOOT}" == "true" ]; then
          writeConfigKey "emmcboot" "true" "${USER_CONFIG_FILE}"
          writeConfigKey "synoinfo.disk_swap" "no" "${USER_CONFIG_FILE}"
          writeConfigKey "synoinfo.supportraid" "no" "${USER_CONFIG_FILE}"
@@ -1000,13 +1008,13 @@ elif [ "${ARCMODE}" = "config" ]; then
        NEXT="E"
        ;;
      i) bootipwaittime; NEXT="i" ;;
-      q) [ "${DIRECTBOOT}" = "false" ] && DIRECTBOOT='true' || DIRECTBOOT='false'
+      q) [ "${DIRECTBOOT}" == "false" ] && DIRECTBOOT='true' || DIRECTBOOT='false'
        grub-editenv ${USER_GRUBENVFILE} create
        writeConfigKey "directboot" "${DIRECTBOOT}" "${USER_CONFIG_FILE}"
        NEXT="q"
        ;;
      # DSM Section
-      7) [ "${DSMOPTS}" = "true" ] && DSMOPTS='false' || DSMOPTS='true'
+      7) [ "${DSMOPTS}" == "true" ] && DSMOPTS='false' || DSMOPTS='true'
        DSMOPTS="${DSMOPTS}"
        NEXT="7"
        ;;
@@ -1019,37 +1027,40 @@ elif [ "${ARCMODE}" = "config" ]; then
      J) resetDSMNetwork; NEXT="J" ;;
      M) mountDSM; NEXT="M" ;;
      T) disablescheduledTasks; NEXT="T" ;;
-      K) KERNEL=$([ "${KERNEL}" = "official" ] && echo 'custom' || echo 'official')
+      Z) loaderPorts; NEXT="Z" ;;
+      K) [ "${KERNEL}" == "official" ] && KERNEL='custom' || KERNEL='official'
        writeConfigKey "kernel" "${KERNEL}" "${USER_CONFIG_FILE}"
        dialog --backtitle "$(backtitle)" --title "Kernel" \
          --infobox "Switching Kernel to ${KERNEL}! Stay patient..." 4 50
-        if [ "${ODP}" = "true" ]; then
+        if [ "${ODP}" == "true" ]; then
          ODP="false"
          writeConfigKey "odp" "${ODP}" "${USER_CONFIG_FILE}"
        fi
        PLATFORM="$(readConfigKey "platform" "${USER_CONFIG_FILE}")"
        PRODUCTVER="$(readConfigKey "productver" "${USER_CONFIG_FILE}")"
        KVER="$(readConfigKey "platforms.${PLATFORM}.productvers.\"${PRODUCTVER}\".kver" "${P_FILE}")"
-        [ "${PLATFORM}" = "epyc7002" ] && KVERP="${PRODUCTVER}-${KVER}" || KVERP="${KVER}"
-        if [ -n "${PLATFORM}" ] && [ -n "${KVERP}" ]; then
+        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}")"
        NEXT="K"
        ;;
-      H) [ "${HDDSORT}" = "true" ] && HDDSORT='false' || HDDSORT='true'
+      H) [ "${HDDSORT}" == "true" ] && HDDSORT='false' || HDDSORT='true'
        writeConfigKey "hddsort" "${HDDSORT}" "${USER_CONFIG_FILE}"
        writeConfigKey "arc.builddone" "false" "${USER_CONFIG_FILE}"
        BUILDDONE="$(readConfigKey "arc.builddone" "${USER_CONFIG_FILE}")"
        NEXT="H"
        ;;
-      h) if [ "${USBMOUNT}" = "auto" ]; then
+      h) if [ "${USBMOUNT}" == "auto" ]; then
          USBMOUNT='internal'
-        elif [ "${USBMOUNT}" = "internal" ]; then
+        elif [ "${USBMOUNT}" == "internal" ]; then
          USBMOUNT='external'
-        elif [ "${USBMOUNT}" = "external" ]; then
+        elif [ "${USBMOUNT}" == "external" ]; then
          USBMOUNT='auto'
        fi
        writeConfigKey "usbmount" "${USBMOUNT}" "${USER_CONFIG_FILE}"
@@ -1057,7 +1068,7 @@ elif [ "${ARCMODE}" = "config" ]; then
        BUILDDONE="$(readConfigKey "arc.builddone" "${USER_CONFIG_FILE}")"
        NEXT="h"
        ;;
-      O) [ "${ODP}" = "false" ] && ODP='true' || ODP='false'
+      O) [ "${ODP}" == "false" ] && ODP='true' || ODP='false'
        writeConfigKey "odp" "${ODP}" "${USER_CONFIG_FILE}"
        writeConfigKey "arc.builddone" "false" "${USER_CONFIG_FILE}"
        BUILDDONE="$(readConfigKey "arc.builddone" "${USER_CONFIG_FILE}")"
@@ -1065,33 +1076,32 @@ elif [ "${ARCMODE}" = "config" ]; then
        ;;
      B) getbackup; NEXT="B" ;;
      # Loader Section
-      8) [ "${LOADEROPTS}" = "true" ] && LOADEROPTS='false' || LOADEROPTS='true'
+      8) [ "${LOADEROPTS}" == "true" ] && LOADEROPTS='false' || LOADEROPTS='true'
        LOADEROPTS="${LOADEROPTS}"
        NEXT="8"
        ;;
-      c) ARCOFFLINE=$([ "${ARCOFFLINE}" = "true" ] && echo 'false' || echo 'true')
+      D) staticIPMenu; NEXT="D" ;;
+      c) [ "${ARCOFFLINE}" == "true" ] && ARCOFFLINE='false' || ARCOFFLINE='true'
        writeConfigKey "arc.offline" "${ARCOFFLINE}" "${USER_CONFIG_FILE}"
-        [ "${ARCOFFLINE}" = "false" ] && ./arc.sh
+        [ "${ARCOFFLINE}" == "false" ] && exec arc.sh
        NEXT="c"
        ;;
-      D) staticIPMenu; NEXT="D" ;;
      f) bootScreen; NEXT="f" ;;
-      Z) loaderPorts; NEXT="Z" ;;
-      U) loaderPassword; NEXT="U" ;;
-      W) RD_COMPRESSED=$([ "${RD_COMPRESSED}" = "true" ] && echo 'false' || echo 'true')
+      W) [ "${RD_COMPRESSED}" == "true" ] && RD_COMPRESSED='false' || RD_COMPRESSED='true'
        writeConfigKey "rd-compressed" "${RD_COMPRESSED}" "${USER_CONFIG_FILE}"
        writeConfigKey "arc.builddone" "false" "${USER_CONFIG_FILE}"
        BUILDDONE="$(readConfigKey "arc.builddone" "${USER_CONFIG_FILE}")"
        NEXT="W"
        ;;
      X) satadomMenu; NEXT="X" ;;
-      u) [ "${LKM}" = "prod" ] && LKM='dev' || LKM='prod'
+      u) [ "${LKM}" == "prod" ] && LKM='dev' || LKM='prod'
        writeConfigKey "lkm" "${LKM}" "${USER_CONFIG_FILE}"
        writeConfigKey "arc.builddone" "false" "${USER_CONFIG_FILE}"
        BUILDDONE="$(readConfigKey "arc.builddone" "${USER_CONFIG_FILE}")"
        NEXT="u"
        ;;
      L) greplogs; NEXT="L" ;;
+      U) loaderPassword; NEXT="U" ;;
      w) resetLoader; NEXT="w" ;;
      C) cloneLoader; NEXT="C" ;;
      n) editGrubCfg; NEXT="n" ;;
@@ -1105,18 +1115,16 @@ elif [ "${ARCMODE}" = "config" ]; then
    esac
  done
  clear
-else
-  exec reboot
 fi

 # Inform user
-echo -e "Call \033[1;34marc\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 -e "Call \033[1;34marc.sh\033[0m to configure Loader"
 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
@@ -3,20 +3,20 @@
 set -e
 [[ -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}/include/functions.sh

 # Clear logs for dbgutils addons
 rm -rf "${PART1_PATH}/logs" >/dev/null 2>&1 || true

 BUILDDONE="$(readConfigKey "arc.builddone" "${USER_CONFIG_FILE}")"
-[ "${BUILDDONE}" = "false" ] && die "Loader build not completed!"
+[ "${BUILDDONE}" == "false" ] && die "Loader build not completed!"
 ARC_BRANCH="$(readConfigKey "arc.branch" "${USER_CONFIG_FILE}")"

 # Get Loader Disk Bus
 [ -z "${LOADER_DISK}" ] && die "Loader Disk not found!"
 BUS=$(getBus "${LOADER_DISK}")
-FBI=$(cat /sys/class/graphics/fb*/name 2>/dev/null | head -1)
-EFI=$([ -d /sys/firmware/efi ] && echo 1 || echo 0)
+# Check if machine has EFI
+[ -d /sys/firmware/efi ] && EFI=1 || EFI=0

 # Print Title centralized
 clear
@@ -55,12 +55,11 @@ 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
+if [ "${DSMINFO}" == "true" ]; then
  echo -e "\033[1;37mDSM:\033[0m"
  echo -e "Model: \033[1;37m${MODELID:-${MODEL}}\033[0m"
  echo -e "Platform: \033[1;37m${PLATFORM}\033[0m"
@@ -68,26 +67,22 @@ if [ "${DSMINFO}" = "true" ]; then
  echo -e "LKM: \033[1;37m${LKM}\033[0m"
  echo
 fi
-if [ "${SYSTEMINFO}" = "true" ]; then
+if [ "${SYSTEMINFO}" == "true" ]; then
  echo -e "\033[1;37mSystem:\033[0m"
  echo -e "Vendor: \033[1;37m${VENDOR}\033[0m"
  echo -e "CPU: \033[1;37m${CPU}\033[0m"
  echo -e "Memory: \033[1;37m${RAMTOTAL}GB\033[0m"
  echo
 fi
-if [ "${DISKINFO}" = "true" ]; then
+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;37mHWID:\033[0m"
-  echo -e "HWID: \033[1;37m$(genHWID)\033[0m"
-fi

 if ! readConfigMap "addons" "${USER_CONFIG_FILE}" | grep -q nvmesystem; then
  HASATA=0
  for D in $(lsblk -dpno NAME); do
-    [ "${D}" = "${LOADER_DISK}" ] && continue
+    [ "${D}" == "${LOADER_DISK}" ] && continue
    if echo "sata sas scsi" | grep -qw "$(getBus "${D}")"; then
      HASATA=1
      break
@@ -107,40 +102,26 @@ 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
@@ -151,14 +132,14 @@ if [ $(echo "${KVER:-4}" | cut -d'.' -f1) -lt 5 ]; then
    SIZE=$((${SZ:-0} * ${SS:-0} / 1024 / 1024 + 10))
    # Read SATADoM type
    SATADOM="$(readConfigKey "satadom" "${USER_CONFIG_FILE}")"
-    CMDLINE["synoboot_satadom"]="${SATADOM:-2}"
-    CMDLINE["dom_szmax"]="${SIZE}"
+    CMDLINE['synoboot_satadom']="${SATADOM:-2}"
+    CMDLINE['dom_szmax']="${SIZE}"
  fi
-  CMDLINE['elevator']="elevator"
+  CMDLINE["elevator"]="elevator"
 else
  CMDLINE["split_lock_detect"]="off"
 fi
-if [ "${DT}" = "true" ]; then
+if [ "${DT}" == "true" ]; then
  CMDLINE["syno_ttyS0"]="serial,0x3f8"
  CMDLINE["syno_ttyS1"]="serial,0x2f8"
 else
@@ -168,37 +149,32 @@ else
 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['no_console_suspend']="1"
-CMDLINE["root"]="/dev/md0"
-CMDLINE["loglevel"]="15"
-CMDLINE["log_buf_len"]="32M"
-CMDLINE["rootwait"]=""
-CMDLINE["panic"]="${KERNELPANIC:-0}"
+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['rootwait']=""
+CMDLINE['loglevel']="15"
+CMDLINE['log_buf_len']="32M"
+CMDLINE['panic']="${KERNELPANIC:-0}"
+CMDLINE['pcie_aspm']="off"
+CMDLINE['modprobe.blacklist']="${MODBLACKLIST}"
+#[ $(cat /proc/cpuinfo | grep Intel | wc -l) -gt 0 ] && CMDLINE["intel_pstate"]="disable"

-# DSM Specific Cmdline
-CMDLINE["pcie_aspm"]="off"
-CMDLINE["modprobe.blacklist"]="${MODBLACKLIST}"
-[ $(cat /proc/cpuinfo | grep Intel | wc -l) -gt 0 ] && CMDLINE["intel_pstate"]="disable" || true
-# [ $(cat /proc/cpuinfo | grep AMD | wc -l) -gt 0 ] && CMDLINE["amd_pstate"]="disable" || true
-# CMDLINE["nomodeset"]=""
-if echo "apollolake geminilake purley" | grep -wq "${PLATFORM}"; then
-  CMDLINE["nox2apic"]=""
-fi
 #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 ! 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 [ "${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
 fi
 # CMDLINE['kvm.ignore_msrs']="1"
@@ -210,19 +186,20 @@ if echo "purley broadwellnkv2" | grep -wq "${PLATFORM}"; then
  CMDLINE["SASmodel"]="1"
 fi

-# NIC Cmdline
-ETHX=$(ls /sys/class/net/ 2>/dev/null | grep eth) || true
-ETHM=$(readConfigKey "${MODEL}.ports" "${S_FILE}" 2>/dev/null)
-ETHN=$(echo ${ETHX} | wc -w)
+# Cmdline NIC Settings
+ETHX="$(ls /sys/class/net 2>/dev/null | 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))
+for ETH in ${ETHX}; do
+  MAC="$(readConfigKey "${ETH}" "${USER_CONFIG_FILE}")"
+  [ -z "${MAC}" ] && MAC="$(cat /sys/class/net/${ETH}/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
@@ -236,7 +213,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}"
@@ -244,26 +221,46 @@ done
 CMDLINE_LINE=$(echo "${CMDLINE_LINE}" | sed 's/^ //') # Remove leading space
 echo "${CMDLINE_LINE}" >"${PART1_PATH}/cmdline.yml"

+function _bootwait() {
+  # Exec Bootwait to check SSH/Web connection
+  BOOTWAIT=5
+  busybox w 2>/dev/null | awk '{print $1" "$2" "$4" "$5" "$6}' >WB
+  MSG=""
+  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 SSH/Web detected and boot is interrupted.\033[0m\n"
+      rm -f WB WC
+      exit 0
+    fi
+    sleep 1
+    BOOTWAIT=$((BOOTWAIT - 1))
+  done
+  rm -f WB WC
+  echo -en "\r$(printf "%$((${#MSG} * 2))s" " ")\n"
+  return 0
+}
+
 # Boot
 DIRECTBOOT="$(readConfigKey "directboot" "${USER_CONFIG_FILE}")"
-if [ "${DIRECTBOOT}" = "true" ]; then
+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"
-  if ! _bootwait; then
-    exit 0
-  fi
+  _bootwait || true
  echo -e "\033[1;34mReboot with Directboot\033[0m"
-  reboot
+  exec reboot
  exit 0
-elif [ "${DIRECTBOOT}" = "false" ]; then
+elif [ "${DIRECTBOOT}" == "false" ]; then
  grub-editenv ${USER_GRUBENVFILE} unset dsm_cmdline
  grub-editenv ${USER_GRUBENVFILE} unset next_entry
  KERNELLOAD="$(readConfigKey "kernelload" "${USER_CONFIG_FILE}")"
  BOOTIPWAIT="$(readConfigKey "bootipwait" "${USER_CONFIG_FILE}")"
  [ -z "${BOOTIPWAIT}" ] && BOOTIPWAIT=30
  IPCON=""
-  if [ "${ARCPATCH}" = "true" ]; then
+  if [ "${ARCPATCH}" == "true" ]; then
    echo -e "\033[1;37mDetected ${ETHN} NIC\033[0m | \033[1;34mUsing ${NIC} NIC for Arc Patch:\033[0m"
  else
    echo -e "\033[1;37mDetected ${ETHN} NIC:\033[0m"
@@ -271,18 +268,18 @@ elif [ "${DIRECTBOOT}" = "false" ]; then
  echo
  [ ! -f /var/run/dhcpcd/pid ] && /etc/init.d/S41dhcpcd restart >/dev/null 2>&1 || true
  sleep 3
-  for N in ${ETHX}; do
+  for ETH in ${ETHX}; do
    COUNT=0
-    DRIVER=$(ls -ld /sys/class/net/${N}/device/driver 2>/dev/null | awk -F '/' '{print $NF}')
+    DRIVER=$(ls -ld /sys/class/net/${ETH}/device/driver 2>/dev/null | awk -F '/' '{print $NF}')
    while true; do
-      if [ "0" = "$(cat /sys/class/net/${N}/carrier 2>/dev/null)" ]; then
+      if ethtool ${ETH} 2>/dev/null | grep 'Link detected' | grep -q 'no'; then
        echo -e "\r${DRIVER}: \033[1;37mNOT CONNECTED\033[0m"
        break
      fi
-      COUNT=$((COUNT + 1))
-      IP="$(getIP "${N}")"
+      COUNT=$((${COUNT} + 1))
+      IP="$(getIP ${ETH})"
      if [ -n "${IP}" ]; then
-        SPEED=$(ethtool ${N} 2>/dev/null | grep "Speed:" | awk '{print $2}')
+        SPEED=$(ethtool ${ETH} 2>/dev/null | grep "Speed:" | awk '{print $2}')
        if [[ "${IP}" =~ ^169\.254\..* ]]; then
          echo -e "\r${DRIVER} (${SPEED}): \033[1;37mLINK LOCAL (No DHCP server found.)\033[0m"
        else
@@ -291,7 +288,7 @@ elif [ "${DIRECTBOOT}" = "false" ]; then
        fi
        break
      fi
-      if [ -z "$(cat /sys/class/net/${N}/carrier 2>/dev/null)" ]; then
+      if ! ip link show ${ETH} 2>/dev/null | grep -q 'UP'; then
        echo -e "\r${DRIVER}: \033[1;37mDOWN\033[0m"
        break
      fi
@@ -302,35 +299,24 @@ elif [ "${DIRECTBOOT}" = "false" ]; then
      sleep 1
    done
  done
-  if ! _bootwait; then
-    exit 0
-  fi
+   _bootwait || true

-  DSMLOGO="$(readConfigKey "bootscreen.dsmlogo" "${USER_CONFIG_FILE}")"
-  if [ "${DSMLOGO}" = "true" ] && [ -c "/dev/fb0" ]; then
+  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/"
-    python3 ${ARC_PATH}/include/functions.py makeqr -d "${URL}" -l "6" -o "${TMP_PATH}/qrcode_boot.png"
+    python ${ARC_PATH}/include/functions.py makeqr -d "${URL}" -l "6" -o "${TMP_PATH}/qrcode_boot.png"
    [ -f "${TMP_PATH}/qrcode_boot.png" ] && echo | fbv -acufi "${TMP_PATH}/qrcode_boot.png" >/dev/null 2>/dev/null || true
  fi

-  for T in $(busybox w 2>/dev/null | grep -v 'TTY' | awk '{print $2}'); do
+  for T in $(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
-
-  # 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
-  # for I in $(find /sys/devices -name uevent -exec bash -c 'cat {} 2>/dev/null | grep -Eq "PCI_CLASS=0?30[0|1|2]00" && dirname {}' \;); do
-  #   [ -e ${I}/reset ] && cat ${I}/vendor >/dev/null | grep -iq 0x10de && echo 1 >${I}/reset || true # Proc open nvidia driver when booting
-  # 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"
@@ -339,6 +325,8 @@ 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"
-  [ "${KERNELLOAD}" = "kexec" ] && kexec -e || poweroff
-  exit 0
-fi
+  # Boot to DSM
+  [ "${KERNELLOAD}" == "kexec" ] && exec kexec -e || exec poweroff
+fi
+
+exit 0
--- a/files/initrd/opt/arc/bzImage-to-vmlinux.sh
+++ b/files/initrd/opt/arc/bzImage-to-vmlinux.sh
@@ -1,16 +1,16 @@
 #!/usr/bin/env bash

 read_u8() {
-  dd if="${1}" bs=1 skip="$((${2}))" count=1 2>/dev/null | od -An -tu1 | grep -Eo '[0-9]+'
+  dd if=$1 bs=1 skip=$(($2)) count=1 2>/dev/null | od -An -tu1 | grep -Eo '[0-9]+'
 }
 read_u32() {
-  dd if="${1}" bs=1 skip="$((${2}))" count=4 2>/dev/null | od -An -tu4 | grep -Eo '[0-9]+'
+  dd if=$1 bs=1 skip=$(($2)) count=4 2>/dev/null | od -An -tu4 | grep -Eo '[0-9]+'
 }

 set -x
-setup_size=$(read_u8 "${1}" 0x1f1)
-payload_offset=$(read_u32 "${1}" 0x248)
-payload_length=$(read_u32 "${1}" 0x24c)
-inner_pos=$(((setup_size + 1) * 512))
+setup_size=$(read_u8 $1 0x1f1)
+payload_offset=$(read_u32 $1 0x248)
+payload_length=$(read_u32 $1 0x24c)
+inner_pos=$((($setup_size + 1) * 512))

-tail -c+$(($inner_pos + 1)) "${1}" | tail -c+$(($payload_offset + 1)) | head -c "${payload_length}" | head -c $(($payload_length - 4)) | unlzma >"${2}"
+tail -c+$(($inner_pos + 1)) $1 | tail -c+$(($payload_offset + 1)) | head -c $(($payload_length)) | head -c $(($payload_length - 4)) | unlzma >$2
--- a/files/initrd/opt/arc/calc_run_size.sh
+++ b/files/initrd/opt/arc/calc_run_size.sh
@@ -0,0 +1,42 @@
+#!/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}"'.*/\1\4/p')
+if [ -z "$OUT" ]; then
+  echo "Never found .bss or .brk file offset" >&2
+  exit 1
+fi
+
+OUT=$(echo ${OUT# })
+sizeA=$(printf "%d" 0x${OUT%% *})
+OUT=${OUT#* }
+offsetA=$(printf "%d" 0x${OUT%% *})
+OUT=${OUT#* }
+sizeB=$(printf "%d" 0x${OUT%% *})
+OUT=${OUT#* }
+offsetB=$(printf "%d" 0x${OUT%% *})
+
+run_size=$((${offsetA} + ${sizeA} + ${sizeB}))
+
+# BFD linker shows the same file offset in ELF.
+if [ "${offsetA}" -ne "${offsetB}" ]; then
+  # Gold linker shows them as consecutive.
+  endB=$((${offsetB} + ${sizeB}))
+  if [ "$endB" != "$run_size" ]; 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" ${run_size}
+exit 0
--- a/files/initrd/opt/arc/extract-vmlinux
+++ b/files/initrd/opt/arc/extract-vmlinux
@@ -10,34 +10,38 @@
 #
 # ----------------------------------------------------------------------

-check_vmlinux() {
-  # Use readelf to check if it's a valid ELF
-  # TODO: find a better to way to check that it's really vmlinux
-  #       and not just an elf
-  readelf -h $1 >/dev/null 2>&1 || return 1
+check_vmlinux()
+{
+	# Use readelf to check if it's a valid ELF
+	# TODO: find a better to way to check that it's really vmlinux
+	#       and not just an elf
+	readelf -h $1 > /dev/null 2>&1 || return 1

-  cat $1
-  exit 0
+	cat $1
+	exit 0
 }

-try_decompress() {
-  # The obscure use of the "tr" filter is to work around older versions of
-  # "grep" that report the byte offset of the line instead of the pattern.
+try_decompress()
+{
+	# The obscure use of the "tr" filter is to work around older versions of
+	# "grep" that report the byte offset of the line instead of the pattern.

-  # Try to find the header ($1) and decompress from here
-  for pos in $(tr "$1\n$2" "\n$2=" <"$img" | grep -abo "^$2"); do
-    pos=${pos%%:*}
-    tail -c+$pos "$img" | $3 >$tmp 2>/dev/null
-    check_vmlinux $tmp
-  done
+	# Try to find the header ($1) and decompress from here
+	for	pos in `tr "$1\n$2" "\n$2=" < "$img" | grep -abo "^$2"`
+	do
+		pos=${pos%%:*}
+		tail -c+$pos "$img" | $3 > $tmp 2> /dev/null
+		check_vmlinux $tmp
+	done
 }

 # Check invocation:
 me=${0##*/}
 img=$1
-if [ $# -ne 1 ] || [ ! -s "$img" ]; then
-  echo "Usage: $me <kernel-image>" >&2
-  exit 2
+if	[ $# -ne 1 -o ! -s "$img" ]
+then
+	echo "Usage: $me <kernel-image>" >&2
+	exit 2
 fi

 # Prepare temp files:
@@ -57,4 +61,4 @@ try_decompress '(\265/\375'   xxx   unzstd
 check_vmlinux $img

 # Bail out:
-echo "$me: Cannot find vmlinux." >&2
+echo "$me: Cannot find vmlinux." >&2
--- 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})
@@ -16,24 +15,19 @@ function availableAddons() {
    [ "${AVAILABLE}" = false ] && continue
    local SYSTEM=$(readConfigKey "system" "${D}/manifest.yml")
    [ "${SYSTEM}" = true ] && continue
-    if [[ "${ARCOFFLINE}" = "true" || -z "${ARCCONF}" ]] && [[ "${ADDON}" = "amepatch" || "${ADDON}" = "arcdns" ]]; then
+    if [[ "${ARCOFFLINE}" == "true" || -z "${ARCCONF}" ]] && [[ "${ADDON}" == "amepatch" || "${ADDON}" == "arcdns" ]]; then
      continue
    fi
-    if [ "${MACHINE}" != "Native" ] && [ "${ADDON}" = "cpufreqscaling" ]; then
+    if [ "${MACHINE}" != "Native" ] && [ "${ADDON}" == "cpufreqscaling" ]; then
      continue
    fi
-    if echo "${PAT_URL}" 2>/dev/null | grep -vq "7.2.2"; then
-      if [ "${ADDON}" = "allowdowngrade" ]; then
-        continue
-      fi
-    fi
    local DESC="$(readConfigKey "description" "${D}/manifest.yml")"
    local BETA="$(readConfigKey "beta" "${D}/manifest.yml")"
    local TARGET="$(readConfigKey "target" "${D}/manifest.yml")"
    [ "${BETA}" = true ] && BETA="(Beta) " || BETA=""
-    if [ "${TARGET}" = "app" ]; then
+    if [ "${TARGET}" == "app" ]; then
      [ "${AVAILABLE}" = true ] && echo -e "${ADDON}\t\Z4${BETA}${DESC}\Zn"
-    elif [ "${TARGET}" = "system" ]; then
+    elif [ "${TARGET}" == "system" ]; then
      [ "${AVAILABLE}" = true ] && echo -e "${ADDON}\t\Z1${BETA}${DESC}\Zn"
    else
      [ "${AVAILABLE}" = true ] && echo -e "${ADDON}\t${BETA}${DESC}"
--- a/files/initrd/opt/arc/include/configFile.sh
+++ b/files/initrd/opt/arc/include/configFile.sh
@@ -23,21 +23,7 @@ function writeConfigKey() {
 # Return Value
 function readConfigKey() {
  RESULT=$(yq eval '.'${1}' | explode(.)' "${2}" 2>/dev/null)
-  [ "${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}"
+  [ "${RESULT}" == "null" ] && echo "" || echo "${RESULT}"
 }

 ###############################################################################
--- 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
@@ -1,15 +1,15 @@
 [[ -z "${ARC_PATH}" || ! -d "${ARC_PATH}/include" ]] && ARC_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")/../" 2>/dev/null && pwd)"

-. "${ARC_PATH}/include/consts.sh"
-. "${ARC_PATH}/include/configFile.sh"
-. "${ARC_PATH}/include/addons.sh"
+. ${ARC_PATH}/include/consts.sh
+. ${ARC_PATH}/include/configFile.sh
+. ${ARC_PATH}/include/addons.sh

 ###############################################################################
 # Check loader disk
 function checkBootLoader() {
  while read KNAME RO; do
    [ -z "${KNAME}" ] && continue
-    [ "${RO}" = "0" ] && continue
+    [ "${RO}" == "0" ] && continue
    hdparm -r0 "${KNAME}" >/dev/null 2>&1 || true
  done <<<$(lsblk -pno KNAME,RO 2>/dev/null)
  [ ! -w "${PART1_PATH}" ] && return 1
@@ -49,7 +49,7 @@ function arrayExistItem() {
  ITEM="${1}"
  shift
  for i in "$@"; do
-    [ "${i}" = "${ITEM}" ] || continue
+    [ "${i}" == "${ITEM}" ] || continue
    EXISTS=0
    break
  done
@@ -92,7 +92,7 @@ function genRandomValue() {
 function generateSerial() {
  PREFIX="$(readConfigArray "${1}.prefix" "${S_FILE}" 2>/dev/null | sort -R | tail -1)"
  MIDDLE="$(readConfigArray "${1}.middle" "${S_FILE}" 2>/dev/null | sort -R | tail -1)"
-  if [ "${2}" = "true" ]; then
+  if [ "${2}" == "true" ]; then
    SUFFIX="arc"
  else
    SUFFIX="$(readConfigKey "${1}.suffix" "${S_FILE}" 2>/dev/null)"
@@ -124,7 +124,7 @@ function generateSerial() {
 # Returns serial number
 function generateMacAddress() {
  MACPRE="$(readConfigKey "${1}.macpre" "${S_FILE}")"
-  if [ "${3}" = "true" ]; then
+  if [ "${3}" == "true" ]; then
    MACSUF="$(readConfigKey "${1}.mac" "${S_FILE}" 2>/dev/null)"
  else
    MACSUF="$(printf '%02x%02x%02x' $((${RANDOM} % 256)) $((${RANDOM} % 256)) $((${RANDOM} % 256)))"
@@ -136,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
 }
@@ -188,7 +188,7 @@ function arrayExistItem() {
  ITEM="${1}"
  shift
  for i in "$@"; do
-    [ "${i}" = "${ITEM}" ] || continue
+    [ "${i}" == "${ITEM}" ] || continue
    EXISTS=0
    break
  done
@@ -229,17 +229,18 @@ function _set_conf_kv() {
 # sort netif busid
 function _sort_netif() {
  local ETHLIST=""
-  local ETHX=$(ls /sys/class/net/ 2>/dev/null | grep eth) || true
-  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)"
-    ETHLIST="${ETHLIST}${BUS} ${MAC} ${N}\n"
+  local ETHX="$(ls /sys/class/net/ 2>/dev/null | grep eth)" # real network cards list
+  for ETH in ${ETHX}; do
+    local MAC="$(cat /sys/class/net/${ETH}/address 2>/dev/null | sed 's/://g; s/.*/\L&/')"
+    local BUS="$(ethtool -i ${ETH} 2>/dev/null | grep bus-info | cut -d' ' -f2)"
+    ETHLIST="${ETHLIST}${BUS} ${MAC} ${ETH}\n"
  done
  local ETHLISTTMPB="$(echo -e "${ETHLIST}" | sort)"
  local ETHLIST="$(echo -e "${ETHLISTTMPB}" | grep -v '^$')"
  local ETHSEQ="$(echo -e "${ETHLIST}" | awk '{print $3}' | sed 's/eth//g')"
  local ETHNUM="$(echo -e "${ETHLIST}" | wc -l)"

+  # echo "${ETHSEQ}" >"/tmp/ethseq"
  # sort
  if [ ! "${ETHSEQ}" = "$(seq 0 $((${ETHNUM:0} - 1)))" ]; then
    /etc/init.d/S41dhcpcd stop >/dev/null 2>&1
@@ -277,7 +278,7 @@ function getBus() {
 # 1 - ethN
 function getIP() {
  local IP=""
-  MACR="$(cat /sys/class/net/${1}/address 2>/dev/null | sed 's/://g')"
+  MACR="$(cat /sys/class/net/${1}/address 2>/dev/null | sed 's/://g' | tr '[:lower:]' '[:upper:]')"
  IPR="$(readConfigKey "network.${MACR}" "${USER_CONFIG_FILE}")"
  if [ -n "${IPR}" ]; then
    IFS='/' read -r -a IPRA <<<"${IPR}"
@@ -382,7 +383,7 @@ function rebootTo() {
  local MODES="config recovery junior automated update bios memtest"
  [ -z "${1}" ] && exit 1
  if ! echo "${MODES}" | grep -qw "${1}"; then exit 1; fi
-  [ "${1}" = "automated" ] && echo "arc-${MODEL}-${PRODUCTVER}-${ARC_VERSION}" >"${PART3_PATH}/automated"
+  [ "${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..."
  grub-editenv ${USER_GRUBENVFILE} set next_entry="${1}"
@@ -437,7 +438,7 @@ function extractDSMFiles() {
    echo -e "Could not determine if pat file is encrypted or not, maybe corrupted, try again!"
    ;;
  esac
-  if [ "${isencrypted}" = "yes" ]; then
+  if [ "${isencrypted}" == "yes" ]; then
    # Uses the extractor to untar PAT file
    LD_LIBRARY_PATH="${EXTRACTOR_PATH}" "${EXTRACTOR_PATH}/${EXTRACTOR_BIN}" "${PAT_PATH}" "${EXT_PATH}" >"${LOG_FILE}" 2>&1
  else
@@ -465,7 +466,7 @@ function livepatch() {
    echo -e " - failed!"
    PVALID="false"
  fi
-  if [ "${PVALID}" = "true" ]; then
+  if [ "${PVALID}" == "true" ]; then
    # Patch Ramdisk
    echo -n "Patching Ramdisk"
    if ${ARC_PATH}/ramdisk-patch.sh; then
@@ -476,12 +477,12 @@ function livepatch() {
      PVALID="false"
    fi
  fi
-  if [ "${PVALID}" = "false" ]; then
+  if [ "${PVALID}" == "false" ]; then
    echo
    echo -e "Patching DSM Files failed! Please stay patient for Update."
    sleep 5
    exit 1
-  elif [ "${PVALID}" = "true" ]; then
+  elif [ "${PVALID}" == "true" ]; then
    ZIMAGE_HASH="$(sha256sum "${ORI_ZIMAGE_FILE}" | awk '{print $1}')"
    writeConfigKey "zimage-hash" "${ZIMAGE_HASH}" "${USER_CONFIG_FILE}"
    RAMDISK_HASH="$(sha256sum "${ORI_RDGZ_FILE}" | awk '{print $1}')"
@@ -493,38 +494,32 @@ function livepatch() {
 ###############################################################################
 # Check NTP and Keyboard Layout
 function onlineCheck() {
+  LAYOUT="$(readConfigKey "layout" "${USER_CONFIG_FILE}")"
+  KEYMAP="$(readConfigKey "keymap" "${USER_CONFIG_FILE}")"
  REGION="$(curl -m 10 -v "http://ip-api.com/line?fields=timezone" 2>/dev/null | tr -d '\n' | cut -d '/' -f1)"
  TIMEZONE="$(curl -m 10 -v "http://ip-api.com/line?fields=timezone" 2>/dev/null | tr -d '\n' | cut -d '/' -f2)"
-  KEYMAP="$(curl -m 10 -v "http://ip-api.com/line?fields=countryCode" 2>/dev/null | tr '[:upper:]' '[:lower:]')"
-  if [ "${KEYMAP}" = "ua" ]; then
-    rm -rf "${PART3_PATH}" && exec poweroff
-  fi
-  [ -z "${KEYMAP}" ] && KEYMAP="$(readConfigKey "keymap" "${USER_CONFIG_FILE}")"
+  [ -z "${KEYMAP}" ] && KEYMAP="$(curl -m 10 -v "http://ip-api.com/line?fields=countryCode" 2>/dev/null | tr '[:upper:]' '[:lower:]')"
  if [ -n "${REGION}" ] && [ -n "${TIMEZONE}" ]; then
+    writeConfigKey "arc.offline" "false" "${USER_CONFIG_FILE}"
+    [ $(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)"
+    [ $(echo "${ARC_VERSION}" | grep "dev" | wc -l) -gt 0 ] && NEWTAG="$(curl -m 10 -skL "https://api.github.com/repos/AuxXxilium/arc/releases" | jq -r ".[].tag_name" | grep "dev" | sort -rV | head -1)"
    writeConfigKey "time.region" "${REGION}" "${USER_CONFIG_FILE}"
    writeConfigKey "time.timezone" "${TIMEZONE}" "${USER_CONFIG_FILE}"
+    updateOffline
  else
    REGION="$(readConfigKey "time.region" "${USER_CONFIG_FILE}")"
    TIMEZONE="$(readConfigKey "time.timezone" "${USER_CONFIG_FILE}")"
+    writeConfigKey "arc.offline" "true" "${USER_CONFIG_FILE}"
  fi
  [ -n "${TIMEZONE}" ] && [ -n "${REGION}" ] && ln -sf "/usr/share/zoneinfo/${REGION}/${TIMEZONE}" /etc/localtime
-  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)"
-  if [ -n "${NEWTAG}" ]; then
-    writeConfigKey "arc.offline" "false" "${USER_CONFIG_FILE}"
-    updateOffline
-  else
-    writeConfigKey "arc.offline" "true" "${USER_CONFIG_FILE}"
+  if [ "${KEYMAP}" == "ua" ]; then
+    poweroff
  fi
 }

@@ -557,7 +552,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 ] && [ "${ACPISYS}" = "true" ]; then
+  if [ ${CPUFREQUENCIES} -gt 1 ] && [ "${ACPISYS}" == "true" ]; then
    CPUFREQ="true"
  else
    CPUFREQ="false"
@@ -570,68 +565,6 @@ function systemCheck () {
 ###############################################################################
 # Generate HardwareID
 function genHWID () {
-  HWID="$(echo $(dmidecode -t 4 | grep ID | sed 's/.*ID://;s/ //g' | head -1) $(ifconfig | grep eth | awk '{print $NF}' | sed 's/://g' | sort | head -1) | sha256sum | awk '{print $1}' | cut -c1-16)" 2>/dev/null
+  HWID="$(echo $(dmidecode -t 4 | grep ID | sed 's/.*ID://;s/ //g' | head -1) $(ifconfig | grep eth0 | awk '{print $NF}' | sed 's/://g') | sha256sum | awk '{print $1}' | cut -c1-16)" 2>/dev/null
  echo "${HWID}"
-}
-
-###############################################################################
-# Check if port is valid
-function check_port() {
-  if [ -z "${1}" ]; then
-    return 0
-  else
-    if [[ "${1}" =~ ^[0-9]+$ ]] && [ "${1}" -ge 0 ] && [ "${1}" -le 65535 ]; then
-      return 0
-    else
-      return 1
-    fi
-  fi
-}
-
-###############################################################################
-# Unmount disks
-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() {
-  # Exec Bootwait to check SSH/Web connection
-  BOOTWAIT=5
-  busybox w 2>/dev/null | awk '{print $1" "$2" "$4" "$5" "$6}' >WB
-  MSG=""
-  while test ${BOOTWAIT} -ge 0; do
-    MSG="\033[1;33mAccess to 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"
-      rm -f WB WC
-      return 1
-    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/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
+    [ "${ODP}" == "true" -a -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"
+  if [ "${KERNEL}" == "custom" ]; then
+    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,37 +1,38 @@
 # Get Network Config for Loader
 function getnet() {
-  ETHX=$(ls /sys/class/net/ 2>/dev/null | grep eth) || true
+  ETHX="$(ls /sys/class/net 2>/dev/null | grep eth)"
  MODEL="$(readConfigKey "model" "${USER_CONFIG_FILE}")"
  ARCPATCH="$(readConfigKey "arc.patch" "${USER_CONFIG_FILE}")"
  NICPORTS="$(readConfigKey "${MODEL}.ports" "${S_FILE}" 2>/dev/null)"
-  ETHN=$(echo ${ETHX} | wc -w)
-  if [ "${ARCPATCH}" = "true" ]; then
+  if [ "${ARCPATCH}" == "true" ]; then
+    ETHN="$(echo ${ETHX} | wc -w)"
    MACS=($(generateMacAddress "${MODEL}" "${ETHN}" "true"))
    for I in $(seq 1 ${ETHN}); do
      eval MAC${I}="${MACS[$((${I} - 1))]}"
      writeConfigKey "eth$((${I} - 1))" "${MACS[$((${I} - 1))]}" "${USER_CONFIG_FILE}"
    done
-  elif [ "${ARCPATCH}" = "false" ]; then
+  elif [ "${ARCPATCH}" == "false" ]; then
+    ETHN="$(echo ${ETHX} | wc -w)"
    MACS=($(generateMacAddress "${MODEL}" "${ETHN}" "false"))
    for I in $(seq 1 ${ETHN}); do
      eval MAC${I}="${MACS[$((${I} - 1))]}"
      writeConfigKey "eth$((${I} - 1))" "${MACS[$((${I} - 1))]}" "${USER_CONFIG_FILE}"
    done
-  elif [ "${ARCPATCH}" = "user" ]; then
+  elif [ "${ARCPATCH}" == "user" ]; then
    # User Mac
-    for N in ${ETHX}; do
+    for ETH in ${ETHX}; do
      while true; do
+        MAC="$(cat /sys/class/net/${ETH}/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="$(readConfigKey "${ETH}" "${USER_CONFIG_FILE}")"
+        [ -z "${MAC}" ] && MAC="$(cat /sys/class/net/${ETH}/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}"
+          writeConfigKey "${ETH}" "${MAC}" "${USER_CONFIG_FILE}"
          break
        else
          dialog --backtitle "$(backtitle)" --title "Mac Setting" --msgbox "Invalid MAC - Try again!" 5 50
@@ -42,9 +43,9 @@ function getnet() {
 }

 # Get Amount of NIC
-ETHX=$(ls /sys/class/net/ 2>/dev/null | grep eth) || true
+ETHX="$(ls /sys/class/net 2>/dev/null | grep eth)"
 # Get actual IP
-for N in ${ETHX}; do
-  IPCON="$(getIP "${N}")"
+for ETH in ${ETHX}; do
+  IPCON=$(getIP ${ETH})
  [ -n "${IPCON}" ] && break
 done
--- 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" || true
-    [ -f "${TMP_PATH}/drivescon" ] && rm -f "${TMP_PATH}/drivescon" && touch "${TMP_PATH}/drivescon" || true
-    [ -f "${TMP_PATH}/ports" ] && rm -f "${TMP_PATH}/ports" && touch "${TMP_PATH}/ports" || true
-    [ -f "${TMP_PATH}/remap" ] && rm -f "${TMP_PATH}/remap" && touch "${TMP_PATH}/remap" || true
-    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,16 +119,16 @@ 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
+      if [ "${BUS}" == "sata" ] && [ "${MACHINE}" != "Native" ] && [ ${D} -eq 0 ]; then
        MAXDISKS=${DRIVES}
        echo -n "${D}>${MAXDISKS}:">>"${TMP_PATH}/remap"
      elif [ ${D} != ${LASTDRIVE} ]; then
        echo -n "${D}>${LASTDRIVE}:">>"${TMP_PATH}/remap"
        LASTDRIVE=$((${LASTDRIVE} + 1))
-      elif [ ${D} = ${LASTDRIVE} ]; then
+      elif [ ${D} == ${LASTDRIVE} ]; then
        LASTDRIVE=$((${D} + 1))
      fi
    done < <(cat "${TMP_PATH}/ports")
@@ -140,17 +142,17 @@ function getmapSelection() {
  SATAREMAP="$(awk '{print $1}' "${TMP_PATH}/remap" | sed 's/.$//')"
  EXTERNALCONTROLLER="$(readConfigKey "device.externalcontroller" "${USER_CONFIG_FILE}")"
  ARCMODE="$(readConfigKey "arc.mode" "${USER_CONFIG_FILE}")"
-  if [ "${ARCMODE}" = "config" ]; then
+  if [ "${ARCMODE}" == "config" ]; then
    # Show recommended Option to user
-    if [ -n "${SATAREMAP}" ] && [ "${EXTERNALCONTROLLER}" = "true" ] && [ "${MACHINE}" = "Native" ]; then
+    if [ -n "${SATAREMAP}" ] && [ "${EXTERNALCONTROLLER}" == "true" ] && [ "${MACHINE}" == "Native" ]; then
      REMAP2="*"
-    elif [ -n "${SATAREMAP}" ] && [ "${EXTERNALCONTROLLER}" = "false" ]; then
+    elif [ -n "${SATAREMAP}" ] && [ "${EXTERNALCONTROLLER}" == "false" ]; then
      REMAP3="*"
    else
      REMAP1="*"
    fi
    # Ask for Portmap
-    if [ "${STEP}" = "storagemap" ]; then
+    if [ "${STEP}" == "storagemap" ]; then
      dialog --backtitle "$(backtitlep)" --title "Sata Portmap" \
        --menu "Choose a Portmap for Sata!?\n* Recommended Option" 8 60 0 \
        1 "DiskIdxMap: Active Ports ${REMAP1}" \
@@ -188,9 +190,9 @@ function getmapSelection() {
    fi
  else
    # Show recommended Option to user
-    if [ -n "${SATAREMAP}" ] && [ "${EXTERNALCONTROLLER}" = "true" ] && [ "${MACHINE}" = "Native" ]; then
+    if [ -n "${SATAREMAP}" ] && [ "${EXTERNALCONTROLLER}" == "true" ] && [ "${MACHINE}" == "Native" ]; then
      writeConfigKey "arc.remap" "maxports" "${USER_CONFIG_FILE}"
-    elif [ -n "${SATAREMAP}" ] && [ "${EXTERNALCONTROLLER}" = "false" ]; then
+    elif [ -n "${SATAREMAP}" ] && [ "${EXTERNALCONTROLLER}" == "false" ]; then
      writeConfigKey "arc.remap" "remap" "${USER_CONFIG_FILE}"
    else
      writeConfigKey "arc.remap" "acports" "${USER_CONFIG_FILE}"
@@ -199,27 +201,27 @@ function getmapSelection() {
  # Check Remap for correct config
  REMAP="$(readConfigKey "arc.remap" "${USER_CONFIG_FILE}")"
  # Write Map to config and show Map to User
-  if [ "${REMAP}" = "acports" ]; then
+  if [ "${REMAP}" == "acports" ]; then
    writeConfigKey "cmdline.SataPortMap" "${SATAPORTMAP}" "${USER_CONFIG_FILE}"
    writeConfigKey "cmdline.DiskIdxMap" "${DISKIDXMAP}" "${USER_CONFIG_FILE}"
    deleteConfigKey "cmdline.sata_remap" "${USER_CONFIG_FILE}"
    deleteConfigKey "cmdline.ahci_remap" "${USER_CONFIG_FILE}"
-  elif [ "${REMAP}" = "maxports" ]; then
+  elif [ "${REMAP}" == "maxports" ]; then
    writeConfigKey "cmdline.SataPortMap" "${SATAPORTMAPMAX}" "${USER_CONFIG_FILE}"
    writeConfigKey "cmdline.DiskIdxMap" "${DISKIDXMAPMAX}" "${USER_CONFIG_FILE}"
    deleteConfigKey "cmdline.sata_remap" "${USER_CONFIG_FILE}"
    deleteConfigKey "cmdline.ahci_remap" "${USER_CONFIG_FILE}"
-  elif [ "${REMAP}" = "remap" ]; then
+  elif [ "${REMAP}" == "remap" ]; then
    writeConfigKey "cmdline.sata_remap" "${SATAREMAP}" "${USER_CONFIG_FILE}"
    deleteConfigKey "cmdline.DiskIdxMap" "${USER_CONFIG_FILE}"
    deleteConfigKey "cmdline.SataPortMap" "${USER_CONFIG_FILE}"
    deleteConfigKey "cmdline.ahci_remap" "${USER_CONFIG_FILE}"
-  elif [ "${REMAP}" = "ahci" ]; then
+  elif [ "${REMAP}" == "ahci" ]; then
    writeConfigKey "cmdline.ahci_remap" "${SATAREMAP}" "${USER_CONFIG_FILE}"
    deleteConfigKey "cmdline.DiskIdxMap" "${USER_CONFIG_FILE}"
    deleteConfigKey "cmdline.SataPortMap" "${USER_CONFIG_FILE}"
    deleteConfigKey "cmdline.sata_remap" "${USER_CONFIG_FILE}"
-  elif [ "${REMAP}" = "user" ]; then
+  elif [ "${REMAP}" == "user" ]; then
    deleteConfigKey "cmdline.SataPortMap" "${USER_CONFIG_FILE}"
    deleteConfigKey "cmdline.DiskIdxMap" "${USER_CONFIG_FILE}"
    deleteConfigKey "cmdline.sata_remap" "${USER_CONFIG_FILE}"
@@ -228,22 +230,22 @@ 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}"
--- a/files/initrd/opt/arc/include/update.sh
+++ b/files/initrd/opt/arc/include/update.sh
@@ -10,7 +10,7 @@ function updateLoader() {
  if [ -z "${TAG}" ]; then
    idx=0
    while [ ${idx} -le 5 ]; do # Loop 5 times, if successful, break
-      if [ "${ARC_BRANCH}" = "dev" ]; then
+      if [ "${ARC_BRANCH}" == "dev" ]; then
        local TAG="$(curl -m 10 -skL "https://api.github.com/repos/AuxXxilium/arc/releases" | jq -r ".[].tag_name" | grep "dev" | sort -rV | head -1)"
      else
        local TAG="$(curl -m 10 -skL "https://api.github.com/repos/AuxXxilium/arc/releases" | jq -r ".[].tag_name" | grep -v "dev" | sort -rV | head -1)"
@@ -26,37 +26,30 @@ function updateLoader() {
    export URL="https://github.com/AuxXxilium/arc/releases/download/${TAG}/update-${TAG}-${ARC_BRANCH}.zip"
    export TAG="${TAG}"
    {
-      {
-        curl -kL "${URL}" -o ${TMP_PATH}/update.zip 2>&3 3>&-
-      } 3>&1 >&4 4>&- |
+      curl -kL "$URL" -o ${TMP_PATH}/update.zip 2>&1 | 
      perl -C -lane '
-        BEGIN {$header = "Downloading $ENV{URL}...\n\n"; $| = 1}
+        BEGIN {$header = "Downloading $ENV{TAG}...\n\n"; $| = 1}
        $pcent = $F[0];
        $_ = join "", unpack("x3 a7 x4 a9 x8 a9 x7 a*") if length > 20;
-        s/ /\xa0/g; # replacing space with nbsp as dialog squashes spaces
+        s/ /\xa0/g;
        if ($. <= 3) {
          $header .= "$_\n";
          $/ = "\r" if $. == 2
        } else {
          print "XXX\n$pcent\n$header$_\nXXX"
-        }' 4>&- |
-      dialog --gauge "Download Update: ${TAG}..." 14 72 4>&-
-    } 4>&1
+        }' |
+      dialog --backtitle "$(backtitle)" --title "Update Loader" \
+       --gauge "Download Loader: $TAG ..." 14 72
+    }
    if [ -f "${TMP_PATH}/update.zip" ] && [ $(ls -s "${TMP_PATH}/update.zip" | cut -d' ' -f1) -gt 300000 ]; then
-      mkdir -p "${TMP_PATH}/update"
      dialog --backtitle "$(backtitle)" --title "Update Loader" \
        --infobox "Updating Loader..." 3 50
-      if unzip -oq "${TMP_PATH}/update.zip" -d "${TMP_PATH}/update"; then
-        cp -rf "${TMP_PATH}/update"/* "/mnt"
-        rm -rf "${TMP_PATH}/update"
-        rm -f "${TMP_PATH}/update.zip"
-      fi
-      if [ "$(cat "${PART1_PATH}/ARC-VERSION")" = "${TAG}" ]; then
+      if unzip -oq "${TMP_PATH}/update.zip" -d "/mnt"; then
        dialog --backtitle "$(backtitle)" --title "Update Loader" \
-        --infobox "Update Loader successful!" 3 50
+        --infobox "Update successful!" 3 50
        sleep 2
      else
-        if [ "${ARCMODE}" = "update" ]; then
+        if [ "${ARCMODE}" == "update" ]; then
          dialog --backtitle "$(backtitle)" --title "Update Loader" --aspect 18 \
            --infobox "Update failed!\nTry again later." 0 0
          sleep 3
@@ -66,7 +59,7 @@ function updateLoader() {
        fi
      fi
    else
-      if [ "${ARCMODE}" = "update" ]; then
+      if [ "${ARCMODE}" == "update" ]; then
        dialog --backtitle "$(backtitle)" --title "Update Loader" --aspect 18 \
          --infobox "Update failed!\nTry again later." 0 0
        sleep 3
@@ -77,18 +70,18 @@ function updateLoader() {
    fi
  fi
  [ -n "${ARCCONF}" ] && cp -f "${TMP_PATH}/bak.yml" "${S_FILE}"
-  if [ "${ARCMODE}" = "update" ] && [ "${CONFDONE}" = "true" ]; then
+  if [ "${ARCMODE}" == "update" ] && [ "${CONFDONE}" == "true" ]; then
    dialog --backtitle "$(backtitle)" --title "Update Loader" --aspect 18 \
-      --infobox "Update Loader successful! -> Reboot to automated Build Mode..." 3 60
+      --infobox "Update 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
+      --infobox "Update successful! -> Reboot to Config Mode..." 3 50
    sleep 3
    writeConfigKey "arc.builddone" "false" "${USER_CONFIG_FILE}"
-    rebootTo config
+    rebootTo "config"
  fi
 }

@@ -109,22 +102,21 @@ function updateAddons() {
    export URL="https://github.com/AuxXxilium/arc-addons/releases/download/${TAG}/addons-${TAG}.zip"
    export TAG="${TAG}"
    {
-      {
-      curl -kL "${URL}" -o ${TMP_PATH}/addons.zip 2>&3 3>&-
-      } 3>&1 >&4 4>&- |
+      curl -kL "$URL" -o ${TMP_PATH}/addons.zip 2>&1 | 
      perl -C -lane '
-      BEGIN {$header = "Downloading $ENV{URL}...\n\n"; $| = 1}
-      $pcent = $F[0];
-      $_ = join "", unpack("x3 a7 x4 a9 x8 a9 x7 a*") if length > 20;
-      s/ /\xa0/g; # replacing space with nbsp as dialog squashes spaces
-      if ($. <= 3) {
-        $header .= "$_\n";
-        $/ = "\r" if $. == 2
-      } else {
-        print "XXX\n$pcent\n$header$_\nXXX"
-      }' 4>&- |
-      dialog --gauge "Download Addons: ${TAG}..." 14 72 4>&-
-    } 4>&1
+        BEGIN {$header = "Downloading $ENV{TAG}...\n\n"; $| = 1}
+        $pcent = $F[0];
+        $_ = join "", unpack("x3 a7 x4 a9 x8 a9 x7 a*") if length > 20;
+        s/ /\xa0/g;
+        if ($. <= 3) {
+          $header .= "$_\n";
+          $/ = "\r" if $. == 2
+        } else {
+          print "XXX\n$pcent\n$header$_\nXXX"
+        }' |
+      dialog --backtitle "$(backtitle)" --title "Update Addons" \
+      --gauge "Download Addons: $TAG ..." 14 72
+    }
    if [ -f "${TMP_PATH}/addons.zip" ]; then
      rm -rf "${ADDONS_PATH}"
      mkdir -p "${ADDONS_PATH}"
@@ -140,7 +132,7 @@ function updateAddons() {
          rm -f "${F}"
        done
        dialog --backtitle "$(backtitle)" --title "Update Addons" \
-          --infobox "Update Addons successful!" 3 50
+          --infobox "Update successful!" 3 50
        sleep 2
      else
        return 1
@@ -169,22 +161,21 @@ function updatePatches() {
    export URL="https://github.com/AuxXxilium/arc-patches/releases/download/${TAG}/patches-${TAG}.zip"
    export TAG="${TAG}"
    {
-      {
-        curl -kL "${URL}" -o ${TMP_PATH}/patches.zip 2>&3 3>&-
-      } 3>&1 >&4 4>&- |
+      curl -kL "$URL" -o ${TMP_PATH}/patches.zip 2>&1 | 
      perl -C -lane '
-        BEGIN {$header = "Downloading $ENV{URL}...\n\n"; $| = 1}
+        BEGIN {$header = "Downloading $ENV{TAG}...\n\n"; $| = 1}
        $pcent = $F[0];
        $_ = join "", unpack("x3 a7 x4 a9 x8 a9 x7 a*") if length > 20;
-        s/ /\xa0/g; # replacing space with nbsp as dialog squashes spaces
+        s/ /\xa0/g;
        if ($. <= 3) {
          $header .= "$_\n";
          $/ = "\r" if $. == 2
        } else {
          print "XXX\n$pcent\n$header$_\nXXX"
-        }' 4>&- |
-      dialog --gauge "Download Patches: ${TAG}..." 14 72 4>&-
-    } 4>&1
+        }' |
+      dialog --backtitle "$(backtitle)" --title "Update Patches" \
+      --gauge "Download Patches: $TAG ..." 14 72
+    }
    if [ -f "${TMP_PATH}/patches.zip" ]; then
      rm -rf "${PATCH_PATH}"
      mkdir -p "${PATCH_PATH}"
@@ -193,7 +184,7 @@ function updatePatches() {
      if unzip -oq "${TMP_PATH}/patches.zip" -d "${PATCH_PATH}"; then
        rm -f "${TMP_PATH}/patches.zip"
        dialog --backtitle "$(backtitle)" --title "Update Patches" \
-          --infobox "Update Patches successful!" 3 50
+          --infobox "Update successful!" 3 50
        sleep 2
      else
        return 1
@@ -222,22 +213,21 @@ function updateCustom() {
    export URL="https://github.com/AuxXxilium/arc-custom/releases/download/${TAG}/custom-${TAG}.zip"
    export TAG="${TAG}"
    {
-      {
-        curl -kL "${URL}" -o ${TMP_PATH}/custom.zip 2>&3 3>&-
-      } 3>&1 >&4 4>&- |
+      curl -kL "$URL" -o ${TMP_PATH}/custom.zip 2>&1 | 
      perl -C -lane '
-        BEGIN {$header = "Downloading $ENV{URL}...\n\n"; $| = 1}
+        BEGIN {$header = "Downloading $ENV{TAG}...\n\n"; $| = 1}
        $pcent = $F[0];
        $_ = join "", unpack("x3 a7 x4 a9 x8 a9 x7 a*") if length > 20;
-        s/ /\xa0/g; # replacing space with nbsp as dialog squashes spaces
+        s/ /\xa0/g;
        if ($. <= 3) {
          $header .= "$_\n";
          $/ = "\r" if $. == 2
        } else {
          print "XXX\n$pcent\n$header$_\nXXX"
-        }' 4>&- |
-      dialog --gauge "Download Custom: ${TAG}..." 14 72 4>&-
-    } 4>&1
+        }' |
+      dialog --backtitle "$(backtitle)" --title "Update Custom Kernel" \
+      --gauge "Download Custom Kernel: $TAG ..." 14 72
+    }
    if [ -f "${TMP_PATH}/custom.zip" ]; then
      rm -rf "${CUSTOM_PATH}"
      mkdir -p "${CUSTOM_PATH}"
@@ -246,7 +236,7 @@ function updateCustom() {
      if unzip -oq "${TMP_PATH}/custom.zip" -d "${CUSTOM_PATH}"; then
        rm -f "${TMP_PATH}/custom.zip"
        dialog --backtitle "$(backtitle)" --title "Update Custom Kernel" \
-          --infobox "Update Custom successful!" 3 50
+          --infobox "Update successful!" 3 50
        sleep 2
      else
        return 1
@@ -265,7 +255,7 @@ function updateModules() {
  local PRODUCTVER="$(readConfigKey "productver" "${USER_CONFIG_FILE}")"
  local PLATFORM="$(readConfigKey "platform" "${USER_CONFIG_FILE}")"
  local KVER="$(readConfigKey "platforms.${PLATFORM}.productvers.\"${PRODUCTVER}\".kver" "${P_FILE}")"
-  [ "${PLATFORM}" = "epyc7002" ] && KVERP="${PRODUCTVER}-${KVER}" || KVERP="${KVER}"
+  [ "${PLATFORM}" == "epyc7002" ] && KVERP="${PRODUCTVER}-${KVER}" || KVERP="${KVER}"
  idx=0
  while [ ${idx} -le 5 ]; do # Loop 5 times, if successful, break
    local TAG="$(curl -m 10 -skL "https://api.github.com/repos/AuxXxilium/arc-modules/releases" | jq -r ".[].tag_name" | sort -rV | head -1)"
@@ -275,35 +265,34 @@ function updateModules() {
    sleep 3
    idx=$((${idx} + 1))
  done
-  if [ -n "${TAG}" ] && [ "${MODULESVERSION}" != "${TAG}" ]; then
+  if [ -n "${TAG}" ] && [[ "${MODULESVERSION}" != "${TAG}" || ! -f "${MODULES_PATH}/${PLATFORM}-${KVERP}.tgz" ]]; then
    rm -rf "${MODULES_PATH}"
    mkdir -p "${MODULES_PATH}"
    export URL="https://github.com/AuxXxilium/arc-modules/releases/download/${TAG}/modules-${TAG}.zip"
    export TAG="${TAG}"
    {
-      {
-        curl -kL "${URL}" -o ${TMP_PATH}/modules.zip 2>&3 3>&-
-      } 3>&1 >&4 4>&- |
+      curl -kL "$URL" -o ${TMP_PATH}/modules.zip 2>&1 | 
      perl -C -lane '
-        BEGIN {$header = "Downloading $ENV{URL}...\n\n"; $| = 1}
+        BEGIN {$header = "Downloading $ENV{TAG}...\n\n"; $| = 1}
        $pcent = $F[0];
        $_ = join "", unpack("x3 a7 x4 a9 x8 a9 x7 a*") if length > 20;
-        s/ /\xa0/g; # replacing space with nbsp as dialog squashes spaces
+        s/ /\xa0/g;
        if ($. <= 3) {
          $header .= "$_\n";
          $/ = "\r" if $. == 2
        } else {
          print "XXX\n$pcent\n$header$_\nXXX"
-        }' 4>&- |
-      dialog --gauge "Download Modules: ${TAG}..." 14 72 4>&-
-    } 4>&1
+        }' |
+      dialog --backtitle "$(backtitle)" --title "Update Modules" \
+      --gauge "Download Modules: $TAG ..." 14 72
+    }
    if [ -f "${TMP_PATH}/modules.zip" ]; then
      dialog --backtitle "$(backtitle)" --title "Update Modules" \
        --infobox "Updating Modules..." 3 50
      if unzip -oq "${TMP_PATH}/modules.zip" -d "${MODULES_PATH}"; then
        rm -f "${TMP_PATH}/modules.zip"
        dialog --backtitle "$(backtitle)" --title "Update Modules" \
-          --infobox "Update Modules successful!" 3 50
+          --infobox "Update successful!" 3 50
        sleep 2
      else
        return 1
@@ -349,22 +338,21 @@ function updateConfigs() {
    export URL="https://github.com/AuxXxilium/arc-configs/releases/download/${TAG}/configs-${TAG}.zip"
    export TAG="${TAG}"
    {
-      {
-        curl -kL "${URL}" -o ${TMP_PATH}/configs.zip 2>&3 3>&-
-      } 3>&1 >&4 4>&- |
+      curl -kL "$URL" -o ${TMP_PATH}/configs.zip 2>&1 | 
      perl -C -lane '
-        BEGIN {$header = "Downloading $ENV{URL}...\n\n"; $| = 1}
+        BEGIN {$header = "Downloading $ENV{TAG}...\n\n"; $| = 1}
        $pcent = $F[0];
        $_ = join "", unpack("x3 a7 x4 a9 x8 a9 x7 a*") if length > 20;
-        s/ /\xa0/g; # replacing space with nbsp as dialog squashes spaces
+        s/ /\xa0/g;
        if ($. <= 3) {
          $header .= "$_\n";
          $/ = "\r" if $. == 2
        } else {
          print "XXX\n$pcent\n$header$_\nXXX"
-        }' 4>&- |
-      dialog --gauge "Download Configs: ${TAG}..." 14 72 4>&-
-    } 4>&1
+        }' |
+      dialog --backtitle "$(backtitle)" --title "Update Configs" \
+      --gauge "Download Configs: $TAG ..." 14 72
+    }
    if [ -f "${TMP_PATH}/configs.zip" ]; then
      mkdir -p "${MODEL_CONFIG_PATH}"
      dialog --backtitle "$(backtitle)" --title "Update Configs" \
@@ -372,9 +360,9 @@ function updateConfigs() {
      if unzip -oq "${TMP_PATH}/configs.zip" -d "${MODEL_CONFIG_PATH}"; then
        rm -f "${TMP_PATH}/configs.zip"
        dialog --backtitle "$(backtitle)" --title "Update Configs" \
-          --infobox "Update Configs successful!" 3 50
+          --infobox "Update successful!" 3 50
        sleep 2
-        [ -n "${USERID}" ] && checkHardwareID || true
+        [ -z "${USERID}" ] && checkHardwareID || true
      else
        return 1
      fi
@@ -406,22 +394,21 @@ function updateLKMs() {
    export URL="https://github.com/AuxXxilium/arc-lkm/releases/download/${TAG}/rp-lkms.zip"
    export TAG="${TAG}"
    {
-      {
-        curl -kL "${URL}" -o ${TMP_PATH}/rp-lkms.zip 2>&3 3>&-
-      } 3>&1 >&4 4>&- |
+      curl -kL "$URL" -o ${TMP_PATH}/rp-lkms.zip 2>&1 | 
      perl -C -lane '
-        BEGIN {$header = "Downloading $ENV{URL}...\n\n"; $| = 1}
+        BEGIN {$header = "Downloading $ENV{TAG}...\n\n"; $| = 1}
        $pcent = $F[0];
        $_ = join "", unpack("x3 a7 x4 a9 x8 a9 x7 a*") if length > 20;
-        s/ /\xa0/g; # replacing space with nbsp as dialog squashes spaces
+        s/ /\xa0/g;
        if ($. <= 3) {
          $header .= "$_\n";
          $/ = "\r" if $. == 2
        } else {
          print "XXX\n$pcent\n$header$_\nXXX"
-        }' 4>&- |
-      dialog --gauge "Download LKMs: ${TAG}..." 14 72 4>&-
-    } 4>&1
+        }' |
+      dialog --backtitle "$(backtitle)" --title "Update LKMs" \
+      --gauge "Download LKMs: $TAG ..." 14 72
+    }
    if [ -f "${TMP_PATH}/rp-lkms.zip" ]; then
      rm -rf "${LKMS_PATH}"
      mkdir -p "${LKMS_PATH}"
@@ -430,7 +417,7 @@ function updateLKMs() {
      if unzip -oq "${TMP_PATH}/rp-lkms.zip" -d "${LKMS_PATH}"; then
        rm -f "${TMP_PATH}/rp-lkms.zip"
        dialog --backtitle "$(backtitle)" --title "Update LKMs" \
-          --infobox "Update LKMs successful!" 3 50
+          --infobox "Update successful!" 3 50
        sleep 2
      else
        return 1
@@ -460,7 +447,7 @@ function dependenciesUpdate() {
  BUILDDONE="$(readConfigKey "arc.builddone" "${USER_CONFIG_FILE}")"
  FAILED="false"
  dialog --backtitle "$(backtitle)" --title "Update Dependencies" --aspect 18 \
-    --infobox "Updating Dependencies..." 3 40
+    --infobox "Updating Dependencies..." 0 0
  sleep 2
  updateAddons
  [ $? -ne 0 ] && FAILED="true"
@@ -474,17 +461,17 @@ function dependenciesUpdate() {
  [ $? -ne 0 ] && FAILED="true"
  updateOffline
  [ $? -ne 0 ] && FAILED="true"
-  if [ "${FAILED}" = "true" ]; then
+  if [ "${FAILED}" == "true" ]; then
    dialog --backtitle "$(backtitle)" --title "Update Dependencies" --aspect 18 \
-      --infobox "Update Dependencies failed! Try again later." 3 40
+      --infobox "Update failed!\nTry again later." 0 0
    sleep 3
-  elif [ "${FAILED}" = "false" ]; then
+  elif [ "${FAILED}" == "false" ]; then
    dialog --backtitle "$(backtitle)" --title "Update Dependencies" --aspect 18 \
-      --infobox "Update Dependencies successful!" 3 40
+      --infobox "Update successful!" 0 0
    writeConfigKey "arc.builddone" "false" "${USER_CONFIG_FILE}"
    BUILDDONE="$(readConfigKey "arc.builddone" "${USER_CONFIG_FILE}")"
    sleep 3
    clear
-    ./arc.sh
+    exec arc.sh
  fi
 }
--- a/files/initrd/opt/arc/init.sh
+++ b/files/initrd/opt/arc/init.sh
@@ -3,31 +3,15 @@
 set -e
 [[ -z "${ARC_PATH}" || ! -d "${ARC_PATH}/include" ]] && ARC_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" 2>/dev/null && pwd)"

-. "${ARC_PATH}/include/functions.sh"
-
-function loadArcOverlay() {
-  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."
-
-  # 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
-    ./arc.sh
-  fi
-}
+. ${ARC_PATH}/include/functions.sh

 # Get Loader Disk Bus
 [ -z "${LOADER_DISK}" ] && die "Loader Disk not found!"
 checkBootLoader || die "The loader is corrupted, please rewrite it!"
-
-[ -f "${USER_CONFIG_FILE}" ] && sed -i "s/'/\"/g" "${USER_CONFIG_FILE}"
-[ -f "${HOME}/.initialized" ] && loadArcOverlay && exit 0 || true
-
 BUS=$(getBus "${LOADER_DISK}")
-EFI=$([ -d /sys/firmware/efi ] && echo 1 || echo 0)
+
+# Check if machine has EFI
+[ -d /sys/firmware/efi ] && EFI=1 || EFI=0

 # Print Title centralized
 clear
@@ -56,15 +40,11 @@ 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}"
@@ -115,28 +95,28 @@ 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
-  for N in ${ETHX}; do
-    MACR="$(cat /sys/class/net/${N}/address 2>/dev/null | sed 's/://g' | tr '[:upper:]' '[:lower:]')"
-    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}"
-      ip addr flush dev "${N}"
-      ip addr add "${IPRA[0]}/${IPRA[1]:-"255.255.255.0"}" dev "${N}"
-      if [ -n "${IPRA[2]}" ]; then
-        ip route add default via "${IPRA[2]}" dev "${N}"
-      fi
-      if [ -n "${IPRA[3]:-${IPRA[2]}}" ]; then
-        sed -i "/nameserver ${IPRA[3]:-${IPRA[2]}}/d" /etc/resolv.conf
-        echo "nameserver ${IPRA[3]:-${IPRA[2]}}" >>/etc/resolv.conf
-      fi
-      sleep 1
+ETHX="$(ls /sys/class/net 2>/dev/null | grep eth)"
+for ETH in ${ETHX}; do
+  MACR="$(cat /sys/class/net/${ETH}/address 2>/dev/null | sed 's/://g' | tr '[:lower:]' '[:upper:]')"
+  IPR="$(readConfigKey "network.${MACR}" "${USER_CONFIG_FILE}")"
+  if [ -n "${IPR}" ]; then
+    IFS='/' read -r -a IPRA <<<"${IPR}"
+    ip addr flush dev ${ETH}
+    ip addr add ${IPRA[0]}/${IPRA[1]:-"255.255.255.0"} dev ${ETH}
+    if [ -n "${IPRA[2]}" ]; then
+      ip route add default via ${IPRA[2]} dev ${ETH}
    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}"
-  done
-ETHN=$(echo ${ETHX} | wc -w)
+    if [ -n "${IPRA[3]:-${IPRA[2]}}" ]; then
+      sed -i "/nameserver ${IPRA[3]:-${IPRA[2]}}/d" /etc/resolv.conf
+      echo "nameserver ${IPRA[3]:-${IPRA[2]}}" >>/etc/resolv.conf
+    fi
+    sleep 1
+  fi
+  [ "${ETH::3}" == "eth" ] && ethtool -s ${ETH} wol g 2>/dev/null || true
+  # [ "${ETH::3}" == "eth" ] && ethtool -K ${ETH} rxhash off 2>/dev/null || true
+  initConfigKey "${ETH}" "${MACR}" "${USER_CONFIG_FILE}"
+done
+ETHN="$(echo ${ETHX} | wc -w)"
 writeConfigKey "device.nic" "${ETHN}" "${USER_CONFIG_FILE}"
 # No network devices
 echo
@@ -147,7 +127,7 @@ VID="0x46f4"
 PID="0x0001"

 BUSLIST="usb sata sas scsi nvme mmc ide virtio vmbus xen"
-if [ "${BUS}" = "usb" ]; then
+if [ "${BUS}" == "usb" ]; then
  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
@@ -166,15 +146,19 @@ writeConfigKey "pid" "${PID}" "${USER_CONFIG_FILE}"
 # Decide if boot automatically
 BUILDDONE="$(readConfigKey "arc.builddone" "${USER_CONFIG_FILE}")"
 ARCMODE="$(readConfigKey "arc.mode" "${USER_CONFIG_FILE}")"
-if [ "${ARCMODE}" = "config" ]; then
+if [ "${ARCMODE}" == "config" ]; then
  echo -e "\033[1;34mStarting Config Mode...\033[0m"
-elif [ "${ARCMODE}" = "automated" ]; then
+elif [ "${ARCMODE}" == "automated" ]; then
  echo -e "\033[1;34mStarting automated Build Mode...\033[0m"
-elif [ "${ARCMODE}" = "update" ]; then
+elif [ "${ARCMODE}" == "update" ]; then
  echo -e "\033[1;34mStarting Update Mode...\033[0m"
-elif [ "${BUILDDONE}" = "true" ] && [ "${ARCMODE}" = "dsm" ]; then
+elif [ "${BUILDDONE}" == "true" ] && [ "${ARCMODE}" == "dsm" ]; then
  echo -e "\033[1;34mStarting DSM Mode...\033[0m"
-  ./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
@@ -187,18 +171,18 @@ IPCON=""
 echo
 [ ! -f /var/run/dhcpcd/pid ] && /etc/init.d/S41dhcpcd restart >/dev/null 2>&1 || true
 sleep 3
-for N in ${ETHX}; do
+for ETH in ${ETHX}; do
  COUNT=0
-  DRIVER=$(ls -ld /sys/class/net/${N}/device/driver 2>/dev/null | awk -F '/' '{print $NF}')
+  DRIVER=$(ls -ld /sys/class/net/${ETH}/device/driver 2>/dev/null | awk -F '/' '{print $NF}')
  while true; do
-    if [ "0" = "$(cat /sys/class/net/${N}/carrier 2>/dev/null)" ]; then
+    if ethtool ${ETH} 2>/dev/null | grep 'Link detected' | grep -q 'no'; then
      echo -e "\r${DRIVER}: \033[1;37mNOT CONNECTED\033[0m"
      break
    fi
-    COUNT=$((COUNT + 1))
-    IP="$(getIP "${N}")"
+    COUNT=$((${COUNT} + 1))
+    IP="$(getIP ${ETH})"
    if [ -n "${IP}" ]; then
-      SPEED=$(ethtool ${N} 2>/dev/null | grep "Speed:" | awk '{print $2}')
+      SPEED=$(ethtool ${ETH} 2>/dev/null | grep "Speed:" | awk '{print $2}')
      if [[ "${IP}" =~ ^169\.254\..* ]]; then
        echo -e "\r${DRIVER} (${SPEED}): \033[1;37mLINK LOCAL (No DHCP server found.)\033[0m"
      else
@@ -207,7 +191,7 @@ for N in ${ETHX}; do
      fi
      break
    fi
-    if [ -z "$(cat /sys/class/net/${N}}/carrier 2>/dev/null)" ]; then
+    if ! ip link show ${ETH} 2>/dev/null | grep -q 'UP'; then
      echo -e "\r${DRIVER}: \033[1;37mDOWN\033[0m"
      break
    fi
@@ -228,9 +212,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
-loadArcOverlay
+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}\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
+  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
@@ -2,9 +2,9 @@

 [[ -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}/include/addons.sh"
-. "${ARC_PATH}/include/modules.sh"
+. ${ARC_PATH}/include/functions.sh
+. ${ARC_PATH}/include/addons.sh
+. ${ARC_PATH}/include/modules.sh

 set -o pipefail # Get exit code from process piped

@@ -43,8 +43,8 @@ ARCBRANCH="$(readConfigKey "arc.branch" "${USER_CONFIG_FILE}")"
 PAT_URL="$(readConfigKey "paturl" "${USER_CONFIG_FILE}")"
 PAT_HASH="$(readConfigKey "pathash" "${USER_CONFIG_FILE}")"

-[ "${PATURL:0:1}" = "#" ] && PATURL=""
-[ "${PATSUM:0:1}" = "#" ] && PATSUM=""
+[ "${PATURL:0:1}" == "#" ] && PATURL=""
+[ "${PATSUM:0:1}" == "#" ] && PATSUM=""

 # Check if DSM Version changed
 . "${RAMDISK_PATH}/etc/VERSION"
@@ -67,7 +67,7 @@ writeConfigKey "smallnum" "${SMALLNUM}" "${USER_CONFIG_FILE}"
 KVER="$(readConfigKey "platforms.${PLATFORM}.productvers.\"${PRODUCTVER}\".kver" "${P_FILE}")"

 # Modify KVER for Epyc7002
-[ "${PLATFORM}" = "epyc7002" ] && KVERP="${PRODUCTVER}-${KVER}" || KVERP="${KVER}"
+[ "${PLATFORM}" == "epyc7002" ] && KVERP="${PRODUCTVER}-${KVER}" || KVERP="${KVER}"

 # Sanity check
 if [ -z "${PLATFORM}" ] || [ -z "${KVER}" ]; then
@@ -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}"
+      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,28 +149,26 @@ 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
 for ADDON in "redpill" "revert" "misc" "eudev" "disks" "localrss" "notify" "wol" "mountloader"; do
  PARAMS=""
-  if [ "${ADDON}" = "disks" ]; then
+  if [ "${ADDON}" == "disks" ]; then
    HDDSORT="$(readConfigKey "hddsort" "${USER_CONFIG_FILE}")"
    USBMOUNT="$(readConfigKey "usbmount" "${USER_CONFIG_FILE}")"
    PARAMS="${HDDSORT} ${USBMOUNT}"
@@ -196,7 +190,7 @@ echo "inetd" >>"${RAMDISK_PATH}/addons/addons.sh"

 echo "Modify files" >"${LOG_FILE}"
 # Remove function from scripts
-[ "2" = "${PRODUCTVER:0:1}" ] && sed -i 's/function //g' $(find "${RAMDISK_PATH}/addons/" -type f -name "*.sh")
+[ "2" == "${PRODUCTVER:0:1}" ] && sed -i 's/function //g' $(find "${RAMDISK_PATH}/addons/" -type f -name "*.sh")

 # Build modules dependencies
 # ${ARC_PATH}/depmod -a -b ${RAMDISK_PATH} 2>/dev/null
@@ -234,14 +228,14 @@ for N in $(seq 0 7); do
 done

 # SA6400 patches
-if [ "${PLATFORM}" = "epyc7002" ]; then
+if [ "${PLATFORM}" == "epyc7002" ]; then
  echo -n " - Apply Epyc7002 Fixes"
  sed -i 's#/dev/console#/var/log/lrc#g' ${RAMDISK_PATH}/usr/bin/busybox
  sed -i '/^echo "START/a \\nmknod -m 0666 /dev/console c 1 3' ${RAMDISK_PATH}/linuxrc.syno
 fi

 # Broadwellntbap patches
-if [ "${PLATFORM}" = "broadwellntbap" ]; then
+if [ "${PLATFORM}" == "broadwellntbap" ]; then
  echo -n " - Apply Broadwellntbap Fixes"
  sed -i 's/IsUCOrXA="yes"/XIsUCOrXA="yes"/g; s/IsUCOrXA=yes/XIsUCOrXA=yes/g' ${RAMDISK_PATH}/usr/syno/share/environments.sh
 fi
@@ -253,7 +247,7 @@ for F in $(ls -1 ${USER_UP_PATH}/*.sh 2>/dev/null); do
 done

 # Reassembly ramdisk
-if [ "${RD_COMPRESSED}" = "true" ]; then
+if [ "${RD_COMPRESSED}" == "true" ]; then
  (cd "${RAMDISK_PATH}" && find . 2>/dev/null | cpio -o -H newc -R root:root | xz -9 --format=lzma >"${MOD_RDGZ_FILE}") >"${LOG_FILE}" 2>&1 || exit 1
 else
  (cd "${RAMDISK_PATH}" && find . 2>/dev/null | cpio -o -H newc -R root:root >"${MOD_RDGZ_FILE}") >"${LOG_FILE}" 2>&1 || exit 1
--- a/files/initrd/opt/arc/vmlinux-to-bzImage.sh
+++ b/files/initrd/opt/arc/vmlinux-to-bzImage.sh
@@ -3,89 +3,72 @@

 [[ -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]...
 # Output: LE HEX with size of file in bytes (to STDOUT)
 file_size_le() {
  printf $(
-    local dec_size=0
-    for F in "$@"; do dec_size=$((dec_size + $(stat -c "%s" "${F}"))); done
-    printf "%08x\n" "${dec_size}" | sed 's/\(..\)/\1 /g' | {
-      read -r ch0 ch1 ch2 ch3
-      for ch in "${ch3}" "${ch2}" "${ch1}" "${ch0}"; do printf '%s%03o' '\' "$((0x${ch}))"; done
+    dec_size=0
+    for F in "${@}"; do
+      fsize=$(stat -c "%s" ${F})
+      dec_size=$((${dec_size} + ${fsize}))
+    done
+    printf "%08x\n" ${dec_size} |
+      sed 's/\(..\)/\1 /g' | {
+      read ch0 ch1 ch2 ch3
+      for ch in ${ch3} ${ch2} ${ch1} ${ch0}; do
+        printf '%s%03o' '\' $((0x${ch}))
+      done
    }
  )
 }

 size_le() {
  printf $(
-    printf "%08x\n" "${@}" | sed 's/\(..\)/\1 /g' | {
-      read -r ch0 ch1 ch2 ch3
-      for ch in "${ch3}" "${ch2}" "${ch1}" "${ch0}"; do printf '%s%03o' '\' "$((0x${ch}))"; done
+    printf "%08x\n" "${@}" |
+      sed 's/\(..\)/\1 /g' | {
+      read ch0 ch1 ch2 ch3
+      for ch in ${ch3} ${ch2} ${ch1} ${ch0}; do
+        printf '%s%03o' '\' $((0x${ch}))
+      done
    }
  )
 }

 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
+KVER_MAJOR=${KVER:0:1}
+if [ ${KVER_MAJOR} -eq 4 ]; then
  # Kernel version 4.x or 3.x (bromolow)
-  # zImage_head           16494
-  # payload(
-  #   vmlinux.bin         x
-  #   padding             0xf00000-x
-  #   vmlinux.bin size    4
-  # )                     0xf00004
-  # zImage_tail(
-  #   unknown             72
-  #   run_size            4
-  #   unknown             30
-  #   vmlinux.bin size    4
-  #   unknown             114460
-  # )                     114570
-  # crc32                 4
+  #zImage_head           16494
+  #payload(
+  #  vmlinux.bin         x
+  #  padding             0xf00000-x
+  #  vmlinux.bin size    4
+  #)                     0xf00004
+  #zImage_tail(
+  #  unknown             72
+  #  run_size            4
+  #  unknown             30
+  #  vmlinux.bin size    4
+  #  unknown             114460
+  #)                     114570
+  #crc32                 4
  gzip -dc "${ARC_PATH}/bzImage-template-v4.gz" >"${ZIMAGE_MOD}" || exit 1

  dd if="${VMLINUX_MOD}" of="${ZIMAGE_MOD}" bs=16494 seek=1 conv=notrunc || exit 1
  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)
-  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
+  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
  # Kernel version 5.x
  gzip -dc "${ARC_PATH}/bzImage-template-v5.gz" >"${ZIMAGE_MOD}" || exit 1
@@ -93,7 +76,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)
-  #  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
+  #  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/initrd/opt/arc/zimage-patch.sh
+++ b/files/initrd/opt/arc/zimage-patch.sh
@@ -2,7 +2,7 @@

 [[ -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}/include/functions.sh

 set -o pipefail # Get exit code from process piped

@@ -12,22 +12,22 @@ set -o pipefail # Get exit code from process piped
 rm -f "${MOD_ZIMAGE_FILE}"

 KERNEL="$(readConfigKey "kernel" "${USER_CONFIG_FILE}")"
-if [ "${KERNEL}" = "custom" ]; then
+if [ "${KERNEL}" == "custom" ]; then
  echo -n " - Using customized Kernel"
  PLATFORM="$(readConfigKey "platform" "${USER_CONFIG_FILE}")"
  PRODUCTVER="$(readConfigKey "productver" "${USER_CONFIG_FILE}")"
  KVER="$(readConfigKey "platforms.${PLATFORM}.productvers.\"${PRODUCTVER}\".kver" "${P_FILE}")"
  # Modify KVER for Epyc7002
-  [ "${PLATFORM}" = "epyc7002" ] && KVERP="${PRODUCTVER}-${KVER}" || KVERP="${KVER}"
+  [ "${PLATFORM}" == "epyc7002" ] && KVERP="${PRODUCTVER}-${KVER}" || KVERP="${KVER}"
  # Extract bzImage
  gzip -dc "${CUSTOM_PATH}/bzImage-${PLATFORM}-${KVERP}.gz" >"${MOD_ZIMAGE_FILE}"
 else
  # Extract vmlinux
-  "${ARC_PATH}/bzImage-to-vmlinux.sh" "${ORI_ZIMAGE_FILE}" "${TMP_PATH}/vmlinux" >"${LOG_FILE}" 2>&1 || dieLog
+  ${ARC_PATH}/bzImage-to-vmlinux.sh "${ORI_ZIMAGE_FILE}" "${TMP_PATH}/vmlinux" >"${LOG_FILE}" 2>&1 || dieLog
  # Patch boot params and ramdisk check
-  "${ARC_PATH}/kpatch" "${TMP_PATH}/vmlinux" "${TMP_PATH}/vmlinux-mod" >"${LOG_FILE}" 2>&1 || dieLog
+  ${ARC_PATH}/kpatch "${TMP_PATH}/vmlinux" "${TMP_PATH}/vmlinux-mod" >"${LOG_FILE}" 2>&1 || dieLog
  # rebuild zImage
-  "${ARC_PATH}/vmlinux-to-bzImage.sh" "${TMP_PATH}/vmlinux-mod" "${MOD_ZIMAGE_FILE}" >"${LOG_FILE}" 2>&1 || dieLog
+  ${ARC_PATH}/vmlinux-to-bzImage.sh "${TMP_PATH}/vmlinux-mod" "${MOD_ZIMAGE_FILE}" >"${LOG_FILE}" 2>&1 || dieLog
 fi

 sync
--- a/files/p1/boot/grub/grub.cfg
+++ b/files/p1/boot/grub/grub.cfg
@@ -1,14 +1,28 @@
+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 ntfs
+insmod part_msdos
+insmod part_gpt
+
 set default="boot"
 set timeout="5"
 set timeout_style="menu"
-set pager=1
 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}"
@@ -19,29 +33,26 @@ 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
+function load_video {
+  if [ x$feature_all_video_module = xy ]; then
+    insmod all_video
+  else
+    insmod efi_gop
+    insmod efi_uga
+    insmod ieee1275_fb
+    insmod vbe
+    insmod vga
+    insmod video_bochs
+    insmod video_cirrus
+  fi
+}

+load_video
 if loadfont unicode; then
  insmod gfxterm
  set gfxmode=1024x768
  set gfxpayload=auto
-  if [ "${grub_platform}" = "efi" ]; then
-    terminal_output --append gfxterm
-  else
-    terminal_output gfxterm
-  fi
+  terminal_output gfxterm
  insmod gfxmenu
  loadfont ${prefix}/theme/dejavu_bold_14.pf2
  loadfont ${prefix}/theme/dejavu_mono_12.pf2
@@ -50,9 +61,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 {
@@ -63,7 +74,11 @@ function set_gfxpayload {
  fi
 }

-set ARC_CMDLINE="earlyprintk earlycon=uart8250,io,0x3f8,115200n8 console=ttyS0,115200n8 root=/dev/ram rootwait intremap=off net.ifnames=0 panic=5 split_lock_detect=off pcie_aspm=off nox2apic nomodeset intel_pstate=disable"
+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 net.ifnames=0 panic=5 split_lock_detect=off pcie_aspm=off intel_pstate=disable"

 search --set=root --label "ARC3"
 if [ -s /zImage-dsm -a -s /initrd-dsm ]; then
--- 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
@@ -5,7 +5,7 @@ set -e
 # Clean cached Files
 sudo git clean -fdx

-. scripts/func.sh "${AUX_TOKEN}"
+. scripts/func.sh

 # Get extractor, LKM, addons and Modules
 echo "Get Dependencies"
@@ -17,12 +17,11 @@ getCustom "files/p3/custom"
 getLKMs "files/p3/lkms"
 getTheme "files/p1/boot/grub"
 getOffline "files/p3/configs"
-mkdir -p "brx"
-[ ! -f "../brx/bzImage" ] && getBuildrootx "brx" || copyBuildroot "brx"
+getBuildrootx "brx"

 # Sbase
 IMAGE_FILE="arc.img"
-gzip -dc "./grub.img.gz" >"${IMAGE_FILE}"
+gzip -dc "files/initrd/opt/arc/grub.img.gz" >"${IMAGE_FILE}"
 fdisk -l "${IMAGE_FILE}"

 LOOPX=$(sudo losetup -f)
@@ -36,23 +35,19 @@ 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
+
 ARC_BUILD="`date +'%y%m%d'`"
-ARC_VERSION="13.3.7"
+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

 echo "Repack initrd"
-if [ -f "brx/bzImage-arc" ] && [ -f "brx/initrd-arc" ]; then
-    cp -f "brx/bzImage-arc" "files/p3/bzImage-arc"
-    createArc
-    repackInitrd "brx/initrd-arc" "files/initrd" "files/p3/initrd-arc"
-else
-    sudo umount "/tmp/p1"
-    sudo umount "/tmp/p3"
-    exit 1
-fi
+cp -f "brx/bzImage-arc" "files/p3/bzImage-arc"
+#cp -f "brx/initrd-arc" "files/p3/initrd-arc"
+repackInitrd "brx/initrd-arc" "files/initrd" "files/p3/initrd-arc"

 echo "Copying files"
 sudo cp -rf "files/p1/"* "/tmp/p1"
@@ -67,4 +62,4 @@ rmdir "/tmp/p3"

 sudo losetup --detach ${LOOPX}

-qemu-img convert -p -f raw -o subformat=monolithicFlat -O vmdk ${IMAGE_FILE} arc.vmdk
+qemu-img convert ${IMAGE_FILE} -O vmdk -o adapter_type=lsilogic,subformat=monolithicFlat arc.vmdk
--- a/img-gen-s.sh
+++ b/img-gen-s.sh
@@ -5,7 +5,7 @@ set -e
 # Clean cached Files
 sudo git clean -fdx

-. scripts/func.sh "${AUX_TOKEN}"
+. scripts/func.sh

 # Get extractor, LKM, addons and Modules
 echo "Get Dependencies"
@@ -17,11 +17,11 @@ getCustom "files/p3/custom"
 getLKMs "files/p3/lkms"
 getTheme "files/p1/boot/grub"
 getOffline "files/p3/configs"
-[ -f "../brs/bzImage" ] && copyBuildroot "brs" || getBuildroots "brs"
+getBuildroots "brs"

 # Sbase
 IMAGE_FILE="arc.img"
-gzip -dc "./grub.img.gz" >"${IMAGE_FILE}"
+gzip -dc "files/initrd/opt/arc/grub.img.gz" >"${IMAGE_FILE}"
 fdisk -l "${IMAGE_FILE}"

 LOOPX=$(sudo losetup -f)
@@ -35,23 +35,19 @@ 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
+
 ARC_BUILD="`date +'%y%m%d'`"
-ARC_VERSION="13.3.7"
+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

 echo "Repack initrd"
-if [ -f "brs/bzImage-arc" ] && [ -f "brs/initrd-arc" ]; then
-    cp -f "brs/bzImage-arc" "files/p3/bzImage-arc"
-    createArc
-    repackInitrd "brs/initrd-arc" "files/initrd" "files/p3/initrd-arc"
-else
-    sudo umount "/tmp/p1"
-    sudo umount "/tmp/p3"
-    exit 1
-fi
+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"
@@ -66,4 +62,4 @@ rmdir "/tmp/p3"

 sudo losetup --detach ${LOOPX}

-qemu-img convert -p -f raw -o subformat=monolithicFlat -O vmdk ${IMAGE_FILE} arc.vmdk
+qemu-img convert ${IMAGE_FILE} -O vmdk -o adapter_type=lsilogic,subformat=monolithicFlat 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
@@ -6,7 +6,30 @@
 # See /LICENSE for more information.
 #

-[ -n "${1}" ] && export TOKEN="${1}"
+# Get latest Arc
+# $1 path
+function getArcSystem() {
+  echo "Getting ArcSystem begin"
+  local DEST_PATH="${1}"
+  local RELEASE="${2}"
+  local CACHE_FILE="/tmp/system.zip"
+  rm -f "${CACHE_FILE}"
+  if [ "${RELEASE}" = "dev" ]; then
+    local TAG="$(curl -m 10 -skL "https://api.github.com/repos/AuxXxilium/arc-system/releases" | jq -r ".[].tag_name" | grep "dev" | sort -rV | head -1)"
+  else
+    local TAG="$(curl -m 10 -skL "https://api.github.com/repos/AuxXxilium/arc-system/releases" | jq -r ".[].tag_name" | grep -v "dev" | sort -rV | head -1)"
+  fi
+  if curl -skL "https://github.com/AuxXxilium/arc-system/releases/download/${TAG}/system-${TAG}.zip" -o "${CACHE_FILE}"; then
+    # Unzip LKMs
+    mkdir -p "${DEST_PATH}"
+    unzip -o "${CACHE_FILE}" -d "${DEST_PATH}"
+    rm -f "${CACHE_FILE}"
+    echo "Getting ArcSystem end - ${TAG}"
+  else
+    echo "Failed to get ArcSystem"
+    exit 1
+  fi
+}

 # Get latest LKMs
 # $1 path
@@ -15,21 +38,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 +60,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 +91,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 +112,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 +134,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 +156,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 +178,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
@@ -191,44 +198,52 @@ function getBuildrootx() {
  echo "Getting Buildroot-X begin"
  local DEST_PATH="${1}"

-  TAG=$(curl -skL -H "Authorization: token ${TOKEN}" "https://api.github.com/repos/AuxXxilium/arc-buildroot-x/releases" | jq -r ".[].tag_name" | sort -rV | head -1)
+  TAG="$(curl -s https://api.github.com/repos/AuxXxilium/arc-buildroot-x/releases/latest | grep -oP '"tag_name": "\K(.*)(?=")')"
  export BRXTAG="${TAG}"
  [ ! -d "${DEST_PATH}" ] && mkdir -p "${DEST_PATH}"
+  echo "Getting Kernel"
  rm -f "${DEST_PATH}/bzImage-arc"
+  if curl -skL "https://github.com/AuxXxilium/arc-buildroot-x/releases/download/${TAG}/bzImage" -o "${DEST_PATH}/bzImage-arc"; then
+    echo "Kernel: ${TAG}"
+  else
+    echo "Failed to get Kernel"
+    exit 1
+  fi
+  echo "Getting Ramdisk"
  rm -f "${DEST_PATH}/initrd-arc"
-  while read -r ID NAME; do
-    if [ "${NAME}" = "buildroot-${TAG}.zip" ]; then
-      curl -kL -H "Authorization: token ${TOKEN}" -H "Accept: application/octet-stream" "https://api.github.com/repos/AuxXxilium/arc-buildroot-x/releases/assets/${ID}" -o "${DEST_PATH}/brx.zip"
-      echo "Buildroot-X: ${TAG}"
-      unzip -o "${DEST_PATH}/brx.zip" -d "${DEST_PATH}"
-      mv -f "${DEST_PATH}/bzImage" "${DEST_PATH}/bzImage-arc"
-      mv -f "${DEST_PATH}/rootfs.cpio.zst" "${DEST_PATH}/initrd-arc"
-      [ -f "${DEST_PATH}/bzImage-arc" ] && [ -f "${DEST_PATH}/initrd-arc" ] && break
-    fi
-  done <<<$(curl -skL -H "Authorization: token ${TOKEN}" "https://api.github.com/repos/AuxXxilium/arc-buildroot-x/releases/tags/${TAG}" | jq -r '.assets[] | "\(.id) \(.name)"')
+  if curl -skL "https://github.com/AuxXxilium/arc-buildroot-x/releases/download/${TAG}/rootfs.cpio.xz" -o "${DEST_PATH}/initrd-arc"; then
+    echo "Ramdisk: ${TAG}"
+  else
+    echo "Failed to get Ramdisk"
+    exit 1
+  fi
 }

-# Get latest Buildroot-S
+# Get latest Buildroot-X
 # $1 path
 function getBuildroots() {
  echo "Getting Buildroot-S begin"
  local DEST_PATH="${1}"

-  TAG=$(curl -skL -H "Authorization: token ${TOKEN}" "https://api.github.com/repos/AuxXxilium/arc-buildroot-s/releases" | jq -r ".[].tag_name" | sort -rV | head -1)
+  TAG="$(curl -s https://api.github.com/repos/AuxXxilium/arc-buildroot-s/releases/latest | grep -oP '"tag_name": "\K(.*)(?=")')"
  export BRSTAG="${TAG}"
  [ ! -d "${DEST_PATH}" ] && mkdir -p "${DEST_PATH}"
+  echo "Getting Kernel"
  rm -f "${DEST_PATH}/bzImage-arc"
+  if curl -skL "https://github.com/AuxXxilium/arc-buildroot-s/releases/download/${TAG}/bzImage" -o "${DEST_PATH}/bzImage-arc"; then
+    echo "Kernel: ${TAG}"
+  else
+    echo "Failed to get Kernel"
+    exit 1
+  fi
+  echo "Getting Ramdisk"
  rm -f "${DEST_PATH}/initrd-arc"
-  while read -r ID NAME; do
-    if [ "${NAME}" = "buildroot-${TAG}.zip" ]; then
-      curl -kL -H "Authorization: token ${TOKEN}" -H "Accept: application/octet-stream" "https://api.github.com/repos/AuxXxilium/arc-buildroot-s/releases/assets/${ID}" -o "${DEST_PATH}/brs.zip"
-      echo "Buildroot-S: ${TAG}"
-      unzip -o "${DEST_PATH}/brs.zip" -d "${DEST_PATH}"
-      mv -f "${DEST_PATH}/bzImage" "${DEST_PATH}/bzImage-arc"
-      mv -f "${DEST_PATH}/rootfs.cpio.zst" "${DEST_PATH}/initrd-arc"
-      [ -f "${DEST_PATH}/bzImage-arc" ] && [ -f "${DEST_PATH}/initrd-arc" ] && break
-    fi
-  done <<<$(curl -skL -H "Authorization: token ${TOKEN}" "https://api.github.com/repos/AuxXxilium/arc-buildroot-s/releases/tags/${TAG}" | jq -r '.assets[] | "\(.id) \(.name)"')
+  if curl -skL "https://github.com/AuxXxilium/arc-buildroot-s/releases/download/${TAG}/rootfs.cpio.xz" -o "${DEST_PATH}/initrd-arc"; then
+    echo "Ramdisk: ${TAG}"
+  else
+    echo "Failed to get Ramdisk"
+    exit 1
+  fi
 }

 # Get latest Offline
@@ -248,49 +263,33 @@ function getOffline() {
 }

 # repack initrd
-# $1 initrd file
+# $1 initrd file  
 # $2 plugin path
 # $3 output file
 function repackInitrd() {
-  local INITRD_FILE="${1}"
-  local PLUGIN_PATH="${2}"
-  local OUTPUT_PATH="${3:-${INITRD_FILE}}"
+  INITRD_FILE="${1}"
+  PLUGIN_PATH="${2}"
+  OUTPUT_PATH="${3:-${INITRD_FILE}}"

  [ -z "${INITRD_FILE}" ] || [ ! -f "${INITRD_FILE}" ] && exit 1
  [ -z "${PLUGIN_PATH}" ] || [ ! -d "${PLUGIN_PATH}" ] && exit 1
+  
+  INITRD_FILE="$(readlink -f "${INITRD_FILE}")"
+  PLUGIN_PATH="$(readlink -f "${PLUGIN_PATH}")"
+  OUTPUT_PATH="$(readlink -f "${OUTPUT_PATH}")"

-  INITRD_FILE="$(realpath "${INITRD_FILE}")"
-  PLUGIN_PATH="$(realpath "${PLUGIN_PATH}")"
-  OUTPUT_PATH="$(realpath "${OUTPUT_PATH}")"
-
-  local RDXZ_PATH="rdxz_tmp"
+  RDXZ_PATH="rdxz_tmp"
  mkdir -p "${RDXZ_PATH}"
-  local INITRD_FORMAT=$(file -b --mime-type "${INITRD_FILE}")
-
-  case "${INITRD_FORMAT}" in
-  *'x-cpio'*) (cd "${RDXZ_PATH}" && sudo cpio -idm <"${INITRD_FILE}") >/dev/null 2>&1 ;;
-  *'x-xz'*) (cd "${RDXZ_PATH}" && xz -dc "${INITRD_FILE}" | sudo cpio -idm) >/dev/null 2>&1 ;;
-  *'x-lz4'*) (cd "${RDXZ_PATH}" && lz4 -dc "${INITRD_FILE}" | sudo cpio -idm) >/dev/null 2>&1 ;;
-  *'x-lzma'*) (cd "${RDXZ_PATH}" && lzma -dc "${INITRD_FILE}" | sudo cpio -idm) >/dev/null 2>&1 ;;
-  *'x-bzip2'*) (cd "${RDXZ_PATH}" && bzip2 -dc "${INITRD_FILE}" | sudo cpio -idm) >/dev/null 2>&1 ;;
-  *'gzip'*) (cd "${RDXZ_PATH}" && gzip -dc "${INITRD_FILE}" | sudo cpio -idm) >/dev/null 2>&1 ;;
-  *'zstd'*) (cd "${RDXZ_PATH}" && zstd -dc "${INITRD_FILE}" | sudo cpio -idm) >/dev/null 2>&1 ;;
-  *) ;;
-  esac
-
+  (
+    cd "${RDXZ_PATH}"
+    sudo xz -dc <"${INITRD_FILE}" | sudo cpio -idm
+  ) || true
  sudo cp -rf "${PLUGIN_PATH}/"* "${RDXZ_PATH}/"
  [ -f "${OUTPUT_PATH}" ] && rm -rf "${OUTPUT_PATH}"
-
-  case "${INITRD_FORMAT}" in
-  *'x-cpio'*) (cd "${RDXZ_PATH}" && sudo find . 2>/dev/null | sudo cpio -o -H newc -R root:root >"${OUTPUT_PATH}") >/dev/null 2>&1 ;;
-  *'x-xz'*) (cd "${RDXZ_PATH}" && sudo find . 2>/dev/null | sudo cpio -o -H newc -R root:root | xz -9 -C crc32 -c - >"${OUTPUT_PATH}") >/dev/null 2>&1 ;;
-  *'x-lz4'*) (cd "${RDXZ_PATH}" && sudo find . 2>/dev/null | sudo cpio -o -H newc -R root:root | lz4 -9 -l -c - >"${OUTPUT_PATH}") >/dev/null 2>&1 ;;
-  *'x-lzma'*) (cd "${RDXZ_PATH}" && sudo find . 2>/dev/null | sudo cpio -o -H newc -R root:root | lzma -9 -c - >"${OUTPUT_PATH}") >/dev/null 2>&1 ;;
-  *'x-bzip2'*) (cd "${RDXZ_PATH}" && sudo find . 2>/dev/null | sudo cpio -o -H newc -R root:root | bzip2 -9 -c - >"${OUTPUT_PATH}") >/dev/null 2>&1 ;;
-  *'gzip'*) (cd "${RDXZ_PATH}" && sudo find . 2>/dev/null | sudo cpio -o -H newc -R root:root | gzip -9 -c - >"${OUTPUT_PATH}") >/dev/null 2>&1 ;;
-  *'zstd'*) (cd "${RDXZ_PATH}" && sudo find . 2>/dev/null | sudo cpio -o -H newc -R root:root | zstd -19 -T0 -f -c - >"${OUTPUT_PATH}") >/dev/null 2>&1 ;;
-  *) ;;
-  esac
+  (
+    cd "${RDXZ_PATH}"
+    sudo find . 2>/dev/null | sudo cpio -o -H newc -R root:root | xz -9 --check=crc32 >"${OUTPUT_PATH}"
+  ) || true
  sudo rm -rf "${RDXZ_PATH}"
 }

@@ -306,8 +305,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 +325,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"
@@ -395,117 +413,14 @@ ethernet0.virtualDev = "vmxnet3"
 ethernet0.connectionType = "nat"
 ethernet0.allowguestconnectioncontrol = "true"
 ethernet0.present = "TRUE"
-serial0.fileType = "file"
-serial0.fileName = "serial0.log"
-serial0.present = "TRUE"
 sata0.present = "TRUE"
 sata0:0.fileName = "${VMNAME}-disk1.vmdk"
 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}"
+  ovftool/ovftool "OVA_${VMNAME}/${VMNAME}.vmx" "${OVAPATH}"
+  rm -rf "OVA_${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_
-}
-
-# copy buildroot
-function copyBuildroot() {
-  DEST_PATH="${1}"
-  rm -rf "${DEST_PATH}"
-  mkdir -p "${DEST_PATH}"
-  cp -f "../${DEST_PATH}/bzImage" "${DEST_PATH}/bzImage-arc"
-  cp -f "../${DEST_PATH}/rootfs.cpio.zst" "${DEST_PATH}/initrd-arc"
-}
-
-# create arc executable
-function createArc() {
-  ./scripts/make/makeself.sh "../arc/files/initrd/opt/arc" arc "Arc Loader" "./init.sh" --current --base64 --chown --threads=0 --quiet
-  rm -rf "../arc/files/initrd/opt/arc"
-  mkdir -p "../arc/files/initrd/opt/arc"
-  mv -f "arc" "../arc/files/initrd/opt/arc/"
-  cp -f "./grub.img.gz" "files/initrd/opt/arc/grub.img.gz"
-}
--- a/scripts/make/makeself-header.sh
+++ b/scripts/make/makeself-header.sh
@@ -1,714 +0,0 @@
-cat << EOF  > "$archname"
-#!/bin/sh
-# This script was generated using Makeself $MS_VERSION
-# The license covering this archive and its contents, if any, is wholly independent of the Makeself license (GPL)
-
-ORIG_UMASK=\`umask\`
-if test "$KEEP_UMASK" = n; then
-    umask 077
-fi
-
-CRCsum="$CRCsum"
-MD5="$MD5sum"
-SHA="$SHAsum"
-SIGNATURE="$Signature"
-TMPROOT=\${TMPDIR:=/tmp}
-USER_PWD="\$PWD"
-export USER_PWD
-ARCHIVE_DIR=\`dirname "\$0"\`
-export ARCHIVE_DIR
-
-label="$LABEL"
-script="$SCRIPT"
-scriptargs="$SCRIPTARGS"
-cleanup_script="${CLEANUP_SCRIPT}"
-licensetxt="$LICENSE"
-helpheader="${HELPHEADER}"
-targetdir="$archdirname"
-filesizes="$filesizes"
-totalsize="$totalsize"
-keep="$KEEP"
-nooverwrite="$NOOVERWRITE"
-quiet="n"
-accept="n"
-nodiskspace="n"
-export_conf="$EXPORT_CONF"
-decrypt_cmd="$DECRYPT_CMD"
-skip="$SKIP"
-
-print_cmd_arg=""
-if type printf > /dev/null; then
-    print_cmd="printf"
-elif test -x /usr/ucb/echo; then
-    print_cmd="/usr/ucb/echo"
-else
-    print_cmd="echo"
-fi
-
-if test -d /usr/xpg4/bin; then
-    PATH=/usr/xpg4/bin:\$PATH
-    export PATH
-fi
-
-if test -d /usr/sfw/bin; then
-    PATH=\$PATH:/usr/sfw/bin
-    export PATH
-fi
-
-unset CDPATH
-
-MS_Printf()
-{
-    \$print_cmd \$print_cmd_arg "\$1"
-}
-
-MS_PrintLicense()
-{
-  PAGER=\${PAGER:=more}
-  if test x"\$licensetxt" != x; then
-    PAGER_PATH=\`exec <&- 2>&-; which \$PAGER || command -v \$PAGER || type \$PAGER\`
-    if test -x "\$PAGER_PATH"; then
-      echo "\$licensetxt" | \$PAGER
-    else
-      echo "\$licensetxt"
-    fi
-    if test x"\$accept" != xy; then
-      while true
-      do
-        MS_Printf "Please type y to accept, n otherwise: "
-        read yn
-        if test x"\$yn" = xn; then
-          keep=n
-          eval \$finish; exit 1
-          break;
-        elif test x"\$yn" = xy; then
-          break;
-        fi
-      done
-    fi
-  fi
-}
-
-MS_diskspace()
-{
-	(
-	df -k "\$1" | tail -1 | awk '{ if (\$4 ~ /%/) {print \$3} else {print \$4} }'
-	)
-}
-
-MS_dd()
-{
-    blocks=\`expr \$3 / 1024\`
-    bytes=\`expr \$3 % 1024\`
-    # Test for ibs, obs and conv feature
-    if dd if=/dev/zero of=/dev/null count=1 ibs=512 obs=512 conv=sync 2> /dev/null; then
-        dd if="\$1" ibs=\$2 skip=1 obs=1024 conv=sync 2> /dev/null | \\
-        { test \$blocks -gt 0 && dd ibs=1024 obs=1024 count=\$blocks ; \\
-          test \$bytes  -gt 0 && dd ibs=1 obs=1024 count=\$bytes ; } 2> /dev/null
-    else
-        dd if="\$1" bs=\$2 skip=1 2> /dev/null
-    fi
-}
-
-MS_dd_Progress()
-{
-    if test x"\$noprogress" = xy; then
-        MS_dd "\$@"
-        return \$?
-    fi
-    file="\$1"
-    offset=\$2
-    length=\$3
-    pos=0
-    bsize=4194304
-    while test \$bsize -gt \$length; do
-        bsize=\`expr \$bsize / 4\`
-    done
-    blocks=\`expr \$length / \$bsize\`
-    bytes=\`expr \$length % \$bsize\`
-    (
-        dd ibs=\$offset skip=1 count=1 2>/dev/null
-        pos=\`expr \$pos \+ \$bsize\`
-        MS_Printf "     0%% " 1>&2
-        if test \$blocks -gt 0; then
-            while test \$pos -le \$length; do
-                dd bs=\$bsize count=1 2>/dev/null
-                pcent=\`expr \$length / 100\`
-                pcent=\`expr \$pos / \$pcent\`
-                if test \$pcent -lt 100; then
-                    MS_Printf "\b\b\b\b\b\b\b" 1>&2
-                    if test \$pcent -lt 10; then
-                        MS_Printf "    \$pcent%% " 1>&2
-                    else
-                        MS_Printf "   \$pcent%% " 1>&2
-                    fi
-                fi
-                pos=\`expr \$pos \+ \$bsize\`
-            done
-        fi
-        if test \$bytes -gt 0; then
-            dd bs=\$bytes count=1 2>/dev/null
-        fi
-        MS_Printf "\b\b\b\b\b\b\b" 1>&2
-        MS_Printf " 100%%  " 1>&2
-    ) < "\$file"
-}
-
-MS_Help()
-{
-    cat << EOH >&2
-Makeself version $MS_VERSION
- 1) Getting help or info about \$0 :
-  \$0 --help   Print this message
-  \$0 --info   Print embedded info : title, default target directory, embedded script ...
-  \$0 --lsm    Print embedded lsm entry (or no LSM)
-  \$0 --list   Print the list of files in the archive
-  \$0 --check  Checks integrity of the archive
-  \$0 --verify-sig key Verify signature agains a provided key id
-
- 2) Running \$0 :
-  \$0 [options] [--] [additional arguments to embedded script]
-  with following options (in that order)
-  --confirm             Ask before running embedded script
-  --quiet               Do not print anything except error messages
-  --accept              Accept the license
-  --noexec              Do not run embedded script (implies --noexec-cleanup)
-  --noexec-cleanup      Do not run embedded cleanup script
-  --keep                Do not erase target directory after running
-                        the embedded script
-  --noprogress          Do not show the progress during the decompression
-  --nox11               Do not spawn an xterm
-  --nochown             Do not give the target folder to the current user
-  --chown               Give the target folder to the current user recursively
-  --nodiskspace         Do not check for available disk space
-  --target dir          Extract directly to a target directory (absolute or relative)
-                        This directory may undergo recursive chown (see --nochown).
-  --tar arg1 [arg2 ...] Access the contents of the archive through the tar command
-  --ssl-pass-src src    Use the given src as the source of password to decrypt the data
-                        using OpenSSL. See "PASS PHRASE ARGUMENTS" in man openssl.
-                        Default is to prompt the user to enter decryption password
-                        on the current terminal.
-  --cleanup-args args   Arguments to the cleanup script. Wrap in quotes to provide
-                        multiple arguments.
-  --                    Following arguments will be passed to the embedded script\${helpheader}
-EOH
-}
-
-MS_Verify_Sig()
-{
-    GPG_PATH=\`exec <&- 2>&-; which gpg || command -v gpg || type gpg\`
-    MKTEMP_PATH=\`exec <&- 2>&-; which mktemp || command -v mktemp || type mktemp\`
-    test -x "\$GPG_PATH" || GPG_PATH=\`exec <&- 2>&-; which gpg || command -v gpg || type gpg\`
-    test -x "\$MKTEMP_PATH" || MKTEMP_PATH=\`exec <&- 2>&-; which mktemp || command -v mktemp || type mktemp\`
-	offset=\`head -n "\$skip" "\$1" | wc -c | sed "s/ //g"\`
-    temp_sig=\`mktemp -t XXXXX\`
-    echo \$SIGNATURE | base64 --decode > "\$temp_sig"
-    gpg_output=\`MS_dd "\$1" \$offset \$totalsize | LC_ALL=C "\$GPG_PATH" --verify "\$temp_sig" - 2>&1\`
-    gpg_res=\$?
-    rm -f "\$temp_sig"
-    if test \$gpg_res -eq 0 && test \`echo \$gpg_output | grep -c Good\` -eq 1; then
-        if test \`echo \$gpg_output | grep -c \$sig_key\` -eq 1; then
-            test x"\$quiet" = xn && echo "GPG signature is good" >&2
-        else
-            echo "GPG Signature key does not match" >&2
-            exit 2
-        fi
-    else
-        test x"\$quiet" = xn && echo "GPG signature failed to verify" >&2
-        exit 2
-    fi
-}
-
-MS_Check()
-{
-    OLD_PATH="\$PATH"
-    PATH=\${GUESS_MD5_PATH:-"\$OLD_PATH:/bin:/usr/bin:/sbin:/usr/local/ssl/bin:/usr/local/bin:/opt/openssl/bin"}
-	MD5_ARG=""
-    MD5_PATH=\`exec <&- 2>&-; which md5sum || command -v md5sum || type md5sum\`
-    test -x "\$MD5_PATH" || MD5_PATH=\`exec <&- 2>&-; which md5 || command -v md5 || type md5\`
-    test -x "\$MD5_PATH" || MD5_PATH=\`exec <&- 2>&-; which digest || command -v digest || type digest\`
-    PATH="\$OLD_PATH"
-
-    SHA_PATH=\`exec <&- 2>&-; which shasum || command -v shasum || type shasum\`
-    test -x "\$SHA_PATH" || SHA_PATH=\`exec <&- 2>&-; which sha256sum || command -v sha256sum || type sha256sum\`
-
-    if test x"\$quiet" = xn; then
-		MS_Printf "Verifying archive integrity..."
-    fi
-    offset=\`head -n "\$skip" "\$1" | wc -c | sed "s/ //g"\`
-    fsize=\`cat "\$1" | wc -c | sed "s/ //g"\`
-    if test \$totalsize -ne \`expr \$fsize - \$offset\`; then
-        echo " Unexpected archive size." >&2
-        exit 2
-    fi
-    verb=\$2
-    i=1
-    for s in \$filesizes
-    do
-		crc=\`echo \$CRCsum | cut -d" " -f\$i\`
-		if test -x "\$SHA_PATH"; then
-			if test x"\`basename \$SHA_PATH\`" = xshasum; then
-				SHA_ARG="-a 256"
-			fi
-			sha=\`echo \$SHA | cut -d" " -f\$i\`
-			if test x"\$sha" = x0000000000000000000000000000000000000000000000000000000000000000; then
-				test x"\$verb" = xy && echo " \$1 does not contain an embedded SHA256 checksum." >&2
-			else
-				shasum=\`MS_dd_Progress "\$1" \$offset \$s | eval "\$SHA_PATH \$SHA_ARG" | cut -b-64\`;
-				if test x"\$shasum" != x"\$sha"; then
-					echo "Error in SHA256 checksums: \$shasum is different from \$sha" >&2
-					exit 2
-				elif test x"\$quiet" = xn; then
-					MS_Printf " SHA256 checksums are OK." >&2
-				fi
-				crc="0000000000";
-			fi
-		fi
-		if test -x "\$MD5_PATH"; then
-			if test x"\`basename \$MD5_PATH\`" = xdigest; then
-				MD5_ARG="-a md5"
-			fi
-			md5=\`echo \$MD5 | cut -d" " -f\$i\`
-			if test x"\$md5" = x00000000000000000000000000000000; then
-				test x"\$verb" = xy && echo " \$1 does not contain an embedded MD5 checksum." >&2
-			else
-				md5sum=\`MS_dd_Progress "\$1" \$offset \$s | eval "\$MD5_PATH \$MD5_ARG" | cut -b-32\`;
-				if test x"\$md5sum" != x"\$md5"; then
-					echo "Error in MD5 checksums: \$md5sum is different from \$md5" >&2
-					exit 2
-				elif test x"\$quiet" = xn; then
-					MS_Printf " MD5 checksums are OK." >&2
-				fi
-				crc="0000000000"; verb=n
-			fi
-		fi
-		if test x"\$crc" = x0000000000; then
-			test x"\$verb" = xy && echo " \$1 does not contain a CRC checksum." >&2
-		else
-			sum1=\`MS_dd_Progress "\$1" \$offset \$s | CMD_ENV=xpg4 cksum | awk '{print \$1}'\`
-			if test x"\$sum1" != x"\$crc"; then
-				echo "Error in checksums: \$sum1 is different from \$crc" >&2
-				exit 2
-			elif test x"\$quiet" = xn; then
-				MS_Printf " CRC checksums are OK." >&2
-			fi
-		fi
-		i=\`expr \$i + 1\`
-		offset=\`expr \$offset + \$s\`
-    done
-    if test x"\$quiet" = xn; then
-		echo " All good."
-    fi
-}
-
-MS_Decompress()
-{
-    if test x"\$decrypt_cmd" != x""; then
-        { eval "\$decrypt_cmd" || echo " ... Decryption failed." >&2; } | eval "$GUNZIP_CMD"
-    else
-        eval "$GUNZIP_CMD"
-    fi
-    
-    if test \$? -ne 0; then
-        echo " ... Decompression failed." >&2
-    fi
-}
-
-UnTAR()
-{
-    if test x"\$quiet" = xn; then
-		tar \$1vf - $UNTAR_EXTRA 2>&1 || { echo " ... Extraction failed." >&2; kill -15 \$$; }
-    else
-		tar \$1f - $UNTAR_EXTRA 2>&1 || { echo Extraction failed. >&2; kill -15 \$$; }
-    fi
-}
-
-MS_exec_cleanup() {
-    if test x"\$cleanup" = xy && test x"\$cleanup_script" != x""; then
-        cleanup=n
-        cd "\$tmpdir"
-        eval "\"\$cleanup_script\" \$scriptargs \$cleanupargs"
-    fi
-}
-
-MS_cleanup()
-{
-    echo 'Signal caught, cleaning up' >&2
-    MS_exec_cleanup
-    cd "\$TMPROOT"
-    rm -rf "\$tmpdir"
-    eval \$finish; exit 15
-}
-
-finish=true
-xterm_loop=
-noprogress=$NOPROGRESS
-nox11=$NOX11
-copy=$COPY
-ownership=$OWNERSHIP
-verbose=n
-cleanup=y
-cleanupargs=
-sig_key=
-
-initargs="\$@"
-
-while true
-do
-    case "\$1" in
-    -h | --help)
-	MS_Help
-	exit 0
-	;;
-    -q | --quiet)
-	quiet=y
-	noprogress=y
-	shift
-	;;
-	--accept)
-	accept=y
-	shift
-	;;
-    --info)
-	echo Identification: "\$label"
-	echo Target directory: "\$targetdir"
-	echo Uncompressed size: $USIZE KB
-	echo Compression: $COMPRESS
-	if test x"$ENCRYPT" != x""; then
-	    echo Encryption: $ENCRYPT
-	fi
-	echo Date of packaging: $DATE
-	echo Built with Makeself version $MS_VERSION
-	echo Build command was: "$MS_COMMAND"
-	if test x"\$script" != x; then
-	    echo Script run after extraction:
-	    echo "    " \$script \$scriptargs
-	fi
-	if test x"$copy" = xcopy; then
-		echo "Archive will copy itself to a temporary location"
-	fi
-	if test x"$NEED_ROOT" = xy; then
-		echo "Root permissions required for extraction"
-	fi
-	if test x"$KEEP" = xy; then
-	    echo "directory \$targetdir is permanent"
-	else
-	    echo "\$targetdir will be removed after extraction"
-	fi
-	exit 0
-	;;
-    --dumpconf)
-	echo LABEL=\"\$label\"
-	echo SCRIPT=\"\$script\"
-	echo SCRIPTARGS=\"\$scriptargs\"
-    echo CLEANUPSCRIPT=\"\$cleanup_script\"
-	echo archdirname=\"$archdirname\"
-	echo KEEP=$KEEP
-	echo NOOVERWRITE=$NOOVERWRITE
-	echo COMPRESS=$COMPRESS
-	echo filesizes=\"\$filesizes\"
-    echo totalsize=\"\$totalsize\"
-	echo CRCsum=\"\$CRCsum\"
-	echo MD5sum=\"\$MD5sum\"
-	echo SHAsum=\"\$SHAsum\"
-	echo SKIP=\"\$skip\"
-	exit 0
-	;;
-    --lsm)
-cat << EOLSM
-EOF
-eval "$LSM_CMD"
-cat << EOF  >> "$archname"
-EOLSM
-	exit 0
-	;;
-    --list)
-	echo Target directory: \$targetdir
-	offset=\`head -n "\$skip" "\$0" | wc -c | sed "s/ //g"\`
-	for s in \$filesizes
-	do
-	    MS_dd "\$0" \$offset \$s | MS_Decompress | UnTAR t
-	    offset=\`expr \$offset + \$s\`
-	done
-	exit 0
-	;;
-	--tar)
-	offset=\`head -n "\$skip" "\$0" | wc -c | sed "s/ //g"\`
-	arg1="\$2"
-    shift 2 || { MS_Help; exit 1; }
-	for s in \$filesizes
-	do
-	    MS_dd "\$0" \$offset \$s | MS_Decompress | tar "\$arg1" - "\$@"
-	    offset=\`expr \$offset + \$s\`
-	done
-	exit 0
-	;;
-    --check)
-	MS_Check "\$0" y
-	exit 0
-	;;
-    --verify-sig)
-    sig_key="\$2"
-    shift 2 || { MS_Help; exit 1; }
-    MS_Verify_Sig "\$0"
-    ;;
-    --confirm)
-	verbose=y
-	shift
-	;;
-	--noexec)
-	script=""
-    cleanup_script=""
-	shift
-	;;
-    --noexec-cleanup)
-    cleanup_script=""
-    shift
-    ;;
-    --keep)
-	keep=y
-	shift
-	;;
-    --target)
-	keep=y
-	targetdir="\${2:-.}"
-    shift 2 || { MS_Help; exit 1; }
-	;;
-    --noprogress)
-	noprogress=y
-	shift
-	;;
-    --nox11)
-	nox11=y
-	shift
-	;;
-    --nochown)
-	ownership=n
-	shift
-	;;
-    --chown)
-        ownership=y
-        shift
-        ;;
-    --nodiskspace)
-	nodiskspace=y
-	shift
-	;;
-    --xwin)
-	if test "$NOWAIT" = n; then
-		finish="echo Press Return to close this window...; read junk"
-	fi
-	xterm_loop=1
-	shift
-	;;
-    --phase2)
-	copy=phase2
-	shift
-	;;
-	--ssl-pass-src)
-	if test x"$ENCRYPT" != x"openssl"; then
-	    echo "Invalid option --ssl-pass-src: \$0 was not encrypted with OpenSSL!" >&2
-	    exit 1
-	fi
-	decrypt_cmd="\$decrypt_cmd -pass \$2"
-    shift 2 || { MS_Help; exit 1; }
-	;;
-    --cleanup-args)
-    cleanupargs="\$2"
-    shift 2 || { MS_Help; exit 1; }
-    ;;
-    --)
-	shift
-	break ;;
-    -*)
-	echo Unrecognized flag : "\$1" >&2
-	MS_Help
-	exit 1
-	;;
-    *)
-	break ;;
-    esac
-done
-
-if test x"\$quiet" = xy -a x"\$verbose" = xy; then
-	echo Cannot be verbose and quiet at the same time. >&2
-	exit 1
-fi
-
-if test x"$NEED_ROOT" = xy -a \`id -u\` -ne 0; then
-	echo "Administrative privileges required for this archive (use su or sudo)" >&2
-	exit 1	
-fi
-
-if test x"\$copy" \!= xphase2; then
-    MS_PrintLicense
-fi
-
-case "\$copy" in
-copy)
-    tmpdir="\$TMPROOT"/makeself.\$RANDOM.\`date +"%y%m%d%H%M%S"\`.\$\$
-    mkdir "\$tmpdir" || {
-	echo "Could not create temporary directory \$tmpdir" >&2
-	exit 1
-    }
-    SCRIPT_COPY="\$tmpdir/makeself"
-    echo "Copying to a temporary location..." >&2
-    cp "\$0" "\$SCRIPT_COPY"
-    chmod +x "\$SCRIPT_COPY"
-    cd "\$TMPROOT"
-    export USER_PWD="\$tmpdir"
-    exec "\$SCRIPT_COPY" --phase2 -- \$initargs
-    ;;
-phase2)
-    finish="\$finish ; rm -rf \`dirname \$0\`"
-    ;;
-esac
-
-if test x"\$nox11" = xn; then
-    if test -t 1; then  # Do we have a terminal on stdout?
-	:
-    else
-        if test x"\$DISPLAY" != x -a x"\$xterm_loop" = x; then  # No, but do we have X?
-            if xset q > /dev/null 2>&1; then # Check for valid DISPLAY variable
-                GUESS_XTERMS="xterm gnome-terminal rxvt dtterm eterm Eterm xfce4-terminal lxterminal kvt konsole aterm terminology"
-                for a in \$GUESS_XTERMS; do
-                    if type \$a >/dev/null 2>&1; then
-                        XTERM=\$a
-                        break
-                    fi
-                done
-                chmod a+x \$0 || echo Please add execution rights on \$0 >&2
-                if test \`echo "\$0" | cut -c1\` = "/"; then # Spawn a terminal!
-                    exec \$XTERM -e "\$0 --xwin \$initargs"
-                else
-                    exec \$XTERM -e "./\$0 --xwin \$initargs"
-                fi
-            fi
-        fi
-    fi
-fi
-
-if test x"\$targetdir" = x.; then
-    tmpdir="."
-else
-    if test x"\$keep" = xy; then
-	if test x"\$nooverwrite" = xy && test -d "\$targetdir"; then
-            echo "Target directory \$targetdir already exists, aborting." >&2
-            exit 1
-	fi
-	if test x"\$quiet" = xn; then
-	    echo "Creating directory \$targetdir" >&2
-	fi
-	tmpdir="\$targetdir"
-	dashp="-p"
-    else
-	tmpdir="\$TMPROOT/selfgz\$\$\$RANDOM"
-	dashp=""
-    fi
-    mkdir \$dashp "\$tmpdir" || {
-	echo 'Cannot create target directory' \$tmpdir >&2
-	echo 'You should try option --target dir' >&2
-	eval \$finish
-	exit 1
-    }
-fi
-
-location="\`pwd\`"
-if test x"\$SETUP_NOCHECK" != x1; then
-    MS_Check "\$0"
-fi
-offset=\`head -n "\$skip" "\$0" | wc -c | sed "s/ //g"\`
-
-if test x"\$verbose" = xy; then
-	MS_Printf "About to extract $USIZE KB in \$tmpdir ... Proceed ? [Y/n] "
-	read yn
-	if test x"\$yn" = xn; then
-		eval \$finish; exit 1
-	fi
-fi
-
-if test x"\$quiet" = xn; then
-    # Decrypting with openssl will ask for password,
-    # the prompt needs to start on new line
-	if test x"$ENCRYPT" = x"openssl"; then
-	    echo "Decrypting and uncompressing \$label..."
-	else
-        MS_Printf "Uncompressing \$label"
-	fi
-fi
-res=3
-if test x"\$keep" = xn; then
-    trap MS_cleanup 1 2 3 15
-fi
-
-if test x"\$nodiskspace" = xn; then
-    leftspace=\`MS_diskspace "\$tmpdir"\`
-    if test -n "\$leftspace"; then
-        if test "\$leftspace" -lt $USIZE; then
-            echo
-            echo "Not enough space left in "\`dirname \$tmpdir\`" (\$leftspace KB) to decompress \$0 ($USIZE KB)" >&2
-            echo "Use --nodiskspace option to skip this check and proceed anyway" >&2
-            if test x"\$keep" = xn; then
-                echo "Consider setting TMPDIR to a directory with more free space."
-            fi
-            eval \$finish; exit 1
-        fi
-    fi
-fi
-
-for s in \$filesizes
-do
-    if MS_dd_Progress "\$0" \$offset \$s | MS_Decompress | ( cd "\$tmpdir"; umask \$ORIG_UMASK ; UnTAR xp ) 1>/dev/null; then
-		if test x"\$ownership" = xy; then
-			(cd "\$tmpdir"; chown -R \`id -u\` .;  chgrp -R \`id -g\` .)
-		fi
-    else
-		echo >&2
-		echo "Unable to decompress \$0" >&2
-		eval \$finish; exit 1
-    fi
-    offset=\`expr \$offset + \$s\`
-done
-if test x"\$quiet" = xn; then
-	echo
-fi
-
-cd "\$tmpdir"
-res=0
-if test x"\$script" != x; then
-    if test x"\$export_conf" = x"y"; then
-        MS_BUNDLE="\$0"
-        MS_LABEL="\$label"
-        MS_SCRIPT="\$script"
-        MS_SCRIPTARGS="\$scriptargs"
-        MS_ARCHDIRNAME="\$archdirname"
-        MS_KEEP="\$KEEP"
-        MS_NOOVERWRITE="\$NOOVERWRITE"
-        MS_COMPRESS="\$COMPRESS"
-        MS_CLEANUP="\$cleanup"
-        export MS_BUNDLE MS_LABEL MS_SCRIPT MS_SCRIPTARGS
-        export MS_ARCHDIRNAME MS_KEEP MS_NOOVERWRITE MS_COMPRESS
-    fi
-
-    if test x"\$verbose" = x"y"; then
-		MS_Printf "OK to execute: \$script \$scriptargs \$* ? [Y/n] "
-		read yn
-		if test x"\$yn" = x -o x"\$yn" = xy -o x"\$yn" = xY; then
-			eval "\"\$script\" \$scriptargs \"\\\$@\""; res=\$?;
-		fi
-    else
-		eval "\"\$script\" \$scriptargs \"\\\$@\""; res=\$?
-    fi
-    if test "\$res" -ne 0; then
-		test x"\$verbose" = xy && echo "The program '\$script' returned an error code (\$res)" >&2
-    fi
-fi
-
-MS_exec_cleanup
-
-if test x"\$keep" = xn; then
-    cd "\$TMPROOT"
-    rm -rf "\$tmpdir"
-fi
-eval \$finish; exit \$res
-EOF
--- a/scripts/make/makeself.1
+++ b/scripts/make/makeself.1
@@ -1,158 +0,0 @@
-.TH "MAKESELF" "1" "2.5.0"
-.SH "NAME"
-makeself \- An utility to generate self-extractable archives.
-.SH "SYNTAX"
-.B makeself [\fIoptions\fP] archive_dir file_name label
-.B [\fIstartup_script\fP] [\fIargs\fP]
-.SH "DESCRIPTION"
-This program is a free (GPL) shell utility designed to create self-extractable
-compressed archives from a directory. The resulting file appears as a shell script, and can be launched as is. The archive
-will then uncompress itself to a temporary directory and an optional arbitrary
-command will be executed (for example an installation script). 
-.TP
-Makeself archives also include checksums for integrity self-validation (CRC and/or MD5/SHA256 checksums).
-.SH "OPTIONS"
-The following options are supported:
-.TP 15
-.B -v, --version
-Prints out the makeself version number and exits.
-.TP
-.B -h, --help
-Print out help information.
-.TP
-.B --tar-quietly
-Suppress verbose output from the tar command
-.TP
-.B --quiet
-Do not print any messages other than errors
-.TP
-.B --gzip
-Compress using gzip (default if detected).
-.TP
-.B --bzip2
-Compress using bzip2.
-.TP
-.B --bzip3
-Compress using bzip3.
-.TP
-.B --pbzip2
-Compress using pbzip2.
-.TP
-.B --xz
-Compress using xz.
-.TP
-.B --lzo
-Compress using lzop.
-.TP
-.B --lz4
-Compress using lz4.
-.TP
-.B --pigz
-Compress using pigz.
-.TP
-.B --zstd
-Compress using zstd.
-.TP
-.B --base64
-Encode the archive to ASCII in Base64 format instead of compressing (base64 command required).
-.TP
-.B --gpg-encrypt
-Encrypt the archive using GPG. This will prompt for a password to encrypt with.
-.TP
-.B --ssl-encrypt
-Encrypt the archive using OpenSSL. This will prompt for a password to encrypt with.
-.TP
-.B --keep-umask
-Keep the umask set to shell default, rather than overriding when executing the self-extracting archive.
-.TP
-.B --compress
-Compress using the UNIX 'compress' command.
-.TP
-.B --nocomp
-Do not compress the data.
-.TP
-.B --complevel lvl
-Specify the compression level for gzip, bzip2, pbzip2, xz, zstd, lzo or lz4. Defaults to 9.
-.TP
-.B --threads num
-Specify the number of threads to be used by compressors that support parallelization.
-.TP
-.B --tar-format opt
- Specify the tar archive format (default is ustar); you may use any value accepted by your tar command (such as posix, v7, etc).
-.TP
-.B --tar-extra opt
-Append more options to the tar command line.
-.TP
-.B --notemp
-The archive will create archive_dir in the current directory and
-uncompress in ./archive_dir.
-.TP
-.B --copy
-Upon extraction, the archive will first copy itself to a temporary directory.
-.TP
-.B --append
-Append more files to an existing makeself archive. The label and startup scripts will then be ignored.
-.TP
-.B --current
-Files will be extracted to the current directory. Both --current and --target dir imply --notemp.
-.TP
-.B --target dir
-Extract directly to a target directory. Directory path can be either absolute or relative.
-.TP
-.B --header file
-Specify location of the header script.
-.TP
-.B --help-header file
-Add a header to the archive's help output.
-.TP
-.B --cleanup file
-Specify a cleanup script that executes on interrupt and when finished successfully.
-.TP
-.B --follow
-Follow the symlinks in the archive.
-.TP
-.B --noprogress
-Do not show the progress during the decompression.
-.TP
-.B --nooverwrite
-Do not extract the archive if the target directory already exists.
-.TP
-.B --nox11
-Disable automatic spawn of an xterm if running in X11.
-.TP
-.B --nowait
-Do not wait for user input after executing embedded program from an xterm.
-.TP
-.B --nomd5
-Do not create a MD5 checksum for the archive.
-.TP
-.B --sha256
-Adds a SHA256 checksum for the archive.
-.TP
-.B --nocrc
-Do not create a CRC32 checksum for the archive.
-.TP
-.B --lsm file
-LSM file describing the package.
-.TP
-.B --license file
-Append a license file.
-.TP
-.B --packaging-date date
-Use provided string as the packaging date instead of the current date.
-.TP
-.SH "EXAMPLES"
-Here is an example, assuming the user has a package image stored in a /home/joe/mysoft,
-and he wants to generate a self-extracting package named mysoft.sh, which will launch
-the "setup" script initially stored in /home/joe/mysoft:
-.TP
-makeself.sh /home/joe/mysoft mysoft.sh "Joe's Nice Software Package" ./setup
-.TP
-Here is also how I created the makeself.run archive which contains the Makeself distribution:
-.TP
-makeself.sh --notemp makeself makeself.run "Makeself by Stephane Peter" echo "Makeself has extracted itself"
-.SH "AUTHORS"
-Makeself has been written by Stephane Peter <megastep@megastep.org>.
-.BR
-This man page was originally written by Bartosz Fenski <fenio@o2.pl> for the
-Debian GNU/Linux distribution (but it may be used by others).
--- a/scripts/make/makeself.sh
+++ b/scripts/make/makeself.sh
@@ -1,776 +0,0 @@
-#!/bin/sh
-#
-# Makeself version 2.5.x
-#  by Stephane Peter <megastep@megastep.org>
-#
-# Utility to create self-extracting tar.gz archives.
-# The resulting archive is a file holding the tar.gz archive with
-# a small Shell script stub that uncompresses the archive to a temporary
-# directory and then executes a given script from withing that directory.
-#
-# Makeself home page: https://makeself.io/ - Version history available on GitHub
-#
-# (C) 1998-2023 by Stephane Peter <megastep@megastep.org>
-#
-# This software is released under the terms of the GNU GPL version 2 and above
-# Please read the license at http://www.gnu.org/copyleft/gpl.html
-# Self-extracting archives created with this script are explictly NOT released under the term of the GPL
-#
-
-MS_VERSION=2.5.0
-MS_COMMAND="$0"
-unset CDPATH
-
-for f in ${1+"$@"}; do
-    MS_COMMAND="$MS_COMMAND \\\\
-    \\\"$f\\\""
-done
-
-# For Solaris systems
-if test -d /usr/xpg4/bin; then
-    PATH=/usr/xpg4/bin:$PATH
-    export PATH
-fi
-
-# Procedures
-
-MS_Usage()
-{
-    echo "Usage: $0 [args] archive_dir file_name label startup_script [script_args]"
-    echo "args can be one or more of the following :"
-    echo "    --version | -v     : Print out Makeself version number and exit"
-    echo "    --help | -h        : Print out this help message"
-    echo "    --tar-quietly      : Suppress verbose output from the tar command"
-    echo "    --quiet | -q       : Do not print any messages other than errors."
-    echo "    --gzip             : Compress using gzip (default if detected)"
-    echo "    --pigz             : Compress with pigz"
-    echo "    --zstd             : Compress with zstd"
-    echo "    --bzip2            : Compress using bzip2 instead of gzip"
-    echo "    --pbzip2           : Compress using pbzip2 instead of gzip"
-    echo "    --bzip3            : Compress using bzip3 instead of gzip"
-    echo "    --xz               : Compress using xz instead of gzip"
-    echo "    --lzo              : Compress using lzop instead of gzip"
-    echo "    --lz4              : Compress using lz4 instead of gzip"
-    echo "    --compress         : Compress using the UNIX 'compress' command"
-    echo "    --complevel lvl    : Compression level for gzip pigz zstd xz lzo lz4 bzip2 pbzip2 and bzip3 (default 9)"
-    echo "    --threads thds     : Number of threads to be used by compressors that support parallelization."
-    echo "                         Omit to use compressor's default. Most useful (and required) for opting"
-    echo "                         into xz's threading, usually with '--threads=0' for all available cores."
-    echo "                         pbzip2 and pigz are parallel by default, and setting this value allows"
-    echo "                         limiting the number of threads they use."
-    echo "    --base64           : Instead of compressing, encode the data using base64"
-    echo "    --gpg-encrypt      : Instead of compressing, encrypt the data using GPG"
-    echo "    --gpg-asymmetric-encrypt-sign"
-    echo "                       : Instead of compressing, asymmetrically encrypt and sign the data using GPG"
-    echo "    --gpg-extra opt    : Append more options to the gpg command line"
-    echo "    --ssl-encrypt      : Instead of compressing, encrypt the data using OpenSSL"
-    echo "    --ssl-passwd pass  : Use the given password to encrypt the data using OpenSSL"
-    echo "    --ssl-pass-src src : Use the given src as the source of password to encrypt the data"
-    echo "                         using OpenSSL. See \"PASS PHRASE ARGUMENTS\" in man openssl."
-    echo "                         If this option is not supplied, the user will be asked to enter"
-    echo "                         encryption password on the current terminal."
-    echo "    --ssl-no-md        : Do not use \"-md\" option not supported by older OpenSSL."
-    echo "    --nochown          : Do not give the target folder to the current user (default)"
-    echo "    --chown            : Give the target folder to the current user recursively"
-    echo "    --nocomp           : Do not compress the data"
-    echo "    --notemp           : The archive will create archive_dir in the current directory"
-    echo "                         and uncompress in ./archive_dir"
-    echo "                         Note: persistent archives do not strictly require a startup_script"
-    echo "    --needroot         : Check that the root user is extracting the archive before proceeding"
-    echo "    --copy             : Upon extraction, the archive will first copy itself to"
-    echo "                         a temporary directory"
-    echo "    --append           : Append more files to an existing Makeself archive"
-    echo "                         The label and startup scripts will then be ignored"
-    echo "    --target dir       : Extract directly to a target directory"
-    echo "                         directory path can be either absolute or relative"
-    echo "    --current          : Files will be extracted to the current directory"
-    echo "                         Both --current and --target imply --notemp, and do not require a startup_script"
-    echo "    --nooverwrite      : Do not extract the archive if the specified target directory exists"
-    echo "    --tar-format opt   : Specify a tar archive format (default is ustar)"
-    echo "    --tar-extra opt    : Append more options to the tar command line"
-    echo "    --untar-extra opt  : Append more options to the during the extraction of the tar archive"
-    echo "    --nomd5            : Don't calculate an MD5 for archive"
-    echo "    --nocrc            : Don't calculate a CRC for archive"
-    echo "    --sha256           : Compute a SHA256 checksum for the archive"
-    echo "    --header file      : Specify location of the header script"
-    echo "    --cleanup file     : Specify a cleanup script that executes on interrupt and when finished successfully."
-    echo "    --follow           : Follow the symlinks in the archive"
-    echo "    --noprogress       : Do not show the progress during the decompression"
-    echo "    --nox11            : Disable automatic spawn of a xterm"
-    echo "    --nowait           : Do not wait for user input after executing embedded"
-    echo "                         program from an xterm"
-    echo "    --sign passphrase  : Signature private key to sign the package with"
-    echo "    --lsm file         : LSM file describing the package"
-    echo "    --license file     : Append a license file"
-    echo "    --help-header file : Add a header to the archive's --help output"
-    echo "    --packaging-date date"
-    echo "                       : Use provided string as the packaging date"
-    echo "                         instead of the current date."
-    echo
-    echo "    --keep-umask       : Keep the umask set to shell default, rather than overriding when executing self-extracting archive."
-    echo "    --export-conf      : Export configuration variables to startup_script"
-    echo
-    echo "Do not forget to give a fully qualified startup script name"
-    echo "(i.e. with a ./ prefix if inside the archive)."
-    exit 1
-}
-
-# Default settings
-if type gzip >/dev/null 2>&1; then
-    COMPRESS=gzip
-elif type compress >/dev/null 2>&1; then
-    COMPRESS=compress
-else
-    echo "ERROR: missing commands: gzip, compress" >&2
-    MS_Usage
-fi
-ENCRYPT=n
-PASSWD=""
-PASSWD_SRC=""
-OPENSSL_NO_MD=n
-COMPRESS_LEVEL=9
-DEFAULT_THREADS=123456 # Sentinel value
-THREADS=$DEFAULT_THREADS
-KEEP=n
-CURRENT=n
-NOX11=n
-NOWAIT=n
-APPEND=n
-TAR_QUIETLY=n
-KEEP_UMASK=n
-QUIET=n
-NOPROGRESS=n
-COPY=none
-NEED_ROOT=n
-TAR_ARGS=rvf
-TAR_FORMAT=ustar
-TAR_EXTRA=""
-GPG_EXTRA=""
-DU_ARGS=-ks
-HEADER=`dirname "$0"`/makeself-header.sh
-SIGNATURE=""
-TARGETDIR=""
-NOOVERWRITE=n
-DATE=`LC_ALL=C date`
-EXPORT_CONF=n
-SHA256=n
-OWNERSHIP=n
-SIGN=n
-GPG_PASSPHRASE=""
-
-# LSM file stuff
-LSM_CMD="echo No LSM. >> \"\$archname\""
-
-while true
-do
-    case "$1" in
-    --version | -v)
-	echo Makeself version $MS_VERSION
-	exit 0
-	;;
-    --pbzip2)
-	COMPRESS=pbzip2
-	shift
-	;;
-    --bzip3)
-	COMPRESS=bzip3
-	shift
-	;;
-    --bzip2)
-	COMPRESS=bzip2
-	shift
-	;;
-    --gzip)
-	COMPRESS=gzip
-	shift
-	;;
-    --pigz)
-    	COMPRESS=pigz
-    	shift
-    	;;
-    --zstd)
-    	COMPRESS=zstd
-    	shift
-    	;;
-    --xz)
-	COMPRESS=xz
-	shift
-	;;
-    --lzo)
-	COMPRESS=lzo
-	shift
-	;;
-    --lz4)
-	COMPRESS=lz4
-	shift
-	;;
-    --compress)
-	COMPRESS=compress
-	shift
-	;;
-    --base64)
-	COMPRESS=base64
-	shift
-	;;
-    --gpg-encrypt)
-	COMPRESS=gpg
-	shift
-	;;
-    --gpg-asymmetric-encrypt-sign)
-	COMPRESS=gpg-asymmetric
-	shift
-	;;
-    --gpg-extra)
-	GPG_EXTRA="$2"
-    shift 2 || { MS_Usage; exit 1; }
-	;;
-    --ssl-encrypt)
-	ENCRYPT=openssl
- 	shift
-	;;
-    --ssl-passwd)
-	PASSWD=$2
-    shift 2 || { MS_Usage; exit 1; }
-	;;
-    --ssl-pass-src)
-	PASSWD_SRC=$2
-    shift 2 || { MS_Usage; exit 1; }
-	;;
-    --ssl-no-md)
-	OPENSSL_NO_MD=y
-	shift
-	;;
-    --nocomp)
-	COMPRESS=none
-	shift
-	;;
-    --complevel)
-	COMPRESS_LEVEL="$2"
-    shift 2 || { MS_Usage; exit 1; }
-	;;
-    --threads)
-	THREADS="$2"
-    shift 2 || { MS_Usage; exit 1; }
-	;;
-    --nochown)
-	OWNERSHIP=n
-	shift
-	;;
-    --chown)
-	OWNERSHIP=y
-	shift
-	;;
-    --notemp)
-	KEEP=y
-	shift
-	;;
-    --copy)
-	COPY=copy
-	shift
-	;;
-    --current)
-	CURRENT=y
-	KEEP=y
-	shift
-	;;
-    --tar-format)
-	    TAR_FORMAT="$2"
-        shift 2 || { MS_Usage; exit 1; }
-    ;;
-    --tar-extra)
-	    TAR_EXTRA="$2"
-        shift 2 || { MS_Usage; exit 1; }
-    ;;
-    --untar-extra)
-        UNTAR_EXTRA="$2"
-        shift 2 || { MS_Usage; exit 1; }
-        ;;
-    --target)
-	  TARGETDIR="$2"
-	  KEEP=y
-    shift 2 || { MS_Usage; exit 1; }
- 	  ;;
-    --sign)
-    SIGN=y
-    GPG_PASSPHRASE="$2"
-    shift 2 || { MS_Usage; exit 1; }
-    ;;
-    --nooverwrite)
-        NOOVERWRITE=y
-	shift
-        ;;
-    --needroot)
-	NEED_ROOT=y
-	shift
-	;;
-    --header)
-	HEADER="$2"
-    shift 2 || { MS_Usage; exit 1; }
-	;;
-    --cleanup)
-    CLEANUP_SCRIPT="$2"
-    shift 2 || { MS_Usage; exit 1; }
-    ;;
-    --license)
-        # We need to escape all characters having a special meaning in double quotes
-        LICENSE=$(sed 's/\\/\\\\/g; s/"/\\\"/g; s/`/\\\`/g; s/\$/\\\$/g' "$2")
-        shift 2 || { MS_Usage; exit 1; }
-	;;
-    --follow)
-	TAR_ARGS=rvhf
-	DU_ARGS=-ksL
-	shift
-	;;
-    --noprogress)
-	NOPROGRESS=y
-	shift
-	;;
-    --nox11)
-	NOX11=y
-	shift
-	;;
-    --nowait)
-	NOWAIT=y
-	shift
-	;;
-    --nomd5)
-	NOMD5=y
-	shift
-	;;
-    --sha256)
-        SHA256=y
-        shift
-        ;;
-    --nocrc)
-	NOCRC=y
-	shift
-	;;
-    --append)
-	APPEND=y
-	shift
-	;;
-    --lsm)
-	LSM_CMD="awk 1 \"$2\" >> \"\$archname\""
-    shift 2 || { MS_Usage; exit 1; }
-	;;
-    --packaging-date)
-	DATE="$2"
-    shift 2 || { MS_Usage; exit 1; }
-        ;;
-    --help-header)
-	HELPHEADER=`sed -e "s/'/'\\\\\''/g" $2`
-    shift 2 || { MS_Usage; exit 1; }
-	[ -n "$HELPHEADER" ] && HELPHEADER="$HELPHEADER
-"
-    ;;
-    --tar-quietly)
-	TAR_QUIETLY=y
-	shift
-	;;
-	--keep-umask)
-	KEEP_UMASK=y
-	shift
-	;;
-    --export-conf)
-    EXPORT_CONF=y
-    shift
-    ;;
-    -q | --quiet)
-	QUIET=y
-	shift
-	;;
-    -h | --help)
-	MS_Usage
-	;;
-    -*)
-	echo Unrecognized flag : "$1"
-	MS_Usage
-	;;
-    *)
-	break
-	;;
-    esac
-done
-
-if test $# -lt 1; then
-	MS_Usage
-else
-	if test -d "$1"; then
-		archdir="$1"
-	else
-		echo "Directory $1 does not exist." >&2
-		exit 1
-	fi
-fi
-archname="$2"
-
-if test "$QUIET" = "y" || test "$TAR_QUIETLY" = "y"; then
-    if test "$TAR_ARGS" = "rvf"; then
-	    TAR_ARGS="rf"
-    elif test "$TAR_ARGS" = "rvhf"; then
-	    TAR_ARGS="rhf"
-    fi
-fi
-
-if test "$APPEND" = y; then
-    if test $# -lt 2; then
-    	MS_Usage
-    fi
-
-    # Gather the info from the original archive
-    OLDENV=`sh "$archname" --dumpconf`
-    if test $? -ne 0; then
-	    echo "Unable to update archive: $archname" >&2
-	    exit 1
-    else
-	    eval "$OLDENV"
-	    OLDSKIP=`expr $SKIP + 1`
-    fi
-else
-    if test "$KEEP" = n -a $# = 3; then
-	    echo "ERROR: Making a temporary archive with no embedded command does not make sense!" >&2
-    	echo >&2
-    	MS_Usage
-    fi
-    # We don't want to create an absolute directory unless a target directory is defined
-    if test "$CURRENT" = y; then
-	    archdirname="."
-    elif test x"$TARGETDIR" != x; then
-	    archdirname="$TARGETDIR"
-    else
-	    archdirname=`basename "$1"`
-    fi
-
-    if test $# -lt 3; then
-	    MS_Usage
-    fi
-
-    LABEL="$3"
-    SCRIPT="$4"
-    test "x$SCRIPT" = x || shift 1
-    shift 3
-    SCRIPTARGS="$*"
-fi
-
-if test "$KEEP" = n -a "$CURRENT" = y; then
-    echo "ERROR: It is A VERY DANGEROUS IDEA to try to combine --notemp and --current." >&2
-    exit 1
-fi
-
-case $COMPRESS in
-gzip)
-    GZIP_CMD="gzip -c$COMPRESS_LEVEL"
-    GUNZIP_CMD="gzip -cd"
-    ;;
-pigz) 
-    GZIP_CMD="pigz -$COMPRESS_LEVEL"
-    if test $THREADS -ne $DEFAULT_THREADS; then # Leave as the default if threads not indicated
-        GZIP_CMD="$GZIP_CMD --processes $THREADS"
-    fi
-    GUNZIP_CMD="gzip -cd"
-    ;;
-zstd)
-    GZIP_CMD="zstd -$COMPRESS_LEVEL"
-    if test $THREADS -ne $DEFAULT_THREADS; then # Leave as the default if threads not indicated
-        GZIP_CMD="$GZIP_CMD --threads=$THREADS"
-    fi
-    GUNZIP_CMD="zstd -cd"
-    ;;
-pbzip2)
-    GZIP_CMD="pbzip2 -c$COMPRESS_LEVEL"
-    if test $THREADS -ne $DEFAULT_THREADS; then # Leave as the default if threads not indicated
-        GZIP_CMD="$GZIP_CMD -p$THREADS"
-    fi
-    GUNZIP_CMD="bzip2 -d"
-    ;;
-bzip3)
-    # Map the compression level to a block size in MiB as 2^(level-1).
-    BZ3_COMPRESS_LEVEL=`echo "2^($COMPRESS_LEVEL-1)" | bc`
-    GZIP_CMD="bzip3 -b$BZ3_COMPRESS_LEVEL"
-    if test $THREADS -ne $DEFAULT_THREADS; then # Leave as the default if threads not indicated
-        GZIP_CMD="$GZIP_CMD -j$THREADS"
-    fi
-    JOBS=`echo "10-$COMPRESS_LEVEL" | bc`
-    GUNZIP_CMD="bzip3 -dj$JOBS"
-    ;;
-bzip2)
-    GZIP_CMD="bzip2 -$COMPRESS_LEVEL"
-    GUNZIP_CMD="bzip2 -d"
-    ;;
-xz)
-    GZIP_CMD="xz -c$COMPRESS_LEVEL"
-    # Must opt-in by specifying a value since not all versions of xz support threads
-    if test $THREADS -ne $DEFAULT_THREADS; then 
-        GZIP_CMD="$GZIP_CMD --threads=$THREADS"
-    fi
-    GUNZIP_CMD="xz -d"
-    ;;
-lzo)
-    GZIP_CMD="lzop -c$COMPRESS_LEVEL"
-    GUNZIP_CMD="lzop -d"
-    ;;
-lz4)
-    GZIP_CMD="lz4 -c$COMPRESS_LEVEL"
-    GUNZIP_CMD="lz4 -d"
-    ;;
-base64)
-    GZIP_CMD="base64"
-    GUNZIP_CMD="base64 --decode -i -"
-    ;;
-gpg)
-    GZIP_CMD="gpg $GPG_EXTRA -ac -z$COMPRESS_LEVEL"
-    GUNZIP_CMD="gpg -d"
-    ENCRYPT="gpg"
-    ;;
-gpg-asymmetric)
-    GZIP_CMD="gpg $GPG_EXTRA -z$COMPRESS_LEVEL -es"
-    GUNZIP_CMD="gpg --yes -d"
-    ENCRYPT="gpg"
-    ;;
-compress)
-    GZIP_CMD="compress -fc"
-    GUNZIP_CMD="(type compress >/dev/null 2>&1 && compress -fcd || gzip -cd)"
-    ;;
-none)
-    GZIP_CMD="cat"
-    GUNZIP_CMD="cat"
-    ;;
-esac
-
-if test x"$ENCRYPT" = x"openssl"; then
-    if test x"$APPEND" = x"y"; then
-        echo "Appending to existing archive is not compatible with OpenSSL encryption." >&2
-    fi
-    
-    ENCRYPT_CMD="openssl enc -aes-256-cbc -salt"
-    DECRYPT_CMD="openssl enc -aes-256-cbc -d"
-    
-    if test x"$OPENSSL_NO_MD" != x"y"; then
-        ENCRYPT_CMD="$ENCRYPT_CMD -md sha256"
-        DECRYPT_CMD="$DECRYPT_CMD -md sha256"
-    fi
-
-    if test -n "$PASSWD_SRC"; then
-        ENCRYPT_CMD="$ENCRYPT_CMD -pass $PASSWD_SRC"
-    elif test -n "$PASSWD"; then 
-        ENCRYPT_CMD="$ENCRYPT_CMD -pass pass:$PASSWD"
-    fi
-fi
-
-tmpfile="${TMPDIR:-/tmp}/mkself$$"
-
-if test -f "$HEADER"; then
-	oldarchname="$archname"
-	archname="$tmpfile"
-	# Generate a fake header to count its lines
-	SKIP=0
-	. "$HEADER"
-	SKIP=`cat "$tmpfile" |wc -l`
-	# Get rid of any spaces
-	SKIP=`expr $SKIP`
-	rm -f "$tmpfile"
-	if test "$QUIET" = "n"; then
-		echo "Header is $SKIP lines long" >&2
-	fi
-	archname="$oldarchname"
-else
-    echo "Unable to open header file: $HEADER" >&2
-    exit 1
-fi
-
-if test "$QUIET" = "n"; then
-    echo
-fi
-
-if test "$APPEND" = n; then
-    if test -f "$archname"; then
-		echo "WARNING: Overwriting existing file: $archname" >&2
-    fi
-fi
-
-USIZE=`du $DU_ARGS "$archdir" | awk '{print $1}'`
-
-if test "." = "$archdirname"; then
-	if test "$KEEP" = n; then
-		archdirname="makeself-$$-`date +%Y%m%d%H%M%S`"
-	fi
-fi
-
-test -d "$archdir" || { echo "Error: $archdir does not exist."; rm -f "$tmpfile"; exit 1; }
-if test "$QUIET" = "n"; then
-   echo "About to compress $USIZE KB of data..."
-   echo "Adding files to archive named \"$archname\"..."
-fi
-
-# See if we have GNU tar
-TAR=`exec <&- 2>&-; which gtar || command -v gtar || type gtar`
-test -x "$TAR" || TAR=`exec <&- 2>&-; which bsdtar || command -v bsdtar || type bsdtar`
-test -x "$TAR" || TAR=tar
-
-tmparch="${TMPDIR:-/tmp}/mkself$$.tar"
-(
-    if test "$APPEND" = "y"; then
-        tail -n "+$OLDSKIP" "$archname" | eval "$GUNZIP_CMD" > "$tmparch"
-    fi
-    cd "$archdir"
-    # "Determining if a directory is empty"
-    # https://www.etalabs.net/sh_tricks.html
-    find . \
-        \( \
-        ! -type d \
-        -o \
-        \( -links 2 -exec sh -c '
-            is_empty () (
-                cd "$1"
-                set -- .[!.]* ; test -f "$1" && return 1
-                set -- ..?* ; test -f "$1" && return 1
-                set -- * ; test -f "$1" && return 1
-                return 0
-            )
-            is_empty "$0"' {} \; \
-        \) \
-        \) -print \
-        | LC_ALL=C sort \
-        | sed 's/./\\&/g' \
-        | xargs $TAR $TAR_EXTRA --format $TAR_FORMAT -$TAR_ARGS "$tmparch"
-) || {
-    echo "ERROR: failed to create temporary archive: $tmparch"
-    rm -f "$tmparch" "$tmpfile"
-    exit 1
-}
-
-USIZE=`du $DU_ARGS "$tmparch" | awk '{print $1}'`
-
-eval "$GZIP_CMD" <"$tmparch" >"$tmpfile" || {
-    echo "ERROR: failed to create temporary file: $tmpfile"
-    rm -f "$tmparch" "$tmpfile"
-    exit 1
-}
-rm -f "$tmparch"
-
-if test x"$ENCRYPT" = x"openssl"; then
-    echo "About to encrypt archive \"$archname\"..."
-    { eval "$ENCRYPT_CMD -in $tmpfile -out ${tmpfile}.enc" && mv -f ${tmpfile}.enc $tmpfile; } || \
-        { echo Aborting: could not encrypt temporary file: "$tmpfile".; rm -f "$tmpfile"; exit 1; }
-fi
-
-fsize=`cat "$tmpfile" | wc -c | tr -d " "`
-
-# Compute the checksums
-
-shasum=0000000000000000000000000000000000000000000000000000000000000000
-md5sum=00000000000000000000000000000000
-crcsum=0000000000
-
-if test "$NOCRC" = y; then
-	if test "$QUIET" = "n"; then
-		echo "skipping crc at user request"
-	fi
-else
-	crcsum=`CMD_ENV=xpg4 cksum < "$tmpfile" | sed -e 's/ /Z/' -e 's/	/Z/' | cut -dZ -f1`
-	if test "$QUIET" = "n"; then
-		echo "CRC: $crcsum"
-	fi
-fi
-
-if test "$SHA256" = y; then
-	SHA_PATH=`exec <&- 2>&-; which shasum || command -v shasum || type shasum`
-	if test -x "$SHA_PATH"; then
-		shasum=`eval "$SHA_PATH -a 256" < "$tmpfile" | cut -b-64`
-	else
-		SHA_PATH=`exec <&- 2>&-; which sha256sum || command -v sha256sum || type sha256sum`
-		shasum=`eval "$SHA_PATH" < "$tmpfile" | cut -b-64`
-	fi
-	if test "$QUIET" = "n"; then
-		if test -x "$SHA_PATH"; then
-			echo "SHA256: $shasum"
-		else
-			echo "SHA256: none, SHA command not found"
-		fi
-	fi
-fi
-if test "$NOMD5" = y; then
-	if test "$QUIET" = "n"; then
-		echo "Skipping md5sum at user request"
-	fi
-else
-	# Try to locate a MD5 binary
-	OLD_PATH=$PATH
-	PATH=${GUESS_MD5_PATH:-"$OLD_PATH:/bin:/usr/bin:/sbin:/usr/local/ssl/bin:/usr/local/bin:/opt/openssl/bin"}
-	MD5_ARG=""
-	MD5_PATH=`exec <&- 2>&-; which md5sum || command -v md5sum || type md5sum`
-	test -x "$MD5_PATH" || MD5_PATH=`exec <&- 2>&-; which md5 || command -v md5 || type md5`
-	test -x "$MD5_PATH" || MD5_PATH=`exec <&- 2>&-; which digest || command -v digest || type digest`
-	PATH=$OLD_PATH
-	if test -x "$MD5_PATH"; then
-		if test `basename ${MD5_PATH}`x = digestx; then
-			MD5_ARG="-a md5"
-		fi
-		md5sum=`eval "$MD5_PATH $MD5_ARG" < "$tmpfile" | cut -b-32`
-		if test "$QUIET" = "n"; then
-			echo "MD5: $md5sum"
-		fi
-	else
-		if test "$QUIET" = "n"; then
-			echo "MD5: none, MD5 command not found"
-		fi
-	fi
-fi
-if test "$SIGN" = y; then
-    GPG_PATH=`exec <&- 2>&-; which gpg || command -v gpg || type gpg`
-    if test -x "$GPG_PATH"; then
-        SIGNATURE=`$GPG_PATH --pinentry-mode=loopback --batch --yes $GPG_EXTRA --passphrase "$GPG_PASSPHRASE" --output - --detach-sig $tmpfile | base64 | tr -d \\\\n`
-        if test "$QUIET" = "n"; then
-            echo "Signature: $SIGNATURE"
-        fi
-    else
-        echo "Missing gpg command" >&2
-    fi
-fi
-
-totalsize=0
-for size in $fsize;
-do
-    totalsize=`expr $totalsize + $size`
-done
-
-if test "$APPEND" = y; then
-    mv "$archname" "$archname".bak || exit
-
-    # Prepare entry for new archive
-    filesizes="$fsize"
-    CRCsum="$crcsum"
-    MD5sum="$md5sum"
-    SHAsum="$shasum"
-    Signature="$SIGNATURE"
-    # Generate the header
-    . "$HEADER"
-    # Append the new data
-    cat "$tmpfile" >> "$archname"
-
-    chmod +x "$archname"
-    rm -f "$archname".bak
-    if test "$QUIET" = "n"; then
-    	echo "Self-extractable archive \"$archname\" successfully updated."
-    fi
-else
-    filesizes="$fsize"
-    CRCsum="$crcsum"
-    MD5sum="$md5sum"
-    SHAsum="$shasum"
-    Signature="$SIGNATURE"
-
-    # Generate the header
-    . "$HEADER"
-
-    # Append the compressed tar data after the stub
-    if test "$QUIET" = "n"; then
-    	echo
-    fi
-    cat "$tmpfile" >> "$archname"
-    chmod +x "$archname"
-    if test "$QUIET" = "n"; then
-    	echo Self-extractable archive \"$archname\" successfully created.
-    fi
-fi
-rm -f "$tmpfile"
Author	SHA1	Message	Date
AuxXxilium	47020c7e56	Merge pull request #4661 from AuxXxilium/dev Dev	2024-11-13 23:54:00 +01:00
AuxXxilium	7e5242349c	Merge pull request #4636 from AuxXxilium/dev arc-functions: fix loop	2024-11-13 00:39:22 +01:00
AuxXxilium	cd40c45fa4	Merge pull request #4630 from AuxXxilium/dev build: update	2024-11-12 17:02:32 +01:00
AuxXxilium	62e4b267de	Merge pull request #4629 from AuxXxilium/dev build: fix	2024-11-12 16:51:32 +01:00
AuxXxilium	a2c196f453	Merge pull request #4627 from AuxXxilium/dev functions: more...	2024-11-12 16:11:25 +01:00
AuxXxilium	5e21346aba	Merge pull request #4626 from AuxXxilium/dev Dev	2024-11-12 16:04:52 +01:00
AuxXxilium	7f6b276a59	Merge pull request #4565 from AuxXxilium/dev arc-functions: make hwid unique	2024-11-10 18:46:14 +01:00
AuxXxilium	23ba1abd70	Merge pull request #4563 from AuxXxilium/dev Dev	2024-11-10 18:36:00 +01:00
AuxXxilium	d53d454828	Merge pull request #4553 from AuxXxilium/dev build: update	2024-11-10 11:10:10 +01:00