compression

Author: samfreund

mount.sh

@@ -175,18 +175,27 @@ if [ "$ImgType" == "Canonical" ]; then
 
   fi
 
-  # Remount after expansion
-  echo "=== Remounting after expansion ==="
-  sudo mount -o rw,loop,offset=$OFFSET "$ROOTFS_IMG" ./rootfs
-
   if [ "$rubik" != true ]; then
+    # First, attach as loop device with partition scan
+    loopdev=$(sudo losetup --find --show --partscan "$ROOTFS_IMG")
+    echo "Attached loop device for resize: ${loopdev}"
+  
     # Resize the filesystem to fill the partition
-    echo "=== Resizing filesystem ==="
-    sudo resize2fs "$(losetup -j "$ROOTFS_IMG" | cut -d: -f1 | head -n1)"
+    echo "=== Resizing filesystem to fill partition ==="
+    sudo e2fsck -f -y "${loopdev}p2" || [ $? -eq 1 ]
+    sudo resize2fs "${loopdev}p2"
+  
+    # Detach the loop device
+    sudo losetup -d "${loopdev}"
+  
+    # Now remount for the chroot work
+    echo "=== Remounting after expansion ==="
+    sudo mount -o rw,loop,offset=$OFFSET "$ROOTFS_IMG" ./rootfs
+  else
+    # For rubik images, just remount
+    echo "=== Remounting after expansion ==="
+    sudo mount -o rw,loop,offset=$OFFSET "$ROOTFS_IMG" ./rootfs
   fi
-elif [ "$ImgType" == "CustomIDE" ]; then
-  echo "Image already customized, no expansion needed"
-fi
 
 rm -f ImgType
 
@@ -236,6 +245,88 @@ sudo chroot rootfs /bin/bash -c "
   fi
 "
 
+echo "=== Resizing images to minimum ==="
+if [ "$rubik" != true ]; then
+  # Attach loop device with partition scan so we can operate on the partition device
+  LOOP_DEV=$(sudo losetup --find --show --partscan "$ROOTFS_IMG")
+  echo "Attached loop device: $LOOP_DEV"
+
+  # Partition device (most systems create ${LOOP_DEV}p2)
+  PART_DEV="${LOOP_DEV}p2"
+  if [ ! -b "$PART_DEV" ]; then
+    # Fallback: try to discover the partition device via lsblk
+    PART_DEV=$(lsblk -ln -o PATH,TYPE "${LOOP_DEV}" | awk '$2=="part" {print $1; exit}')
+  fi
+
+  if [ -z "$PART_DEV" ] || [ ! -b "$PART_DEV" ]; then
+    echo "Error: could not find partition device for $LOOP_DEV"
+    sudo losetup -d "$LOOP_DEV" || true
+  else
+    echo "Operating on partition device: $PART_DEV"
+
+    # Ensure filesystem is consistent
+    sudo e2fsck -f -y "$PART_DEV" || [ $? -eq 1 ]
+
+    # Check for size mismatch and fix if needed
+    set +e
+    sudo e2fsck -f -y "$PART_DEV" 2>&1 | grep -q "Either the superblock or the partition table"
+    if [ $? -eq 0 ]; then
+      echo "Detected filesystem/partition size mismatch, forcing filesystem to partition size"
+      # Get actual partition size in blocks
+      PART_BLOCKS=$(sudo blockdev --getsz "$PART_DEV")
+      PART_BLOCKS=$((PART_BLOCKS / 8))  # Convert 512-byte sectors to 4K blocks
+      sudo resize2fs -f "$PART_DEV" ${PART_BLOCKS}
+      # Run e2fsck again to verify
+      sudo e2fsck -f -y "$PART_DEV" || [ $? -eq 1 ]
+    fi
+    set -e
+
+    # Shrink filesystem to its minimum size
+    sudo resize2fs -M "$PART_DEV"
+
+    # Determine filesystem size (blocks * block size) in bytes
+    blk_count=$(sudo dumpe2fs -h "$PART_DEV" 2>/dev/null | awk -F: '/Block count/ {gsub(/ /,"",$2); print $2}')
+    blk_size=$(sudo dumpe2fs -h "$PART_DEV" 2>/dev/null | awk -F: '/Block size/ {gsub(/ /,"",$2); print $2}')
+    if [ -n "$blk_count" ] && [ -n "$blk_size" ]; then
+      required_bytes=$((blk_count * blk_size))
+      echo "Filesystem minimum: $required_bytes bytes"
+
+      # Get partition start (in bytes)
+      start_byte=$(sudo parted -s "$LOOP_DEV" unit B print | awk '/^ 2/ {gsub("B","",$2); print $2}')
+      if [ -z "$start_byte" ]; then
+        echo "Error: could not determine partition start"
+      else
+        # Add a small slack (1 MiB) to avoid off-by-one issues
+        slack=1048576
+        new_end=$((start_byte + required_bytes + slack))
+        echo "Resizing partition 2 to end at ${new_end} bytes (start ${start_byte})"
+
+        # Resize partition to fit the shrunken filesystem (+slack)
+        # Parted wants confirmation, that's why we use the yes pipe here
+        yes | sudo parted ---pretend-input-tty "$LOOP_DEV" unit B resizepart 2 "${new_end}B" || true
+
+        # Inform kernel of partition table change
+        sudo partprobe "$LOOP_DEV" || true
+
+        # Detach loop device before truncating the backing file
+        sudo losetup -d "$LOOP_DEV"
+        LOOP_DEV=""
+
+        # Truncate the image file to the new end (round up to 512-byte sector)
+        sector_size=512
+        last_sector=$(((new_end + sector_size - 1) / sector_size))
+        new_image_size=$((last_sector * sector_size))
+        echo "Truncating image to ${new_image_size} bytes"
+        sudo truncate -s "$new_image_size" "$ROOTFS_IMG"
+      fi
+    else
+      echo "Warning: could not determine filesystem block info; leaving image size unchanged"
+      sudo losetup -d "$LOOP_DEV" || true
+      LOOP_DEV=""
+    fi
+  fi
+fi
+
 # Cleanup mounts
 sudo umount rootfs/dev || true
 sudo umount rootfs/run || true