compress at end

Author: samfreund

mount.sh

@@ -277,7 +277,69 @@ if [ "$rubik" == true ]; then
   FINAL_IMAGE="photonvision_rubikpi3"
 
 else
-  # Export the final image as an enivronment variable
+  # Final image resize and cleanup (for standard images only)
+  echo "=== Shrinking image to minimal size ==="
+  
+  # Create loop device with partition scanning
+  loopdev=$(sudo losetup --find --show --partscan "$ROOTFS_IMG")
+  echo "Created loopback device: ${loopdev}"
+  
+  # Determine root partition (typically partition 2)
+  rootfs_partnum=2
+  rootdev="${loopdev}p${rootfs_partnum}"
+  
+  # Check partition table type
+  part_type=$(sudo blkid -o value -s PTTYPE "${loopdev}")
+  echo "Image is using ${part_type} partition table"
+  
+  # Minimize root filesystem
+  echo "Resizing root filesystem to minimal size"
+  sudo e2fsck -p -f "${rootdev}"
+  sudo resize2fs -M "${rootdev}"
+  
+  # Get filesystem dimensions
+  rootfs_blocksize=$(sudo tune2fs -l "${rootdev}" | grep "^Block size" | awk '{print $NF}')
+  rootfs_blockcount=$(sudo tune2fs -l "${rootdev}" | grep "^Block count" | awk '{print $NF}')
+  
+  echo "Block size: ${rootfs_blocksize}, Block count: ${rootfs_blockcount}"
+  
+  # Calculate new partition boundaries
+  rootfs_partstart=$(sudo parted -m --script "${loopdev}" unit B print | grep "^${rootfs_partnum}:" | awk -F ":" '{print $2}' | tr -d 'B')
+  rootfs_partsize=$((rootfs_blockcount * rootfs_blocksize))
+  rootfs_partend=$((rootfs_partstart + rootfs_partsize - 1))
+  rootfs_partoldend=$(sudo parted -m --script "${loopdev}" unit B print | grep "^${rootfs_partnum}:" | awk -F ":" '{print $3}' | tr -d 'B')
+  
+  # Shrink partition if needed (parted bug requires interactive mode for shrinking)
+  if [ "$rootfs_partoldend" -gt "$rootfs_partend" ]; then
+    echo "Shrinking partition from ${rootfs_partoldend} to ${rootfs_partend} bytes"
+    echo y | sudo parted ---pretend-input-tty "${loopdev}" unit B resizepart "${rootfs_partnum}" "${rootfs_partend}"
+  else
+    echo "Rootfs partition not resized (no shrinkage detected)"
+  fi
+  
+  # Check for free space at end of disk
+  free_space=$(sudo parted -m --script "${loopdev}" unit B print free | tail -1)
+  if [[ "${free_space}" =~ "free" ]]; then
+    initial_image_size=$(stat -L --printf="%s" "${ROOTFS_IMG}")
+    image_size=$(echo "${free_space}" | awk -F ":" '{print $2}' | tr -d 'B')
+    
+    # For GPT, reserve space for secondary GPT (33 sectors = 16896 bytes)
+    if [[ "${part_type}" == "gpt" ]]; then
+      image_size=$((image_size + 16896))
+    fi
+    
+    echo "Shrinking image from ${initial_image_size} to ${image_size} bytes"
+    sudo truncate -s "${image_size}" "${ROOTFS_IMG}"
+    
+    # Fix secondary GPT after truncation
+    if [[ "${part_type}" == "gpt" ]]; then
+      sudo sgdisk -e "${ROOTFS_IMG}"
+    fi
+  fi
+  
+  # Cleanup loop device
+  sudo losetup --detach "${loopdev}"
+  echo "=== Image shrinking complete ==="
   FINAL_IMAGE="$ROOTFS_IMG"
 fi