Adjust iso

export-image/mk-iso.sh

@@ -1,92 +1,69 @@
 #!/bin/bash -e
 
-ISO_FILE="${STAGE_WORK_DIR}/${IMG_FILENAME}${IMG_SUFFIX}.iso"
-
-unmount_image "${ISO_FILE}"
-
-rm -f "${ISO_FILE}"
-rm -rf "${ROOTFS_DIR}"
-mkdir -p "${ROOTFS_DIR}"
-
+IMG_NAME="${IMG_FILENAME}${IMG_SUFFIX}"
+IMG_FILE="${STAGE_WORK_DIR}/${IMG_NAME}.img"
+MOUNT_DIR="${ROOTFS_DIR}"
 BOOT_SIZE=$((512 * 1024 * 1024))
-RECOVERY_SIZE=$((256 * 1024 * 1024))  # 256MB recovery partition
-ROOT_SIZE=$(du -x --apparent-size -s "${EXPORT_ROOTFS_DIR}" --exclude var/cache/apt/archives --exclude boot/firmware --block-size=1 | cut -f 1)
-
+RECOVERY_SIZE=$((256 * 1024 * 1024))
 ALIGN=$((4 * 1024 * 1024))
-ROOT_MARGIN="$(echo "($ROOT_SIZE * 0.2 + 200 * 1024 * 1024) / 1" | bc)"
 
+unmount_image "${IMG_FILE}"
+rm -f "${IMG_FILE}"
+rm -rf "${MOUNT_DIR}"
+mkdir -p "${MOUNT_DIR}"
+
+# Calculate rootfs size
+ROOT_SIZE=$(du -x --apparent-size -s "${EXPORT_ROOTFS_DIR}" --exclude var/cache/apt/archives --exclude boot/firmware --block-size=1 | cut -f 1)
+ROOT_MARGIN="$(echo "($ROOT_SIZE * 0.2 + 200 * 1024 * 1024) / 1" | bc)"
 BOOT_PART_START=$((ALIGN))
 BOOT_PART_SIZE=$(((BOOT_SIZE + ALIGN - 1) / ALIGN * ALIGN))
-
 ROOT_PART_START=$((BOOT_PART_START + BOOT_PART_SIZE))
 ROOT_PART_SIZE=$(((ROOT_SIZE + ROOT_MARGIN + ALIGN - 1) / ALIGN * ALIGN))
-
 RECOVERY_PART_START=$((ROOT_PART_START + ROOT_PART_SIZE))
 RECOVERY_PART_SIZE=$(((RECOVERY_SIZE + ALIGN - 1) / ALIGN * ALIGN))
-
 IMG_SIZE=$((RECOVERY_PART_START + RECOVERY_PART_SIZE))
 
-truncate -s "${IMG_SIZE}" "${ISO_FILE}"
+# Create raw image
+truncate -s "${IMG_SIZE}" "${IMG_FILE}"
+parted --script "${IMG_FILE}" mklabel msdos
+parted --script "${IMG_FILE}" unit B mkpart primary fat32 "${BOOT_PART_START}" "$((BOOT_PART_START + BOOT_PART_SIZE - 1))"
+parted --script "${IMG_FILE}" unit B mkpart primary ext4 "${ROOT_PART_START}" "$((ROOT_PART_START + ROOT_PART_SIZE - 1))"
+parted --script "${IMG_FILE}" unit B mkpart primary ext4 "${RECOVERY_PART_START}" "$((RECOVERY_PART_START + RECOVERY_PART_SIZE - 1))"
 
-parted --script "${ISO_FILE}" mklabel msdos
-parted --script "${ISO_FILE}" unit B mkpart primary fat32 "${BOOT_PART_START}" "$((BOOT_PART_START + BOOT_PART_SIZE - 1))"
-parted --script "${ISO_FILE}" unit B mkpart primary ext4 "${ROOT_PART_START}" "$((ROOT_PART_START + ROOT_PART_SIZE - 1))"
-parted --script "${ISO_FILE}" unit B mkpart primary ext4 "${RECOVERY_PART_START}" "$((RECOVERY_PART_START + RECOVERY_PART_SIZE - 1))"
-
-echo "Creating loop device..."
+# Create loop device
 cnt=0
-until ensure_next_loopdev && LOOP_DEV="$(losetup --show --find --partscan "$ISO_FILE")"; do
-    if [ $cnt -lt 5 ]; then
-        cnt=$((cnt + 1))
-        echo "Error in losetup. Retrying..."
-        sleep 5
-    else
-        echo "ERROR: losetup failed; exiting"
-        exit 1
-    fi
+until ensure_next_loopdev && LOOP_DEV="$(losetup --show --find --partscan "$IMG_FILE")"; do
+    ((cnt++))
+    if [ $cnt -ge 5 ]; then echo "ERROR: losetup failed"; exit 1; fi
+    echo "Retrying losetup..."; sleep 5
 done
-
 ensure_loopdev_partitions "$LOOP_DEV"
+
 BOOT_DEV="${LOOP_DEV}p1"
 ROOT_DEV="${LOOP_DEV}p2"
 RECOVERY_DEV="${LOOP_DEV}p3"
 
