Merge pull request #5563 from AuxXxilium/dev

Dev
AuxXxilium · Jan 5, 2025 · 5c4a706 · 5c4a706
2 parents 1b0ff6b + a405764
commit 5c4a706
Show file tree

Hide file tree

Showing 11 changed files with 27 additions and 1,674 deletions.
diff --git a/.github/workflows/build.yml b/.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.
@@ -146,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"
@@ -167,6 +166,7 @@ jobs:
           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
 
@@ -231,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"
@@ -252,6 +251,7 @@ jobs:
           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
 

diff --git a/files/initrd/opt/arc/arc.sh b/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

diff --git a/files/initrd/opt/arc/include/compat.sh b/files/initrd/opt/arc/include/compat.sh
diff --git a/files/initrd/opt/arc/include/functions.sh b/files/initrd/opt/arc/include/functions.sh
@@ -597,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
 }
 
 ###############################################################################

diff --git a/files/initrd/opt/arc/include/storage.sh b/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
diff --git a/img-ext.sh b/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
 
@@ -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
@@ -73,4 +78,5 @@ sudo losetup --detach ${LOOPX}
 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
diff --git a/img-min.sh b/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
 
@@ -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
@@ -72,4 +77,5 @@ sudo losetup --detach ${LOOPX}
 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
diff --git a/scripts/func.sh b/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,13 +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 "files/initrd/opt/arc" arc "Arc Loader" "./init.sh" || true
-  rm -rf "files/initrd/opt/arc"
-  mkdir -p "files/initrd/opt/arc"
-  cp -f "arc" "files/initrd/opt/arc/"
-  cp -f "grub.img.gz" "files/initrd/opt/arc/grub.img.gz"
 }