Merge pull request #5701 from AuxXxilium/dev

Dev

.github/workflows/autobuild.yml

@@ -1,274 +0,0 @@
-#
-# Copyright (C) 2024 AuxXxilium <https://github.com/AuxXxilium>
-#
-# This is free software, licensed under the MIT License.
-# See /LICENSE for more information.
-#
-
-name: Build Arc Image Development
-
-on:
-  workflow_dispatch:
-    inputs:
-      runs:
-        description: "runs-on"
-        type: choice
-        options:
-          - ubuntu-latest
-          - self-hosted
-      version:
-        description: "version (1.0.0)"
-        required: true
-        type: string
-      next:
-        description: "next"
-        default: true
-        type: boolean
-      stable:
-        description: "stable"
-        default: true
-        type: boolean
-
-jobs:
-  build:
-    runs-on: ${{ inputs.runs }}
-    steps:
-      - name: Checkout
-        uses: actions/checkout@main
-
-      # Install Dependencies
-      - name: Install Dependencies
-        if: ${{ inputs.runs == 'ubuntu-latest' }}
-        run: |
-          git config --global user.email "info@auxxxilium.tech"
-          git config --global user.name "AuxXxilium"
-          sudo timedatectl set-timezone "Europe/Berlin"
-
-          sudo apt update
-          sudo apt install -y locales busybox dialog gettext sed gawk jq curl 
-          sudo apt install -y python-is-python3 python3-pip libelf-dev qemu-utils cpio xz-utils lz4 lzma bzip2 gzip zstd
-          # sudo snap install yq
-          if ! command -v yq &>/dev/null || ! yq --version 2>/dev/null | grep -q "v4."; then
-            sudo curl -kL https://github.com/mikefarah/yq/releases/latest/download/yq_linux_amd64 -o /usr/bin/yq && sudo chmod a+x /usr/bin/yq
-          fi
-
-          df -h
-
-      # Get extractor, LKM, Addons, Modules, Theme and Configs
-      - name: Get Buildroot
-        run: |
-          . scripts/func.sh "${{ secrets.BUILD_TOKEN }}"
-
-          echo "Get Dependencies"
-          getAddons "files/p3/addons"
-          getModules "files/p3/modules"
-          getConfigs "files/p3/configs"
-          getPatches "files/p3/patches"
-          getCustom "files/p3/custom"
-          getOffline "files/p3/configs"
-          getLKMs "files/p3/lkms"
-          getTheme "files/p1/boot/grub"
-
-          # Export Dependencies Version to env
-          echo "ADDONTAG=${ADDONTAG}" >> $GITHUB_ENV
-          echo "MODULETAG=${MODULETAG}" >> $GITHUB_ENV
-          echo "CONFIGTAG=${CONFIGTAG}" >> $GITHUB_ENV
-          echo "PATCHTAG=${PATCHTAG}" >> $GITHUB_ENV
-          echo "CUSTOMTAG=${CUSTOMTAG}" >> $GITHUB_ENV
-          echo "LKMTAG=${LKMTAG}" >> $GITHUB_ENV
-          echo "THEMETAG=${THEMETAG}" >> $GITHUB_ENV
-          echo "BRXTAG=${BRXTAG}" >> $GITHUB_ENV
-          echo "BRSTAG=${BRSTAG}" >> $GITHUB_ENV
-          echo "BUILD_TIME=$(date +'%Y-%m-%d %H:%M')" >> $GITHUB_ENV
-
-          echo "OK"
-
-       # Build incremental
-      - name: Build Next Image
-        if: ${{ inputs.next == true }}
-        run: |
-          . scripts/func.sh
-
-          getBuildrootx "brx"
-
-          # Modify Source File
-          ARC_BUILD="`date +'%y%m%d'`"
-          ARC_VERSION="${{ inputs.version }}-dev"
-          ARC_BRANCH="next"
-          echo "${ARC_BUILD}" >files/p1/ARC-BUILD
-          echo "${ARC_VERSION}" >files/p1/ARC-VERSION
-          echo "${ARC_BRANCH}" >files/p1/ARC-BRANCH
-          echo "ARC_BUILD=${ARC_BUILD}" >> $GITHUB_ENV
-          echo "ARC_VERSION=${ARC_VERSION}" >> $GITHUB_ENV
-          echo "ARC_BRANCH=${ARC_BRANCH}" >> $GITHUB_ENV
-
-          echo "Create Arc Image"
-          IMAGE_FILE="arc.img"
-          gzip -dc "files/initrd/opt/arc/grub.img.gz" >"${IMAGE_FILE}"
-          fdisk -l "${IMAGE_FILE}"
-          
-          LOOPX=$(sudo losetup -f)
-          sudo losetup -P "${LOOPX}" "${IMAGE_FILE}"
-
-          echo "Mounting Image File"
-          mkdir -p "/tmp/p1"
-          mkdir -p "/tmp/p3"
-          sudo mount ${LOOPX}p1 "/tmp/p1"
-          sudo mount ${LOOPX}p3 "/tmp/p3"
-
-          [ ! -f "brx/bzImage-arc" ] || [ ! -f "brx/initrd-arc" ] && return 1
-          
-          echo "Repack initrd"
-          cp -f "brx/bzImage-arc" "files/p3/bzImage-arc"
-          createArc
-          repackInitrd "brx/initrd-arc" "files/initrd" "files/p3/initrd-arc"
-
-          echo "Copying files"
-          sudo cp -rf "files/p1/"* "/tmp/p1"
-          sudo cp -rf "files/p3/"* "/tmp/p3"
-          sudo sync
-
-          echo "Unmount image file"
-          sudo umount "/tmp/p1"
-          sudo umount "/tmp/p3"
-          rmdir "/tmp/p1"
-          rmdir "/tmp/p3"
-
-          sudo losetup --detach ${LOOPX}
-
-          echo "Image Converter"
-          qemu-img convert -p -f raw -O vmdk ${IMAGE_FILE} arc-dyn.vmdk
-          qemu-img convert -p -f raw -o subformat=monolithicFlat -O vmdk ${IMAGE_FILE} arc.vmdk
-
-          echo "Create Arc vhd"
-          createvmc "arc.vmc"
-          qemu-img convert -p -f raw -O vpc ${IMAGE_FILE} arc.vhd
-
-          echo "Create Arc ova"
-          convertova "${IMAGE_FILE}" "arc.ova"
-
-      # Zip image and generate checksum
-      - name: Pack Next Image
-        if: ${{ inputs.next == true }}
-        run: |
-          if [ -n "${{ env.ARC_VERSION }}" ]; then
-            zip -9 "arc-${{ env.ARC_VERSION }}-${{ env.ARC_BRANCH }}.img.zip" arc.img
-            zip -9 "arc-${{ env.ARC_VERSION }}-${{ env.ARC_BRANCH }}.vmdk-dyn.zip" arc-dyn.vmdk
-            zip -9 "arc-${{ env.ARC_VERSION }}-${{ env.ARC_BRANCH }}.vmdk-flat.zip" arc.vmdk arc-flat.vmdk
-            zip -9 "arc-${{ env.ARC_VERSION }}-${{ env.ARC_BRANCH }}.vhdx.zip" arc.vhdx
-            (cd files && zip -r ../update-${{ env.ARC_VERSION }}-${{ env.ARC_BRANCH }}.zip ./p1 ./p3)
-          fi
-
-      # Cleanup
-      - name: Cleanup
-        run: |
-          rm -rf "arc.img" "arc.vmdk" "arc-dyn.vmdk" "arc-flat.vmdk" "arc.vhd" "arc.ova" "arc.vmc"
-
-       # Build incremental
-      - name: Build Stable Image
-        if: ${{ inputs.stable }}
-        run: |
-          . scripts/func.sh
-
-          getBuildroots "brs"
-
-          # Modify Source File
-          ARC_BUILD="`date +'%y%m%d'`"
-          ARC_VERSION="${{ inputs.version }}-dev"
-          ARC_BRANCH="stable"
-          echo "${ARC_BUILD}" >files/p1/ARC-BUILD
-          echo "${ARC_VERSION}" >files/p1/ARC-VERSION
-          echo "${ARC_BRANCH}" >files/p1/ARC-BRANCH
-          echo "ARC_BUILD=${ARC_BUILD}" >> $GITHUB_ENV
-          echo "ARC_VERSION=${ARC_VERSION}" >> $GITHUB_ENV
-          echo "ARC_BRANCH=${ARC_BRANCH}" >> $GITHUB_ENV
-
-          echo "Create Arc Image"
-          IMAGE_FILE="arc.img"
-          gzip -dc "files/initrd/opt/arc/grub.img.gz" >"${IMAGE_FILE}"
-          fdisk -l "${IMAGE_FILE}"
-          
-          LOOPX=$(sudo losetup -f)
-          sudo losetup -P "${LOOPX}" "${IMAGE_FILE}"
-
-          echo "Mounting Image File"
-          mkdir -p "/tmp/p1"
-          mkdir -p "/tmp/p3"
-          sudo mount ${LOOPX}p1 "/tmp/p1"
-          sudo mount ${LOOPX}p3 "/tmp/p3"
-
-          [ ! -f "brs/bzImage-arc" ] || [ ! -f "brs/initrd-arc" ] && return 1
-          
-          echo "Repack initrd"
-          cp -f "brs/bzImage-arc" "files/p3/bzImage-arc"
-          createArc
-          repackInitrd "brs/initrd-arc" "files/initrd" "files/p3/initrd-arc"
-
-          echo "Copying files"
-          sudo cp -rf "files/p1/"* "/tmp/p1"
-          sudo cp -rf "files/p3/"* "/tmp/p3"
-          sudo sync
-
-          echo "Unmount image file"
-          sudo umount "/tmp/p1"
-          sudo umount "/tmp/p3"
-          rmdir "/tmp/p1"
-          rmdir "/tmp/p3"
-
-          sudo losetup --detach ${LOOPX}
-
-          echo "Image Converter"
-          qemu-img convert -p -f raw -O vmdk ${IMAGE_FILE} arc-dyn.vmdk
-          qemu-img convert -p -f raw -o subformat=monolithicFlat -O vmdk ${IMAGE_FILE} arc.vmdk
-
-          echo "Create Arc vhd"
-          createvmc "arc.vmc"
-          qemu-img convert -p -f raw -O vpc ${IMAGE_FILE} arc.vhd
-
-          echo "Create Arc ova"
-          convertova "${IMAGE_FILE}" "arc.ova"
-
-      # Zip image and generate checksum
-      - name: Pack Stable Image
-        if: ${{ inputs.stable }}
-        run: |
-          if [ -n "${{ env.ARC_VERSION }}" ]; then
-            zip -9 "arc-${{ env.ARC_VERSION }}-${{ env.ARC_BRANCH }}.img.zip" arc.img
-            zip -9 "arc-${{ env.ARC_VERSION }}-${{ env.ARC_BRANCH }}.vmdk-dyn.zip" arc-dyn.vmdk
-            zip -9 "arc-${{ env.ARC_VERSION }}-${{ env.ARC_BRANCH }}.vmdk-flat.zip" arc.vmdk arc-flat.vmdk
-            zip -9 "arc-${{ env.ARC_VERSION }}-${{ env.ARC_BRANCH }}.vhdx.zip" arc.vhdx
-            (cd files && zip -r ../update-${{ env.ARC_VERSION }}-${{ env.ARC_BRANCH }}.zip ./p1 ./p3)
-          fi
-
-      # Publish a release if is a tag
-      - name: Release
-        if: success() && env.ARC_VERSION != ''
-        uses: ncipollo/release-action@v1
-        with:
-          tag: ${{ env.ARC_VERSION }}
-          prerelease: true
-          makeLatest: false
-          allowUpdates: true
-          body: |
-            ### Note:
-              - Development Build
-
-            ### Information:
-              - Full Changelog is available in my Discord
-              - Discord Account for Arc Patch needed
-
-            ### Dependencies:
-              - Addons: ${{ env.ADDONTAG }}
-              - Modules: ${{ env.MODULETAG }}
-              - Configs: ${{ env.CONFIGTAG }}
-              - Patches: ${{ env.PATCHTAG }}
-              - Custom: ${{ env.CUSTOMTAG }}
-              - LKMs: ${{ env.LKMTAG }}
-              - Buildroot Stable: ${{ env.BRSTAG }}
-              - Buildroot Next: ${{ env.BRXTAG }}
-
-            ### Release
-              - ${{ env.BUILD_TIME }}
-          artifacts: |
-            arc-*.zip
-            update-*.zip

