tree: update

Signed-off-by: AuxXxilium <info@auxxxilium.tech>

.github/workflows/build.yml

@@ -136,7 +136,7 @@ jobs:
 
           echo "Create Arc Image"
           IMAGE_FILE="arc.img"
-          gzip -dc "grub.img.gz" >"${IMAGE_FILE}"
+          gzip -dc "files/initrd/opt/arc/grub.img.gz" >"${IMAGE_FILE}"
           fdisk -l "${IMAGE_FILE}"
           
           LOOPX=$(sudo losetup -f)
@@ -167,11 +167,6 @@ jobs:
 
           sudo losetup --detach ${LOOPX}
 
-          # Resize Image
-          resizeImg "${IMAGE_FILE}" "+1024M" "arc2G.img" 2>/dev/null
-          rm -f "${IMAGE_FILE}"
-          mv -f "arc2G.img" "${IMAGE_FILE}"
-
           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
@@ -222,7 +217,7 @@ jobs:
 
           echo "Create Arc Image"
           IMAGE_FILE="arc.img"
-          gzip -dc "grub.img.gz" >"${IMAGE_FILE}"
+          gzip -dc "files/initrd/opt/arc/grub.img.gz" >"${IMAGE_FILE}"
           fdisk -l "${IMAGE_FILE}"
           
           LOOPX=$(sudo losetup -f)
@@ -253,11 +248,6 @@ jobs:
 
           sudo losetup --detach ${LOOPX}
 
-          # Resize Image
-          resizeImg "${IMAGE_FILE}" "+1024M" "arc2G.img" 2>/dev/null
-          rm -f "${IMAGE_FILE}"
-          mv -f "arc2G.img" "${IMAGE_FILE}"
-
           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
@@ -308,7 +298,7 @@ jobs:
 
           echo "Create Arc Image"
           IMAGE_FILE="arc.img"
-          gzip -dc "grub.img.gz" >"${IMAGE_FILE}"
+          gzip -dc "files/initrd/opt/arc/grub.img.gz" >"${IMAGE_FILE}"
           fdisk -l "${IMAGE_FILE}"
           
           LOOPX=$(sudo losetup -f)
@@ -339,11 +329,6 @@ jobs:
 
           sudo losetup --detach ${LOOPX}
 
-          # Resize Image
-          resizeImg "${IMAGE_FILE}" "+1024M" "arc2G.img" 2>/dev/null
-          rm -f "${IMAGE_FILE}"
-          mv -f "arc2G.img" "${IMAGE_FILE}"
-
           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
@@ -387,9 +372,9 @@ jobs:
               - Discord Account for Arc Patch needed
 
             ### Versions:
-              ${{ inputs.minimal && '- minimal: Full Image, all dependencies are included (reduced size, faster boot)' || '' }}
-              ${{ inputs.microcode && '- microcode: Minimal + additional Microcode Updates' || '' }}
-              ${{ inputs.extended && '- extended: Full Image, all dependencies are included (new features to test)' || '' }}
+              ${{ inputs.minimal && '- minimal: full image, all dependencies included (reduced size, faster boot)' || '' }}
+              ${{ inputs.microcode && '- microcode: minimal + additional microcode updates' || '' }}
+              ${{ inputs.extended && '- extended: full image, all dependencies included (new features to test)' || '' }}
 
             ### Dependencies:
               - Addons: ${{ env.ADDONTAG }}
@@ -399,6 +384,7 @@ jobs:
               - Custom: ${{ env.CUSTOMTAG }}
               - LKMs: ${{ env.LKMTAG }}
               ${{ inputs.minimal && format('- Buildroot minimal: {0}', env.BRSTAG) || '' }}
+              ${{ inputs.microcode && format('- Buildroot microcode: {0}', env.BRMTAG) || '' }}
               ${{ inputs.extended && format('- Buildroot extended: {0}', env.BRXTAG) || '' }}
 
             ### Release

img-ext.sh

@@ -31,8 +31,8 @@ mkdir -p "brx"
 [ ! -f "../brx/bzImage" ] && getBuildrootx "brx" || copyBuildroot "brx"
 
 # Sbase
-IMAGE_FILE="arc_create.img"
-gzip -dc "grub.img.gz" >"${IMAGE_FILE}"
+IMAGE_FILE="arc.img"
+gzip -dc "files/initrd/opt/arc/grub.img.gz" >"${IMAGE_FILE}"
 fdisk -l "${IMAGE_FILE}"
 
 LOOPX=$(sudo losetup -f)
@@ -74,9 +74,5 @@ 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

@@ -30,8 +30,8 @@ getOffline "files/p3/configs"
 [ -f "../brs/bzImage" ] && copyBuildroot "brs" || getBuildroots "brs"
 
 # Sbase
-IMAGE_FILE="arc_create.img"
-gzip -dc "grub.img.gz" >"${IMAGE_FILE}"
+IMAGE_FILE="arc.img"
+gzip -dc "files/initrd/opt/arc/grub.img.gz" >"${IMAGE_FILE}"
 fdisk -l "${IMAGE_FILE}"
 
 LOOPX=$(sudo losetup -f)
@@ -73,9 +73,5 @@ 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

@@ -351,8 +351,11 @@ function resizeImg() {
   local LOOPX
   LOOPX=$(sudo losetup -f)
   sudo losetup -P "${LOOPX}" "${OUTPUT_FILE}"
-  sudo e2fsck -fp "$(ls "${LOOPX}p3")"
-  sudo resize2fs "$(ls "${LOOPX}p3")"
+  local PARTITION
+  PARTITION=$(ls "${LOOPX}p3")
+  sudo e2fsck -fp "${PARTITION}"
+  sudo tune2fs -l "${PARTITION}" | grep "Block size"
+  sudo resize2fs "${PARTITION}"
   sudo losetup -d "${LOOPX}"
 }
 

scripts/grub.sh

@@ -29,7 +29,7 @@ done
 popd
 
 rm -f grub.img
-dd if=/dev/zero of=grub.img bs=1M seek=1024 count=0
+dd if=/dev/zero of=grub.img bs=1M seek=2048 count=0
 echo -e "n\np\n1\n\n+50M\nn\np\n2\n\n+50M\nn\np\n3\n\n\na\n1\nw\nq\n" | fdisk grub.img
 fdisk -l grub.img
 
@@ -71,4 +71,4 @@ sudo umount ${LOOPX}p1
 sudo losetup -d ${LOOPX}
 sudo rm -rf ${NAME}1
 
-gzip grub.img
+gzip grub.img