-ROOT_FEATURES="^huge_file"
-for FEATURE in 64bit; do
-    if grep -q "$FEATURE" /etc/mke2fs.conf; then
-        ROOT_FEATURES="^$FEATURE,$ROOT_FEATURES"
-    fi
-done
+# Format partitions
+FAT_SIZE=$([ "$BOOT_SIZE" -lt 134742016 ] && echo 16 || echo 32)
+mkdosfs -n bootfs -F "$FAT_SIZE" -s 4 "$BOOT_DEV"
+mkfs.ext4 -L rootfs -O "^64bit,^huge_file" "$ROOT_DEV"
+mkfs.ext4 -L recovery "$RECOVERY_DEV"
 
-if [ "$BOOT_SIZE" -lt 134742016 ]; then
-    FAT_SIZE=16
-else
-    FAT_SIZE=32
-fi
+# Mount and copy rootfs
+mount "$ROOT_DEV" "$MOUNT_DIR" -t ext4
+mkdir -p "${MOUNT_DIR}/boot"
+mount "$BOOT_DEV" "${MOUNT_DIR}/boot" -t vfat
+rsync -aHAXx --exclude /var/cache/apt/archives --exclude /boot/firmware --exclude /boot/overlays "${EXPORT_ROOTFS_DIR}/" "${MOUNT_DIR}/"
 
-mkdosfs -n bootfs -F "$FAT_SIZE" -s 4 -v "$BOOT_DEV" > /dev/null
-mkfs.ext4 -L rootfs -O "$ROOT_FEATURES" "$ROOT_DEV" > /dev/null
-mkfs.ext4 -L recovery "$RECOVERY_DEV" > /dev/null
+# Recovery partition
+mkdir -p "${MOUNT_DIR}/recovery"
+mount "$RECOVERY_DEV" "${MOUNT_DIR}/recovery" -t ext4
+# Optionally copy recovery tools
+# cp recovery-tools/recovery.sh "${MOUNT_DIR}/recovery/"
 
-mount -v "$ROOT_DEV" "${ROOTFS_DIR}" -t ext4
-mkdir -p "${ROOTFS_DIR}/boot"
-mount -v "$BOOT_DEV" "${ROOTFS_DIR}/boot" -t vfat
-
-rsync -aHAXx --exclude /var/cache/apt/archives --exclude /boot/firmware --exclude /boot/overlays "${EXPORT_ROOTFS_DIR}/" "${ROOTFS_DIR}/"
-#rsync -rtx "${EXPORT_ROOTFS_DIR}/boot/firmware/" "${ROOTFS_DIR}/boot/firmware/"
-
-# Optionally mount and populate the recovery partition
-mkdir -p "${ROOTFS_DIR}/recovery"
-mount -v "$RECOVERY_DEV" "${ROOTFS_DIR}/recovery" -t ext4
-
-# (Optional) Example: copy recovery script
-# cp recovery-tools/recovery.sh "${ROOTFS_DIR}/recovery/"
-
-# Create bootable ISO with GRUB
-echo "Creating bootable ISO..."
-mkdir -p "${ROOTFS_DIR}/boot/grub"
-
-cat > "${ROOTFS_DIR}/boot/grub/grub.cfg" <<EOF
+# Install GRUB (BIOS)
+mkdir -p "${MOUNT_DIR}/boot/grub"
+cat > "${MOUNT_DIR}/boot/grub/grub.cfg" <<EOF
 set default=0
 set timeout=5
 
@@ -96,6 +73,32 @@ menuentry "Linux" {
 }
 EOF
 
-grub-mkrescue -o "${ISO_FILE}" "${ROOTFS_DIR}"
+grub-install \
+  --target=i386-pc \
+  --boot-directory="${MOUNT_DIR}/boot" \
+  --modules="part_msdos ext2 fat normal biosdisk" \
+  --force \
+  --no-floppy \
+  --boot-directory="${MOUNT_DIR}/boot" \
+  "$LOOP_DEV"
 
-echo "Bootable ISO with recovery partition created at ${ISO_FILE}"
+# Optional: add UEFI bootloader if you have one
+# mkdir -p "${MOUNT_DIR}/boot/efi/EFI/boot"
+# cp bootx64.efi "${MOUNT_DIR}/boot/efi/EFI/boot/bootx64.efi"
+
+# Unmount all
+umount -l "${MOUNT_DIR}/boot"
+umount -l "${MOUNT_DIR}/recovery"
+umount -l "${MOUNT_DIR}"
+losetup -d "$LOOP_DEV"
+
+# Create hybrid ISO using xorriso (make sure it's installed)
+ISO_FILE="${STAGE_WORK_DIR}/${IMG_NAME}.iso"
+xorriso -as mkisofs \
+  -r -J -joliet -l \
+  -b boot/grub/i386-pc/eltorito.img \
+  -no-emul-boot -boot-load-size 4 -boot-info-table \
+  -isohybrid-mbr /usr/lib/ISOLINUX/isohdpfx.bin \
+  -o "${ISO_FILE}" "${MOUNT_DIR}"
+
+echo "Bootable ISO with recovery partition created at ${ISO_FILE}"