.github/workflows/build.yml

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2024 AuxXxilium <https://github.com/AuxXxilium>
+# Copyright (C) 2025 AuxXxilium <https://github.com/AuxXxilium>
 #
 # This is free software, licensed under the MIT License.
 # See /LICENSE for more information.
@@ -32,13 +32,13 @@ on:
         description: "pre release"
         default: false
         type: boolean
-      next:
-        description: "next"
+      minimal:
+        description: "minimal"
         default: true
         type: boolean
-      stable:
-        description: "stable"
-        default: true
+      extended:
+        description: "extended"
+        default: false
         type: boolean
       clean:
         description: "clean"
@@ -96,7 +96,6 @@ jobs:
           getTheme "files/p1/boot/grub"
           getBuildrootx "brx" 
           getBuildroots "brs"
-          cp -f "files/initrd/opt/arc/grub.img.gz" "grub.img.gz"
 
           # Export Dependencies Version to env
           echo "ADDONTAG=${ADDONTAG}" >> $GITHUB_ENV
@@ -113,15 +112,15 @@ jobs:
           echo "OK"
 
        # Build incremental
-      - name: Build Next Image
-        if: ${{ inputs.next }}
+      - name: Build extended Image
+        if: ${{ inputs.extended }}
         run: |
           . scripts/func.sh
 
           # Modify Source File
           ARC_BUILD="`date +'%y%m%d'`"
           ARC_VERSION="${{ inputs.version }}"
-          ARC_BRANCH="next"
+          ARC_BRANCH="extended"
           echo "${ARC_BUILD}" >files/p1/ARC-BUILD
           echo "${ARC_VERSION}" >files/p1/ARC-VERSION
           echo "${ARC_BRANCH}" >files/p1/ARC-BRANCH
@@ -130,9 +129,8 @@ jobs:
           echo "ARC_BRANCH=${ARC_BRANCH}" >> $GITHUB_ENV
 
           echo "Create Arc Image"
-          IMAGE_FILE="arc.img"
-          cp -f "grub.img.gz" "files/initrd/opt/arc/grub.img.gz"
-          gzip -dc "files/initrd/opt/arc/grub.img.gz" >"${IMAGE_FILE}"
+          IMAGE_FILE="arc_create.img"
+          gzip -dc "grub.img.gz" >"${IMAGE_FILE}"
           fdisk -l "${IMAGE_FILE}"
           
           LOOPX=$(sudo losetup -f)
@@ -148,7 +146,6 @@ jobs:
           
           echo "Repack initrd"
           cp -f "brx/bzImage-arc" "files/p3/bzImage-arc"
-          createArc
           repackInitrd "brx/initrd-arc" "files/initrd" "files/p3/initrd-arc"
 
           echo "Copying files"
@@ -164,7 +161,12 @@ jobs:
 
           sudo losetup --detach ${LOOPX}
 
+          # Resize Image
+          resizeImg "${IMAGE_FILE}" "+1024M" "arc.img" 2>/dev/null
+          rm -f "${IMAGE_FILE}"
+
           echo "Image Converter"
+          IMAGE_FILE="arc.img"
           qemu-img convert -p -f raw -O vmdk ${IMAGE_FILE} arc-dyn.vmdk
           qemu-img convert -p -f raw -o subformat=monolithicFlat -O vmdk ${IMAGE_FILE} arc.vmdk
 
@@ -176,8 +178,8 @@ jobs:
           convertova "${IMAGE_FILE}" "arc.ova"
 
       # Zip image and generate checksum
-      - name: Pack Next Image
-        if: ${{ inputs.next }}
+      - name: Pack extended Image
+        if: ${{ inputs.extended }}
         run: |
           if [ -n "${{ env.ARC_VERSION }}" ]; then
             zip -9 "arc-${{ env.ARC_VERSION }}-${{ env.ARC_BRANCH }}.img.zip" arc.img
@@ -192,18 +194,18 @@ 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-flat.vmdk" "arc.vhd" "arc.ova" "arc.vmc" 2>/dev/null
 
        # Build incremental
-      - name: Build Stable Image
-        if: ${{ inputs.stable }}
+      - name: Build minimal Image
+        if: ${{ inputs.minimal }}
         run: |
           . scripts/func.sh
 
           # Modify Source File
           ARC_BUILD="`date +'%y%m%d'`"
           ARC_VERSION="${{ inputs.version }}"
-          ARC_BRANCH="stable"
+          ARC_BRANCH="minimal"
           echo "${ARC_BUILD}" >files/p1/ARC-BUILD
           echo "${ARC_VERSION}" >files/p1/ARC-VERSION
           echo "${ARC_BRANCH}" >files/p1/ARC-BRANCH
@@ -212,9 +214,8 @@ jobs:
           echo "ARC_BRANCH=${ARC_BRANCH}" >> $GITHUB_ENV
 
           echo "Create Arc Image"
-          IMAGE_FILE="arc.img"
-          cp -f "grub.img.gz" "files/initrd/opt/arc/grub.img.gz"
-          gzip -dc "files/initrd/opt/arc/grub.img.gz" >"${IMAGE_FILE}"
+          IMAGE_FILE="arc_create.img"
+          gzip -dc "grub.img.gz" >"${IMAGE_FILE}"
           fdisk -l "${IMAGE_FILE}"
           
           LOOPX=$(sudo losetup -f)
@@ -230,7 +231,6 @@ jobs:
           
           echo "Repack initrd"
           cp -f "brs/bzImage-arc" "files/p3/bzImage-arc"
-          createArc
           repackInitrd "brs/initrd-arc" "files/initrd" "files/p3/initrd-arc"
 
           echo "Copying files"
@@ -246,7 +246,12 @@ jobs:
 
           sudo losetup --detach ${LOOPX}
 
+          # Resize Image
+          resizeImg "${IMAGE_FILE}" "+1024M" "arc.img" 2>/dev/null
+          rm -f "${IMAGE_FILE}"
+
           echo "Image Converter"
+          IMAGE_FILE="arc.img"
           qemu-img convert -p -f raw -O vmdk ${IMAGE_FILE} arc-dyn.vmdk
           qemu-img convert -p -f raw -o subformat=monolithicFlat -O vmdk ${IMAGE_FILE} arc.vmdk
 
@@ -258,8 +263,8 @@ jobs:
           convertova "${IMAGE_FILE}" "arc.ova"
 
       # Zip image and generate checksum
-      - name: Pack Stable Image
-        if: ${{ inputs.stable }}
+      - name: Pack minimal Image
+        if: ${{ inputs.minimal }}
         run: |
           if [ -n "${{ env.ARC_VERSION }}" ]; then
             zip -9 "arc-${{ env.ARC_VERSION }}-${{ env.ARC_BRANCH }}.img.zip" arc.img
@@ -289,8 +294,8 @@ jobs:
               - Discord Account for Arc Patch needed
 
             ### Versions:
-              ${{ inputs.stable && '- Stable: Full Image, all dependencies are included, reduced hardware support (if there is a Next image)' || '' }}
-              ${{ inputs.next && '- Next: Full Image, all dependencies are included, more hardware support, new features to test' || '' }}
+              ${{ inputs.minimal && '- minimal: Full Image, all dependencies are included (reduced size, faster boot)' || '' }}
+              ${{ inputs.extended && '- extended: Full Image, all dependencies are included (new features to test)' || '' }}
 
             ### Dependencies:
               - Addons: ${{ env.ADDONTAG }}
@@ -299,11 +304,12 @@ jobs:
               - Patches: ${{ env.PATCHTAG }}
               - Custom: ${{ env.CUSTOMTAG }}
               - LKMs: ${{ env.LKMTAG }}
-              ${{ inputs.stable && format('- Buildroot Stable: {0}', env.BRSTAG) || '' }}
-              ${{ inputs.next && format('- Buildroot Next: {0}', env.BRXTAG) || '' }}
+              ${{ inputs.minimal && format('- Buildroot minimal: {0}', env.BRSTAG) || '' }}
+              ${{ inputs.extended && format('- Buildroot extended: {0}', env.BRXTAG) || '' }}
 
             ### Release
               - ${{ env.BUILD_TIME }}
           artifacts: |
             arc-*.zip
             update-*.zip
+            update-*.hash

.github/workflows/grub.yml

@@ -33,15 +33,13 @@ jobs:
 
       - name: Make Grub
         run: |
-          . scripts/grub.sh "grub-2.12" "i386-pc i386-efi x86_64-efi"
+          rm -f grub.img.gz
+          . scripts/grub.sh "grub-2.12" "i386-pc i386-efi x86_64-efi" "ARC"
 
       - name: Check and Push
         if: success() && inputs.push == true
         run: |
           if [ -f "grub.img.gz" ]; then
-            echo "Copy img ..."
-            mv -f grub.img.gz files/initrd/opt/arc/grub.img.gz
-
             echo "Git push ..."
             git pull
             status=$(git status -s | grep -E 'grub.img.gz' | awk '{printf " %s", $2}')

Taskfile.yaml

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

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

@@ -91,6 +91,7 @@ function addonSelection() {
 ###############################################################################
 # Permit user select the modules to include
 function modulesMenu() {
+  NEXT="1"
   PRODUCTVER="$(readConfigKey "productver" "${USER_CONFIG_FILE}")"
   PLATFORM="$(readConfigKey "platform" "${USER_CONFIG_FILE}")"
   KVER="$(readConfigKey "platforms.${PLATFORM}.productvers.\"${PRODUCTVER}\".kver" "${P_FILE}")"
@@ -821,15 +822,20 @@ function backupMenu() {
         (
           mkdir -p "${TMP_PATH}/mdX"
           for I in ${DSMROOTS}; do
-            # fixDSMRootPart "${I}"
-            mount -t ext4 "${I}" "${TMP_PATH}/mdX"
-            [ $? -ne 0 ] && continue
-            if [ -f "${PART2_PATH}/machine.key" ]; then
-              cp -f "${PART2_PATH}/machine.key" "${TMP_PATH}/mdX/usr/arc/backup/p2/machine.key"
-              BACKUPKEY="true"
-              sync
-            fi
-            umount "${TMP_PATH}/mdX"
+            while true; do
+              # fixDSMRootPart "${I}"
+              mount -t ext4 "${I}" "${TMP_PATH}/mdX"
+              if [ -f "${PART2_PATH}/machine.key" ]; then
+                mkdir -p "${TMP_PATH}/mdX/usr/arc/backup/p2"
+                cp -f "${PART2_PATH}/machine.key" "${TMP_PATH}/mdX/usr/arc/backup/p2/machine.key"
+                if [ -f "${TMP_PATH}/mdX/usr/arc/backup/p2/machine.key" ]; then
+                  BACKUPKEY="true"
+                  sync
+                  break
+                fi
+              fi
+              umount "${TMP_PATH}/mdX"
+            done
           done
           rm -rf "${TMP_PATH}/mdX" >/dev/null
         ) 2>&1 | dialog --backtitle "$(backtitle)" --title "Backup Encrytion Key" \
@@ -897,8 +903,8 @@ function updateMenu() {
   while true; do
     dialog --backtitle "$(backtitle)" --title "Update" --colors --cancel-label "Exit" \
       --menu "Choose an Option" 0 0 0 \
-      1 "Update Loader \Z1(no reflash)\Zn" \
-      2 "Update Dependencies" \
+      1 "Update Full Loader \Z1(no reflash)\Zn" \
+      2 "Update Dependencies (only integrated Parts)" \
       3 "Update Configs and Arc Patch" \
       4 "Switch Arc Branch: \Z1${ARC_BRANCH}\Zn" \
       2>"${TMP_PATH}/resp"
@@ -936,16 +942,16 @@ function updateMenu() {
       4)
         dialog --backtitle "$(backtitle)" --title "Switch Arc Branch" \
           --menu "Choose a Branch" 0 0 0 \
-          1 "stable - Less Hardware support / faster Boot" \
-          2 "next - More Hardware support / slower Boot" \
+          1 "minimal - reduced size and faster boot" \
+          2 "extended - new features to test" \
           3 "dev - Development only" \
           2>"${TMP_PATH}/opts"
         [ $? -ne 0 ] && break
         opts=$(cat ${TMP_PATH}/opts)
         if [ ${opts} -eq 1 ]; then
-          ARC_BRANCH="stable"
+          ARC_BRANCH="minimal"
         elif [ ${opts} -eq 2 ]; then
-          ARC_BRANCH="next"
+          ARC_BRANCH="extended"
         elif [ ${opts} -eq 3 ]; then
           ARC_BRANCH="dev"
         fi
@@ -991,6 +997,7 @@ function sysinfo() {
   [ -d /sys/firmware/efi ] && BOOTSYS="UEFI" || BOOTSYS="BIOS"
   USERID="$(readConfigKey "arc.userid" "${USER_CONFIG_FILE}")"
   CPU="$(cat /proc/cpuinfo 2>/dev/null | grep 'model name' | uniq | awk -F':' '{print $2}')"
+  GOVERNOR="$(readConfigKey "governor" "${USER_CONFIG_FILE}")"
   SECURE=$(dmesg 2>/dev/null | grep -i "Secure Boot" | awk -F'] ' '{print $2}')
   VENDOR=$(dmesg 2>/dev/null | grep -i "DMI:" | head -1 | sed 's/\[.*\] DMI: //i')
   ETHX=$(ls /sys/class/net/ 2>/dev/null | grep eth) || true
@@ -1037,9 +1044,8 @@ function sysinfo() {
   CONFIGSVERSION="$(cat "${MODEL_CONFIG_PATH}/VERSION")"
   PATCHESVERSION="$(cat "${PATCH_PATH}/VERSION")"
   TIMEOUT=5
-  TEXT=""
   # Print System Informations
-  TEXT+="\n\n\Z4> System: ${MACHINE} | ${BOOTSYS} | ${BUS}\Zn"
+  TEXT="\n\n\Z4> System: ${MACHINE} | ${BOOTSYS} | ${BUS}\Zn"
   TEXT+="\n  Vendor: \Zb${VENDOR}\Zn"
   TEXT+="\n  CPU: \Zb${CPU}\Zn"
   if [ $(lspci -d ::300 | wc -l) -gt 0 ]; then
@@ -1051,35 +1057,36 @@ function sysinfo() {
   fi
   TEXT+="\n  Memory: \Zb$((${RAMTOTAL}))GB\Zn"
   TEXT+="\n  AES | ACPI: \Zb${AESSYS} | ${ACPISYS}\Zn"
-  TEXT+="\n  CPU Scaling: \Zb${CPUFREQ}\Zn"
+  TEXT+="\n  CPU Scaling | Governor: \Zb${CPUFREQ} | ${GOVERNOR}\Zn"
   TEXT+="\n  Secure Boot: \Zb${SECURE}\Zn"
   TEXT+="\n  Bootdisk: \Zb${LOADER_DISK}\Zn"
   TEXT+="\n"
   TEXT+="\n\Z4> Network: ${ETHN} NIC\Zn"
   for N 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/${N}/device/driver 2>/dev/null | awk -F '/' '{print $NF}')"
+    MAC="$(cat /sys/class/net/${N}/address 2>/dev/null | sed 's/://g' | tr '[:upper:]' '[:lower:]')"
     while true; do
       if [ -z "$(cat /sys/class/net/${N}/carrier 2>/dev/null)" ]; then
-        TEXT+="\n   ${DRIVER}: \ZbDOWN\Zn"
+        TEXT+="\n   ${DRIVER} (${MAC}): \ZbDOWN\Zn"
         break
       fi
       if [ "0" = "$(cat /sys/class/net/${N}/carrier 2>/dev/null)" ]; then
-        TEXT+="\n   ${DRIVER}: \ZbNOT CONNECTED\Zn"
+        TEXT+="\n   ${DRIVER} (${MAC}): \ZbNOT CONNECTED\Zn"
         break
       fi
       if [ ${COUNT} -ge ${TIMEOUT} ]; then
-        TEXT+="\n   ${DRIVER}: \ZbTIMEOUT\Zn"
+        TEXT+="\n   ${DRIVER} (${MAC}): \ZbTIMEOUT\Zn"
         break
       fi
       COUNT=$((${COUNT} + 1))
       IP="$(getIP "${N}")"
       if [ -n "${IP}" ]; then
-        SPEED=$(ethtool ${N} 2>/dev/null | grep "Speed:" | awk '{print $2}')
+        SPEED="$(ethtool ${N} 2>/dev/null | grep "Speed:" | awk '{print $2}')"
         if [[ "${IP}" =~ ^169\.254\..* ]]; then
-          TEXT+="\n   ${DRIVER} (${SPEED}): \ZbLINK LOCAL (No DHCP server found.)\Zn"
+          TEXT+="\n   ${DRIVER} (${SPEED} | ${MAC}): \ZbLINK LOCAL (No DHCP server found.)\Zn"
         else
-          TEXT+="\n   ${DRIVER} (${SPEED}): \Zb${IP}\Zn"
+          TEXT+="\n   ${DRIVER} (${SPEED} | ${MAC}): \Zb${IP}\Zn"
         fi
         break
       fi
@@ -2234,26 +2241,20 @@ function governorMenu () {
 function governorSelection () {
   rm -f "${TMP_PATH}/opts" >/dev/null
   touch "${TMP_PATH}/opts"
-  if [ "${ARCMODE}" = "config" ]; then
-    # Selectable CPU governors
-    [ "${PLATFORM}" = "epyc7002" ] && echo -e "schedutil \"use schedutil to scale frequency *\"" >>"${TMP_PATH}/opts"
-    [ "${PLATFORM}" != "epyc7002" ] && echo -e "ondemand \"use ondemand to scale frequency *\"" >>"${TMP_PATH}/opts"
-    [ "${PLATFORM}" != "epyc7002" ] && echo -e "conservative \"use conservative to scale frequency\"" >>"${TMP_PATH}/opts"
-    echo -e "performance \"always run at max frequency\"" >>"${TMP_PATH}/opts"
-    echo -e "powersave \"always run at lowest frequency\"" >>"${TMP_PATH}/opts"
-    dialog --backtitle "$(backtitle)" --title "CPU Frequency Scaling" \
-      --menu  "Choose a Governor\n* Recommended Option" 0 0 0 --file "${TMP_PATH}/opts" \
-      2>${TMP_PATH}/resp
-    [ $? -ne 0 ] && return
-    resp=$(cat ${TMP_PATH}/resp)
-    [ -z "${resp}" ] && return
-    CPUGOVERNOR=${resp}
-  else
-    [ "${PLATFORM}" = "epyc7002" ] && CPUGOVERNOR="schedutil"
-    [ "${PLATFORM}" != "epyc7002" ] && CPUGOVERNOR="ondemand"
-  fi
-  writeConfigKey "addons.cpufreqscaling" "${CPUGOVERNOR}" "${USER_CONFIG_FILE}"
-  CPUGOVERNOR="$(readConfigKey "addons.cpufreqscaling" "${USER_CONFIG_FILE}")"
+  # Selectable CPU governors
+  [ "${PLATFORM}" = "epyc7002" ] && echo -e "schedutil \"use schedutil to scale frequency *\"" >>"${TMP_PATH}/opts"
+  [ "${PLATFORM}" != "epyc7002" ] && echo -e "conservative \"use conservative to scale frequency *\"" >>"${TMP_PATH}/opts"
+  [ "${PLATFORM}" != "epyc7002" ] && echo -e "ondemand \"use ondemand to scale frequency\"" >>"${TMP_PATH}/opts"
+  echo -e "performance \"always run at max frequency\"" >>"${TMP_PATH}/opts"
+  echo -e "powersave \"always run at lowest frequency\"" >>"${TMP_PATH}/opts"
+  dialog --backtitle "$(backtitle)" --title "CPU Frequency Scaling" \
+    --menu  "Choose a Governor\n* Recommended Option" 0 0 0 --file "${TMP_PATH}/opts" \
+    2>${TMP_PATH}/resp
+  [ $? -ne 0 ] && return
+  resp=$(cat ${TMP_PATH}/resp)
+  [ -z "${resp}" ] && return
+  GOVERNOR=${resp}
+  writeConfigKey "governor" "${GOVERNOR}" "${USER_CONFIG_FILE}"
 }
 
 ###############################################################################

files/initrd/opt/arc/arc.sh

@@ -5,13 +5,12 @@
 [[ -z "${ARC_PATH}" || ! -d "${ARC_PATH}/include" ]] && ARC_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" 2>/dev/null && pwd)"
 
 . "${ARC_PATH}/include/functions.sh"
+. "${ARC_PATH}/arc-functions.sh"
 . "${ARC_PATH}/include/addons.sh"
 . "${ARC_PATH}/include/modules.sh"
 . "${ARC_PATH}/include/update.sh"
 . "${ARC_PATH}/include/storage.sh"
 . "${ARC_PATH}/include/network.sh"
-. "${ARC_PATH}/include/compat.sh"
-. "${ARC_PATH}/arc-functions.sh"
 
 # Get Keymap and Timezone and check System
 onlineCheck
@@ -114,9 +113,17 @@ function arcModel() {
         BETA=""
         [ -n "${ARCCONFM}" ] && ARC="x" || ARC=""
         [ "${DT}" = "true" ] && DTS="x" || DTS=""
+        IGPU=""
         IGPUS=""
-        [[ "${A}" = "apollolake" || "${A}" = "geminilake" ]] && IGPUS="up to 9th"
-        [ "${A}" = "epyc7002" ] && IGPUS="up to 14th" 
+        IGPUID="$(lspci -nd ::300 2>/dev/null | grep "8086" | cut -d' ' -f3 | sed 's/://g')"
+        if [ -n "${IGPUID}" ]; then grep -iq "${IGPUID}" ${ARC_PATH}/include/i915ids && IGPU="all" || IGPU="epyc7002"; else IGPU=""; fi
+        if [[ "${A}" = "apollolake" || "${A}" = "geminilake" ]] && [ "${IGPU}" = "all" ]; then
+          IGPUS="+"
+        elif [ "${A}" = "epyc7002" ] && [[ "${IGPU}" = "epyc7002" || "${IGPU}" = "all" ]]; then
+          IGPUS="x"
+        else
+          IGPUS=""
+        fi
         [ "${DT}" = "true" ] && HBAS="" || HBAS="x"
         [ "${M}" = "SA6400" ] && HBAS="x"
         [ "${DT}" = "false" ] && USBS="int/ext" || USBS="ext"
@@ -150,13 +157,13 @@ function arcModel() {
         [ -n "$(grep -w "${M}" "${S_FILE}")" ] && BETA="Arc" || BETA="Syno"
         [ -z "$(grep -w "${A}" "${P_FILE}")" ] && COMPATIBLE=0
         if [ -n "${ARCCONF}" ]; then
-          [ ${COMPATIBLE} -eq 1 ] && echo -e "${M} \"\t$(printf "\Zb%-15s\Zn \Zb%-5s\Zn \Zb%-5s\Zn \Zb%-12s\Zn \Zb%-5s\Zn \Zb%-10s\Zn \Zb%-12s\Zn \Zb%-10s\Zn \Zb%-10s\Zn" "${A}" "${DTS}" "${ARC}" "${IGPUS}" "${HBAS}" "${M_2_CACHE}" "${M_2_STORAGE}" "${USBS}" "${BETA}")\" ">>"${TMP_PATH}/menu"
+          [ ${COMPATIBLE} -eq 1 ] && echo -e "${M} \"\t$(printf "\Zb%-15s\Zn \Zb%-5s\Zn \Zb%-5s\Zn \Zb%-5s\Zn \Zb%-5s\Zn \Zb%-10s\Zn \Zb%-12s\Zn \Zb%-10s\Zn \Zb%-10s\Zn" "${A}" "${DTS}" "${ARC}" "${IGPUS}" "${HBAS}" "${M_2_CACHE}" "${M_2_STORAGE}" "${USBS}" "${BETA}")\" ">>"${TMP_PATH}/menu"
         else
-          [ ${COMPATIBLE} -eq 1 ] && echo -e "${M} \"\t$(printf "\Zb%-15s\Zn \Zb%-5s\Zn \Zb%-12s\Zn \Zb%-5s\Zn \Zb%-10s\Zn \Zb%-12s\Zn \Zb%-10s\Zn \Zb%-10s\Zn" "${A}" "${DTS}" "${IGPUS}" "${HBAS}" "${M_2_CACHE}" "${M_2_STORAGE}" "${USBS}" "${BETA}")\" ">>"${TMP_PATH}/menu"
+          [ ${COMPATIBLE} -eq 1 ] && echo -e "${M} \"\t$(printf "\Zb%-15s\Zn \Zb%-5s\Zn \Zb%-5s\Zn \Zb%-5s\Zn \Zb%-10s\Zn \Zb%-12s\Zn \Zb%-10s\Zn \Zb%-10s\Zn" "${A}" "${DTS}" "${IGPUS}" "${HBAS}" "${M_2_CACHE}" "${M_2_STORAGE}" "${USBS}" "${BETA}")\" ">>"${TMP_PATH}/menu"
         fi
       done < <(cat "${TMP_PATH}/modellist")
       ARCCONF="$(readConfigKey "${MODEL:-SA6400}.serial" "${S_FILE}")"
-      [ -n "${ARCCONF}" ] && MSG="Supported Models for your Hardware (x = supported / + = need Addons)\n$(printf "\Zb%-16s\Zn \Zb%-15s\Zn \Zb%-5s\Zn \Zb%-5s\Zn \Zb%-12s\Zn \Zb%-5s\Zn \Zb%-10s\Zn \Zb%-12s\Zn \Zb%-10s\Zn \Zb%-10s\Zn" "Model" "Platform" "DT" "Arc" "Intel iGPU" "HBA" "M.2 Cache" "M.2 Volume" "USB Mount" "Source")" || MSG="Supported Models for your Hardware (x = supported / + = need Addons) | Syno Models can have faulty Values.\n$(printf "\Zb%-16s\Zn \Zb%-15s\Zn \Zb%-5s\Zn \Zb%-12s\Zn \Zb%-5s\Zn \Zb%-10s\Zn \Zb%-12s\Zn \Zb%-10s\Zn \Zb%-10s\Zn" "Model" "Platform" "DT" "Intel iGPU" "HBA" "M.2 Cache" "M.2 Volume" "USB Mount" "Source")"
+      [ -n "${ARCCONF}" ] && MSG="Supported Models for your Hardware (x = supported / + = need Addons)\n$(printf "\Zb%-16s\Zn \Zb%-15s\Zn \Zb%-5s\Zn \Zb%-5s\Zn \Zb%-5s\Zn \Zb%-5s\Zn \Zb%-10s\Zn \Zb%-12s\Zn \Zb%-10s\Zn \Zb%-10s\Zn" "Model" "Platform" "DT" "Arc" "iGPU" "HBA" "M.2 Cache" "M.2 Volume" "USB Mount" "Source")" || MSG="Supported Models for your Hardware (x = supported / + = need Addons) | Syno Models can have faulty Values.\n$(printf "\Zb%-16s\Zn \Zb%-15s\Zn \Zb%-5s\Zn \Zb%-5s\Zn \Zb%-5s\Zn \Zb%-10s\Zn \Zb%-12s\Zn \Zb%-10s\Zn \Zb%-10s\Zn" "Model" "Platform" "DT" "iGPU" "HBA" "M.2 Cache" "M.2 Volume" "USB Mount" "Source")"
       [ -n "${ARCCONF}" ] && TITLEMSG="Arc Model" || TITLEMSG="Model"
       dialog --backtitle "$(backtitlep)" --title "${TITLEMSG}" --colors \
         --cancel-label "Show all" --help-button --help-label "Exit" \
@@ -281,9 +288,11 @@ function arcVersion() {
       PV=$(cat ${TMP_PATH}/resp)
       PAT_URL="$(readConfigKey "${PLATFORM}.\"${MODEL}\".\"${PV}\".url" "${D_FILE}")"
       PAT_HASH="$(readConfigKey "${PLATFORM}.\"${MODEL}\".\"${PV}\".hash" "${D_FILE}")"
-      [ "${PRODUCTVER}" != "${PV:0:3}" ] && PRODUCTVER="${PV:0:3}"
-      writeConfigKey "productver" "${PRODUCTVER}" "${USER_CONFIG_FILE}"
-      [ -n "${PAT_URL}" ] && [ -n "${PAT_HASH}" ] && VALID="true" && break
+      writeConfigKey "productver" "${PV:0:3}" "${USER_CONFIG_FILE}"
+      if [ -n "${PAT_URL}" ] && [ -n "${PAT_HASH}" ]; then
+        VALID="true"
+        break
+      fi
     done
     if [ -z "${PAT_URL}" ] || [ -z "${PAT_HASH}" ]; then
       while true; do
@@ -313,11 +322,10 @@ function arcVersion() {
         --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
+      ARCMODE="$(readConfigKey "arc.mode" "${USER_CONFIG_FILE}")"
     fi
   elif [ "${ARCMODE}" = "automated" ] || [ "${ARCRESTORE}" = "true" ]; then
     VALID="true"
@@ -363,7 +371,8 @@ function arcVersion() {
         initConfigKey "addons.sensors" "" "${USER_CONFIG_FILE}"
       fi
       if [ "${PLATFORM}" = "apollolake" ] || [ "${PLATFORM}" = "geminilake" ]; then
-        initConfigKey "addons.i915" "" "${USER_CONFIG_FILE}"
+        if [ -n "${IGPUID}" ]; then grep -iq "${IGPUID}" ${ARC_PATH}/include/i915ids && IGPU="all" || IGPU="epyc7002"; else IGPU=""; fi
+        [ "${IGPU}"="all" ] && initConfigKey "addons.i915" "" "${USER_CONFIG_FILE}" || true
       fi
       if echo "${PAT_URL}" 2>/dev/null | grep -q "7.2.2"; then
         initConfigKey "addons.allowdowngrade" "" "${USER_CONFIG_FILE}"
@@ -511,7 +520,7 @@ function arcSettings() {
     governorSelection
     [ $? -ne 0 ] && return
   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}"
+    [ "${PLATFORM}" = "epyc7002" ] && writeConfigKey "governor" "schedutil" "${USER_CONFIG_FILE}" || writeConfigKey "governor" "conservative" "${USER_CONFIG_FILE}"
   fi
   if [ "${ARCMODE}" = "config" ]; then
     # Check for DT and HBA/Raid Controller
@@ -878,7 +887,7 @@ elif [ "${ARCMODE}" = "config" ]; then
         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"
+          echo "h \"USB Mount as Internal: \Z4${USBMOUNT}\Zn \" "                             >>"${TMP_PATH}/menu"
         fi
       fi
       if [ "${BOOTOPTS}" = "true" ]; then
@@ -1047,13 +1056,7 @@ elif [ "${ARCMODE}" = "config" ]; then
         BUILDDONE="$(readConfigKey "arc.builddone" "${USER_CONFIG_FILE}")"
         NEXT="H"
         ;;
-      h) if [ "${USBMOUNT}" = "auto" ]; then
-          USBMOUNT='internal'
-        elif [ "${USBMOUNT}" = "internal" ]; then
-          USBMOUNT='external'
-        elif [ "${USBMOUNT}" = "external" ]; then
-          USBMOUNT='auto'
-        fi
+      h) [ "${USBMOUNT}" = "true" ] && USBMOUNT='false' || USBMOUNT='true'
         writeConfigKey "usbmount" "${USBMOUNT}" "${USER_CONFIG_FILE}"
         writeConfigKey "arc.builddone" "false" "${USER_CONFIG_FILE}"
         BUILDDONE="$(readConfigKey "arc.builddone" "${USER_CONFIG_FILE}")"

files/initrd/opt/arc/boot.sh

@@ -59,6 +59,8 @@ DSMINFO="$(readConfigKey "bootscreen.dsminfo" "${USER_CONFIG_FILE}")"
 SYSTEMINFO="$(readConfigKey "bootscreen.systeminfo" "${USER_CONFIG_FILE}")"
 DISKINFO="$(readConfigKey "bootscreen.diskinfo" "${USER_CONFIG_FILE}")"
 HWIDINFO="$(readConfigKey "bootscreen.hwidinfo" "${USER_CONFIG_FILE}")"
+GOVERNOR="$(readConfigKey "governor" "${USER_CONFIG_FILE}")"
+USBMOUNT="$(readConfigKey "usbmount" "${USER_CONFIG_FILE}")"
 
 if [ "${DSMINFO}" = "true" ]; then
   echo -e "\033[1;37mDSM:\033[0m"
@@ -73,6 +75,8 @@ if [ "${SYSTEMINFO}" = "true" ]; then
   echo -e "Vendor: \033[1;37m${VENDOR}\033[0m"
   echo -e "CPU: \033[1;37m${CPU}\033[0m"
   echo -e "Memory: \033[1;37m${RAMTOTAL}GB\033[0m"
+  echo -e "Governor: \033[1;37m${GOVERNOR}\033[0m"
+  [ "${USBMOUNT}" = "true" ] && echo -e "USB Mount: \033[1;37m${USBMOUNT}\033[0m"
   echo
 fi
 if [ "${DISKINFO}" = "true" ]; then
@@ -94,7 +98,12 @@ if ! readConfigMap "addons" "${USER_CONFIG_FILE}" | grep -q nvmesystem; then
       break
     fi
   done
-  [ ${HASATA} -eq 0 ] && echo -e "\033[1;31m*** Please insert at least one Sata/SAS/SCSI Disk for System installation, except for the Bootloader Disk. ***\033[0m"
+  [ ${HASATA} -eq 0 ] && echo -e "\033[1;31m*** Note: Please insert at least one Sata/SAS/SCSI Disk for System installation, except the Bootloader Disk. ***\033[0m"
+fi
+
+if checkBIOS_VT_d && [ $(echo "${KVER:-4}" | cut -d'.' -f1) -lt 5 ]; then
+  echo -e "\033[1;31m*** Notice: Disable Intel(VT-d)/AMD(AMD-V) in BIOS/UEFI settings if you encounter a boot failure. ***\033[0m"
+  echo
 fi
 
 # Read necessary variables
@@ -167,6 +176,7 @@ else
   CMDLINE["syno_hdd_detect"]="0"
   CMDLINE["syno_hdd_powerup_seq"]="0"
 fi
+
 CMDLINE["HddHotplug"]="1"
 CMDLINE["vender_format_version"]="2"
 CMDLINE["skip_vender_mac_interfaces"]="0,1,2,3,4,5,6,7"
@@ -179,18 +189,31 @@ CMDLINE["root"]="/dev/md0"
 CMDLINE["loglevel"]="15"
 CMDLINE["log_buf_len"]="32M"
 CMDLINE["rootwait"]=""
-CMDLINE["panic"]="${KERNELPANIC:-0}"
-
-# DSM Specific Cmdline
-CMDLINE["pcie_aspm"]="off"
+CMDLINE['panic']="${KERNELPANIC:-0}"
+# CMDLINE['intremap']="off" # no need
+# CMDLINE['amd_iommu_intr']="legacy" # no need
+# CMDLINE['split_lock_detect']="off" # check KVER
+CMDLINE['pcie_aspm']="off"
+# CMDLINE['intel_pstate']="disable"
+# CMDLINE['amd_pstate']="disable"
+# CMDLINE['nox2apic']=""  # check platform
+# CMDLINE['nomodeset']=""
 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 [ "${USBMOUNT}" = "true" ]; then
+  CMDLINE['usbinternal']=""
+fi
+if [ "${GOVERNOR}" = "ondemand" ] || [ "${GOVERNOR}" = "conservative" ] || [ "${GOVERNOR}" = "schedutil" ]; then
+  CMDLINE["governor"]="${GOVERNOR}"
+fi
+if [ $(cat /proc/cpuinfo | grep Intel | wc -l) -gt 0 ]; then
+  CMDLINE["intel_pstate"]="disable"
+fi
 if echo "apollolake geminilake purley" | grep -wq "${PLATFORM}"; then
   CMDLINE["nox2apic"]=""
 fi
-#if [ -n "$(ls /dev/mmcblk* 2>/dev/null)" ] && [ "${BUS}" != "mmc" ] && [ "${EMMCBOOT}" != "true" ]; then
+
+# Disabled for now
+# if [ -n "$(ls /dev/mmcblk* 2>/dev/null)" ] && [ "${BUS}" != "mmc" ] && [ "${EMMCBOOT}" != "true" ]; then
 #   if ! echo "${CMDLINE["modprobe.blacklist"]}" | grep -q "sdhci"; then
 #     [ ! "${CMDLINE["modprobe.blacklist"]}" = "" ] && CMDLINE["modprobe.blacklist"]+=","
 #     CMDLINE["modprobe.blacklist"]+="sdhci,sdhci_pci,sdhci_acpi"
@@ -201,12 +224,17 @@ if [ "${DT}" = "true" ] && ! echo "epyc7002 purley broadwellnkv2" | grep -wq "${
     [ ! "${CMDLINE['modprobe.blacklist']}" = "" ] && CMDLINE["modprobe.blacklist"]+=","
     CMDLINE["modprobe.blacklist"]+="mpt3sas"
   fi
+#else
+#  CMDLINE['scsi_mod.scan']="sync"  # TODO: kernel panic caused by vmware scsi? (add to cmdline)
 fi
+
 # CMDLINE['kvm.ignore_msrs']="1"
 # CMDLINE['kvm.report_ignored_msrs']="0"
+
 if echo "apollolake geminilake" | grep -wq "${PLATFORM}"; then
   CMDLINE["intel_iommu"]="igfx_off"
 fi
+
 if echo "purley broadwellnkv2" | grep -wq "${PLATFORM}"; then
   CMDLINE["SASmodel"]="1"
 fi
@@ -251,9 +279,6 @@ 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
   echo -e "\033[1;34mReboot with Directboot\033[0m"
   reboot
   exit 0
@@ -275,9 +300,10 @@ elif [ "${DIRECTBOOT}" = "false" ]; then
   for N in ${ETHX}; do
     COUNT=0
     DRIVER=$(ls -ld /sys/class/net/${N}/device/driver 2>/dev/null | awk -F '/' '{print $NF}')
+    MAC="$(cat /sys/class/net/${N}/address 2>/dev/null | sed 's/://g' | tr '[:upper:]' '[:lower:]')"
     while true; do
       if [ "0" = "$(cat /sys/class/net/${N}/carrier 2>/dev/null)" ]; then
-        echo -e "\r${DRIVER}: \033[1;37mNOT CONNECTED\033[0m"
+        echo -e "\r${DRIVER}: \033[1;37mNOT CONNECTED @ Mac: ${MAC}\033[0m"
         break
       fi
       COUNT=$((COUNT + 1))
@@ -285,27 +311,25 @@ elif [ "${DIRECTBOOT}" = "false" ]; then
       if [ -n "${IP}" ]; then
         SPEED=$(ethtool ${N} 2>/dev/null | grep "Speed:" | awk '{print $2}')
         if [[ "${IP}" =~ ^169\.254\..* ]]; then
-          echo -e "\r${DRIVER} (${SPEED}): \033[1;37mLINK LOCAL (No DHCP server found.)\033[0m"
+          echo -e "\r${DRIVER} (${SPEED} | ${MAC}): \033[1;37mLINK LOCAL (No DHCP server found.)\033[0m"
         else
-          echo -e "\r${DRIVER} (${SPEED}): \033[1;37m${IP}\033[0m"
+          echo -e "\r${DRIVER} (${SPEED} | ${MAC}): \033[1;37m${IP}\033[0m"
           [ -z "${IPCON}" ] && IPCON="${IP}"
         fi
         break
       fi
       if [ -z "$(cat /sys/class/net/${N}/carrier 2>/dev/null)" ]; then
-        echo -e "\r${DRIVER}: \033[1;37mDOWN\033[0m"
+        echo -e "\r${DRIVER} (${MAC}): \033[1;37mDOWN\033[0m"
         break
       fi
       if [ ${COUNT} -ge ${BOOTIPWAIT} ]; then
-        echo -e "\r${DRIVER}: \033[1;37mTIMEOUT\033[0m"
+        echo -e "\r${DRIVER} (${MAC}): \033[1;37mTIMEOUT\033[0m"
         break
       fi
       sleep 1
     done
   done
-  if ! _bootwait; then
-    exit 0
-  fi
+  echo
 
   DSMLOGO="$(readConfigKey "bootscreen.dsmlogo" "${USER_CONFIG_FILE}")"
   if [ "${DSMLOGO}" = "true" ] && [ -c "/dev/fb0" ]; then

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

@@ -113,3 +113,19 @@ function updateAddon() {
     rm -f "${F}"
   done
 }
+
+###############################################################################
+# Read Addon Key
+# 1 - Addon
+# 2 - key
+function readAddonKey() {
+  if [ -z "${1}" ] || [ -z "${2}" ]; then
+    echo ""
+    return 1
+  fi
+  if [ ! -f "${ADDONS_PATH}/${1}/manifest.yml" ]; then
+    echo ""
+    return 1
+  fi
+  readConfigKey "${2}" "${ADDONS_PATH}/${1}/manifest.yml"
+}

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

@@ -1 +0,0 @@
-###############################################################################

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

@@ -68,6 +68,12 @@ function randomhex() {
   printf "&02X" "$((${RANDOM} % 255 + 1))"
 }
 
+###############################################################################
+# Generate a random digit (0-9A-Z)
+function genRandomDigit() {
+  echo {0..9} | tr ' ' '\n' | sort -R | head -1
+}
+
 ###############################################################################
 # Generate a random letter
 function genRandomLetter() {
@@ -375,13 +381,39 @@ function delCmdline() {
   setCmdline "${1}" "${CMDLINE}"
 }
 
+###############################################################################
+# check CPU Intel(VT-d)/AMD(AMD-Vi)
+function checkCPU_VT_d() {
+  lsmod | grep -q msr || modprobe msr 2>/dev/null
+  if grep -q "GenuineIntel" /proc/cpuinfo 2>/dev/null; then
+    local VT_D_ENABLED=$(rdmsr 0x3a 2>/dev/null)
+    [ "$((${VT_D_ENABLED:-0x0} & 0x5))" -eq $((0x5)) ] && return 0
+  elif grep -q "AuthenticAMD" /proc/cpuinfo 2>/dev/null; then
+    local IOMMU_ENABLED=$(rdmsr 0xC0010114 2>/dev/null)
+    [ "$((${IOMMU_ENABLED:-0x0} & 0x1))" -eq $((0x1)) ] && return 0
+  else
+    return 1
+  fi
+}
+
+###############################################################################
+# check BIOS Intel(VT-d)/AMD(AMD-Vi)
+function checkBIOS_VT_d() {
+  if grep -q "GenuineIntel" /proc/cpuinfo 2>/dev/null; then
+    dmesg 2>/dev/null | grep -iq "DMAR-IR.*DRHD base" && return 0
+  elif grep -q "AuthenticAMD" /proc/cpuinfo 2>/dev/null; then
+    dmesg 2>/dev/null | grep -iq "AMD-Vi.*enabled" && return 0
+  else
+    return 1
+  fi
+}
+
 ###############################################################################
 # Rebooting
-# (based on pocopico's TCRP code)
 function rebootTo() {
   local MODES="config recovery junior automated update bios memtest"
   [ -z "${1}" ] && exit 1
-  if ! echo "${MODES}" | grep -qw "${1}"; then exit 1; fi
+  if ! echo "${MODES}" | grep -wq "${1}"; then exit 1; fi
   [ "${1}" = "automated" ] && echo "arc-${MODEL}-${PRODUCTVER}-${ARC_VERSION}" >"${PART3_PATH}/automated"
   [ ! -f "${USER_GRUBENVFILE}" ] && grub-editenv ${USER_GRUBENVFILE} create
   # echo -e "Rebooting to ${1} mode..."
@@ -557,7 +589,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 ]; then
     CPUFREQ="true"
   else
     CPUFREQ="false"
@@ -565,6 +597,8 @@ function systemCheck () {
   # Check for Arc Patch
   ARCCONF="$(readConfigKey "${MODEL:-SA6400}.serial" "${S_FILE}")"
   [ -z "${ARCCONF}" ] && writeConfigKey "arc.patch" "false" "${USER_CONFIG_FILE}"
+  # Check for Disks
+  getmap
 }
 
 ###############################################################################
@@ -604,11 +638,13 @@ function __umountDSMRootDisk() {
 ###############################################################################
 # bootwait SSH/Web
 function _bootwait() {
-  # Exec Bootwait to check SSH/Web connection
-  BOOTWAIT=5
+  BOOTWAIT="$(readConfigKey "bootwait" "${USER_CONFIG_FILE}")"
+  [ -z "${BOOTWAIT}" ] && BOOTWAIT=10
   busybox w 2>/dev/null | awk '{print $1" "$2" "$4" "$5" "$6}' >WB
   MSG=""
-  while test ${BOOTWAIT} -ge 0; do
+  while [ ${BOOTWAIT} -gt 0 ]; do
+    sleep 1
+    BOOTWAIT=$((BOOTWAIT - 1))
     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
@@ -617,8 +653,6 @@ function _bootwait() {
       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"

files/initrd/opt/arc/include/i915ids

@@ -0,0 +1,390 @@
+# INTEL_I810_IDS
+80867121
+80867123
+80867125
+# INTEL_I815_IDS
+80861132
+# INTEL_I830_IDS
+80863577
+# INTEL_I845G_IDS
+80862562
+# INTEL_I85X_IDS
+80863582
+8086358e
+# INTEL_I865G_IDS
+80862572
+# INTEL_I915G_IDS
+80862582
+8086258a
+# INTEL_I915GM_IDS
+80862592
+# INTEL_I945G_IDS
+80862772
+# INTEL_I945GM_IDS
+808627a2
+808627ae
+# INTEL_I965G_IDS
+80862972
+80862982
+80862992
+808629a2
+# INTEL_G33_IDS
+808629b2
+808629c2
+808629d2
+# INTEL_I965GM_IDS
+80862a02
+80862a12
+# INTEL_GM45_IDS
+80862a42
+# INTEL_G45_IDS
+80862e02
+80862e12
+80862e22
+80862e32
+80862e42
+80862e92
+# INTEL_PINEVIEW_G_IDS
+8086a001
+# INTEL_PINEVIEW_M_IDS
+8086a011
+# INTEL_IRONLAKE_D_IDS
+80860042
+# INTEL_IRONLAKE_M_IDS
+80860046
+# INTEL_SNB_D_GT1_IDS
+80860102
+8086010A
+# INTEL_SNB_D_GT2_IDS
+80860112
+80860122
+# INTEL_SNB_M_GT1_IDS
+80860106
+# INTEL_SNB_M_GT2_IDS
+80860116
+80860126
+# INTEL_IVB_M_GT1_IDS
+80860156
+# INTEL_IVB_M_GT2_IDS
+80860166
+# INTEL_IVB_D_GT1_IDS
+80860152
+8086015a
+# INTEL_IVB_D_GT2_IDS
+80860162
+8086016a
+# INTEL_HSW_ULT_GT1_IDS
+80860A02
+80860A06
+80860A0A
+80860A0B
+# INTEL_HSW_ULX_GT1_IDS
+80860A0E
+# INTEL_HSW_GT1_IDS
+80860402
+80860406
+8086040A
+8086040B
+8086040E
+80860C02
+80860C06
+80860C0A
+80860C0B
+80860C0E
+80860D02
+80860D06
+80860D0A
+80860D0B
+80860D0E
+# INTEL_HSW_ULT_GT2_IDS
+80860A12
+80860A16
+80860A1A
+80860A1B
+# INTEL_HSW_ULX_GT2_IDS
+80860A1E
+# INTEL_HSW_GT2_IDS
+80860412
+80860416
+8086041A
+8086041B
+8086041E
+80860C12
+80860C16
+80860C1A
+80860C1B
+80860C1E
+80860D12
+80860D16
+80860D1A
+80860D1B
+80860D1E
+# INTEL_HSW_ULT_GT3_IDS
+80860A22
+80860A26
+80860A2A
+80860A2B
+80860A2E
+# INTEL_HSW_GT3_IDS
+80860422
+80860426
+8086042A
+8086042B
+8086042E
+80860C22
+80860C26
+80860C2A
+80860C2B
+80860C2E
+80860D22
+80860D26
+80860D2A
+80860D2B
+80860D2E
+# INTEL_VLV_IDS
+80860f30
+80860f31
+80860f32
+80860f33
+# INTEL_BDW_ULT_GT1_IDS
+80861606
+8086160B
+# INTEL_BDW_ULX_GT1_IDS
+8086160E
+# INTEL_BDW_GT1_IDS
+80861602
+8086160A
+8086160D
+# INTEL_BDW_ULT_GT2_IDS
+80861616
+8086161B
+# INTEL_BDW_ULX_GT2_IDS
+8086161E
+# INTEL_BDW_GT2_IDS
+80861612
+8086161A
+8086161D
+# INTEL_BDW_ULT_GT3_IDS
+80861626
+8086162B
+# INTEL_BDW_ULX_GT3_IDS
+8086162E
+# INTEL_BDW_GT3_IDS
+80861622
+8086162A
+8086162D
+# INTEL_BDW_ULT_RSVD_IDS
+80861636
+8086163B
+# INTEL_BDW_ULX_RSVD_IDS
+8086163E
+# INTEL_BDW_RSVD_IDS
+80861632
+8086163A
+8086163D
+# INTEL_CHV_IDS
+808622b0
+808622b1
+808622b2
+808622b3
+# INTEL_SKL_ULT_GT1_IDS
+80861906
+80861913~
+# INTEL_SKL_ULX_GT1_IDS
+8086190E
+80861915~
+# INTEL_SKL_GT1_IDS
+80861902
+8086190A
+8086190B
+80861917~
+# INTEL_SKL_ULT_GT2_IDS
+80861916
+80861921
+# INTEL_SKL_ULX_GT2_IDS
+8086191E
+# INTEL_SKL_GT2_IDS
+80861912
+8086191A
+8086191B
+8086191D
+# INTEL_SKL_ULT_GT3_IDS
+80861923
+80861926
+80861927
+# INTEL_SKL_GT3_IDS
+8086192A
+8086192B
+8086192D
+# INTEL_SKL_GT4_IDS
+80861932
+8086193A
+8086193B
+8086193D
+# INTEL_BXT_IDS
+80860A84
+80861A84
+80861A85
+80865A84
+80865A85
+# INTEL_GLK_IDS
+80863184
+80863185
+# INTEL_KBL_ULT_GT1_IDS
+80865906
+80865913
+# INTEL_KBL_ULX_GT1_IDS
+8086590E
+80865915
+# INTEL_KBL_GT1_IDS
+80865902
+80865908
+8086590A
+8086590B
+# INTEL_KBL_ULT_GT2_IDS
+80865916
+80865921
+# INTEL_KBL_ULX_GT2_IDS
+8086591E
+# INTEL_KBL_GT2_IDS
+80865912
+80865917
+8086591A
+8086591B
+8086591D
+# INTEL_KBL_ULT_GT3_IDS
+80865926
+# INTEL_KBL_GT3_IDS
+80865923
+80865927
+# INTEL_KBL_GT4_IDS
+8086593B
+# INTEL_AML_KBL_GT2_IDS
+8086591C
+808687C0
+# INTEL_AML_CFL_GT2_IDS
+808687CA
+# INTEL_CML_GT1_IDS
+80869BA2
+80869BA4
+80869BA5
+80869BA8
+# INTEL_CML_U_GT1_IDS
+80869B21
+80869BAA
+80869BAC
+# INTEL_CML_GT2_IDS
+80869BC2
+80869BC4
+80869BC5
+80869BC6
+80869BC8
+80869BE6
+80869BF6
+# INTEL_CML_U_GT2_IDS
+80869B41
+80869BCA
+80869BCC
+# INTEL_CFL_S_GT1_IDS
+80863E90
+80863E93
+80863E99
+# INTEL_CFL_S_GT2_IDS
+80863E91
+80863E92
+80863E96
+80863E98
+80863E9A
+# INTEL_CFL_H_GT1_IDS
+80863E9C
+# INTEL_CFL_H_GT2_IDS
+80863E94
+80863E9B
+# INTEL_CFL_U_GT2_IDS
+80863EA9
+# INTEL_CFL_U_GT3_IDS
+80863EA5
+80863EA6
+80863EA7
+80863EA8
+# INTEL_WHL_U_GT1_IDS
+80863EA1
+80863EA4
+# INTEL_WHL_U_GT2_IDS
+80863EA0
+80863EA3
+# INTEL_WHL_U_GT3_IDS
+80863EA2
+# INTEL_CNL_PORT_F_IDS
+80865A44
+80865A4C
+80865A54
+80865A5C
+# INTEL_CNL_IDS
+80865A40
+80865A41
+80865A42
+80865A49
+80865A4A
+80865A50
+80865A51
+80865A52
+80865A59
+80865A5A
+# INTEL_ICL_PORT_F_IDS
+80868A50
+80868A52
+80868A53
+80868A54
+80868A56
+80868A57
+80868A58
+80868A59
+80868A5A
+80868A5B
+80868A5C
+80868A70
+80868A71
+# INTEL_ICL_11_IDS
+80868A51
+80868A5D
+# INTEL_EHL_IDS
+80864500~
+80864541
+80864551
+80864555
+80864557
+80864570~
+80864571
+# INTEL_JSL_IDS
+80864E51
+80864E55
+80864E57
+80864E61
+80864E71
+# INTEL_TGL_12_GT1_IDS
+80869A60
+80869A68
+80869A70
+# INTEL_TGL_12_GT2_IDS
+80869A40
+80869A49
+80869A59
+80869A78
+80869AC0
+80869AC9
+80869AD9
+80869AF8
+# INTEL_RKL_IDS
+80864C80
+80864C8A
+80864C8B
+80864C8C
+80864C90
+80864C9A
+# INTEL_DG1_IDS
+80864905
+80864906~
+80864907~
+80864908~
+80864909~

files/initrd/opt/arc/include/modulelist

@@ -7,13 +7,15 @@
 # eg: N i915.ko
 
 # kvm
-N irqbypass.ko
-N kvm-intel.ko
-N kvm-amd.ko
-N kvm.ko
+F irqbypass.ko
+F kvm-intel.ko
+F kvm-amd.ko
+F kvm.ko
 
 # acpi
-N acpi_call.ko
+F acpi_call.ko
+F acpi-cpufreq.ko
+F processor.ko
 
 # misc
 N check_signature.ko

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

@@ -4,10 +4,10 @@ function getmap() {
   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
+    [ -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=""
@@ -247,6 +247,4 @@ RAIDCONTROLLER=$(lspci -d ::104 2>/dev/null | wc -l)
 writeConfigKey "device.raidcontroller" "${RAIDCONTROLLER}" "${USER_CONFIG_FILE}"
 if [ ${RAIDCONTROLLER} -gt 0 ]; then
   writeConfigKey "device.externalcontroller" "true" "${USER_CONFIG_FILE}"
-fi
-# Check Controller for Disks
-getmap
+fi

files/initrd/opt/arc/init.sh

@@ -55,6 +55,7 @@ initConfigKey "bootipwait" "30" "${USER_CONFIG_FILE}"
 initConfigKey "device" "{}" "${USER_CONFIG_FILE}"
 initConfigKey "directboot" "false" "${USER_CONFIG_FILE}"
 initConfigKey "emmcboot" "false" "${USER_CONFIG_FILE}"
+initConfigKey "governor" "performance" "${USER_CONFIG_FILE}"
 initConfigKey "hddsort" "false" "${USER_CONFIG_FILE}"
 initConfigKey "kernel" "official" "${USER_CONFIG_FILE}"
 initConfigKey "kernelload" "power" "${USER_CONFIG_FILE}"
@@ -81,7 +82,7 @@ initConfigKey "rd-compressed" "false" "${USER_CONFIG_FILE}"
 initConfigKey "satadom" "2" "${USER_CONFIG_FILE}"
 initConfigKey "synoinfo" "{}" "${USER_CONFIG_FILE}"
 initConfigKey "time" "{}" "${USER_CONFIG_FILE}"
-initConfigKey "usbmount" "auto" "${USER_CONFIG_FILE}"
+initConfigKey "usbmount" "false" "${USER_CONFIG_FILE}"
 initConfigKey "zimage-hash" "" "${USER_CONFIG_FILE}"
 if grep -q "automated_arc" /proc/cmdline; then
   writeConfigKey "arc.mode" "automated" "${USER_CONFIG_FILE}"
@@ -134,8 +135,8 @@ PID="0x0001"
 
 BUSLIST="usb sata sas scsi nvme mmc ide virtio vmbus xen"
 if [ "${BUS}" = "usb" ]; then
-  VID="0x$(udevadm info --query property --name "${LOADER_DISK}" | grep ID_VENDOR_ID | cut -d= -f2)"
-  PID="0x$(udevadm info --query property --name "${LOADER_DISK}" | grep ID_MODEL_ID | cut -d= -f2)"
+  VID="0x$(udevadm info --query property --name "${LOADER_DISK}" 2>/dev/null | grep "ID_VENDOR_ID" | cut -d= -f2)"
+  PID="0x$(udevadm info --query property --name "${LOADER_DISK}" 2>/dev/null | grep "ID_MODEL_ID" | cut -d= -f2)"
 elif ! echo "${BUSLIST}" | grep -wq "${BUS}"; then
   die "$(printf "The boot disk does not support the current %s, only %s are supported." "${BUS}" "${BUSLIST// /\/}")"
 fi

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

@@ -176,8 +176,7 @@ for ADDON in "redpill" "revert" "misc" "eudev" "disks" "localrss" "notify" "wol"
   PARAMS=""
   if [ "${ADDON}" = "disks" ]; then
     HDDSORT="$(readConfigKey "hddsort" "${USER_CONFIG_FILE}")"
-    USBMOUNT="$(readConfigKey "usbmount" "${USER_CONFIG_FILE}")"
-    PARAMS="${HDDSORT} ${USBMOUNT}"
+    PARAMS="${HDDSORT}"
     [ -f "${USER_UP_PATH}/${MODEL}.dts" ] && cp -f "${USER_UP_PATH}/${MODEL}.dts" "${RAMDISK_PATH}/addons/model.dts"
   fi
   installAddon "${ADDON}" "${PLATFORM}" || exit 1

files/p1/boot/grub/grub.cfg

@@ -33,14 +33,12 @@ else
 fi
 
 if loadfont unicode; then
-  insmod gfxterm
   if [ "${grub_platform}" = "efi" ]; then
     set gfxmode=auto
-    terminal_output --append gfxterm
   else
     set gfxmode=1024x768
-    terminal_output gfxterm
   fi
+  terminal_output gfxterm
   insmod gfxmenu
   loadfont ${prefix}/theme/dejavu_bold_14.pf2
   loadfont ${prefix}/theme/dejavu_mono_12.pf2
@@ -62,7 +60,7 @@ 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 intel_pstate=disable nox2apic nomodeset"
+set ARC_CMDLINE="earlyprintk earlycon=uart8250,io,0x3f8,115200n8 console=ttyS0,115200n8 root=/dev/ram rootwait intremap=off amd_iommu_intr=legacy net.ifnames=0 panic=5 split_lock_detect=off pcie_aspm=off intel_pstate=disable amd_pstate=disable nox2apic nomodeset"
 
 search --set=root --label "ARC3"
 if [ -s /zImage-dsm -a -s /initrd-dsm ]; then

img-ext.sh

@@ -1,4 +1,10 @@
 #!/usr/bin/env bash
+#
+# Copyright (C) 2025 AuxXxilium <https://github.com/AuxXxilium>
+#
+# This is free software, licensed under the MIT License.
+# See /LICENSE for more information.
+#
 
 set -e
 
@@ -25,8 +31,8 @@ mkdir -p "brx"
 [ ! -f "../brx/bzImage" ] && getBuildrootx "brx" || copyBuildroot "brx"
 
 # Sbase
-IMAGE_FILE="arc.img"
-gzip -dc "files/initrd/opt/arc/grub.img.gz" >"${IMAGE_FILE}"
+IMAGE_FILE="arc_create.img"
+gzip -dc "grub.img.gz" >"${IMAGE_FILE}"
 fdisk -l "${IMAGE_FILE}"
 
 LOOPX=$(sudo losetup -f)
@@ -42,7 +48,7 @@ sudo mount ${LOOPX}p3 "/tmp/p3"
 
 ARC_BUILD="`date +'%y%m%d'`"
 ARC_VERSION="13.3.7"
-ARC_BRANCH="next"
+ARC_BRANCH="extended"
 echo "${ARC_BUILD}" >files/p1/ARC-BUILD
 echo "${ARC_VERSION}" >files/p1/ARC-VERSION
 echo "${ARC_BRANCH}" >files/p1/ARC-BRANCH
@@ -50,7 +56,6 @@ 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
     exit 1
@@ -69,4 +74,9 @@ sudo rm -rf "/tmp/p3"
 
 sudo losetup --detach ${LOOPX}
 
+# Resize Image
+resizeImg "${IMAGE_FILE}" "+1024M" "arc.img" 2>/dev/null
+rm -f "${IMAGE_FILE}"
+
+IMAGE_FILE="arc.img"
 qemu-img convert -p -f raw -o subformat=monolithicFlat -O vmdk ${IMAGE_FILE} arc.vmdk

img-min.sh

@@ -1,4 +1,10 @@
 #!/usr/bin/env bash
+#
+# Copyright (C) 2025 AuxXxilium <https://github.com/AuxXxilium>
+#
+# This is free software, licensed under the MIT License.
+# See /LICENSE for more information.
+#
 
 set -e
 
@@ -24,8 +30,8 @@ getOffline "files/p3/configs"
 [ -f "../brs/bzImage" ] && copyBuildroot "brs" || getBuildroots "brs"
 
 # Sbase
-IMAGE_FILE="arc.img"
-gzip -dc "files/initrd/opt/arc/grub.img.gz" >"${IMAGE_FILE}"
+IMAGE_FILE="arc_create.img"
+gzip -dc "grub.img.gz" >"${IMAGE_FILE}"
 fdisk -l "${IMAGE_FILE}"
 
 LOOPX=$(sudo losetup -f)
@@ -41,7 +47,7 @@ sudo mount ${LOOPX}p3 "/tmp/p3"
 
 ARC_BUILD="`date +'%y%m%d'`"
 ARC_VERSION="13.3.7"
-ARC_BRANCH="stable"
+ARC_BRANCH="minimal"
 echo "${ARC_BUILD}" >files/p1/ARC-BUILD
 echo "${ARC_VERSION}" >files/p1/ARC-VERSION
 echo "${ARC_BRANCH}" >files/p1/ARC-BRANCH
@@ -49,7 +55,6 @@ 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
     exit 1
@@ -68,4 +73,9 @@ sudo rm -rf "/tmp/p3"
 
 sudo losetup --detach ${LOOPX}
 
+# Resize Image
+resizeImg "${IMAGE_FILE}" "+1024M" "arc.img" 2>/dev/null
+rm -f "${IMAGE_FILE}"
+
+IMAGE_FILE="arc.img"
 qemu-img convert -p -f raw -o subformat=monolithicFlat -O vmdk ${IMAGE_FILE} arc.vmdk

scripts/func.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 #
-# Copyright (C) 2024 AuxXxilium <https://github.com/AuxXxilium>
-# 
+# Copyright (C) 2025 AuxXxilium <https://github.com/AuxXxilium>
+#
 # This is free software, licensed under the MIT License.
 # See /LICENSE for more information.
 #
@@ -499,12 +499,4 @@ function copyBuildroot() {
   mkdir -p "${DEST_PATH}"
   cp -f "../${DEST_PATH}/bzImage" "${DEST_PATH}/bzImage-arc"
   cp -f "../${DEST_PATH}/rootfs.cpio.zst" "${DEST_PATH}/initrd-arc"
-}
-
-# create arc executable
-function createArc() {
-  [ ! -f "arc" ] && ./scripts/make/makeself.sh --current --zstd --quiet "../arc/files/initrd/opt/arc" arc "Arc Loader" "./init.sh" || true
-  rm -rf "../arc/files/initrd/opt/arc"
-  mkdir -p "../arc/files/initrd/opt/arc"
-  cp -f "arc" "../arc/files/initrd/opt/arc/"
 }

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

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).

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"