diff --git a/INTERFACES.sh b/INTERFACES.sh index 2588860..f0a0069 100644 --- a/INTERFACES.sh +++ b/INTERFACES.sh @@ -30,7 +30,7 @@ HIPERISO_NET_DUMP="" # "1" = add virtio-net + pcap capture to network.pca # ── USB Partition Layout ───────────────────────────────────────────────────── DATA_PART="/dev/sdX1" # Partition 1: Data partition (exFAT/NTFS, rest of disk) -EFI_PART="/dev/sdX2" # Partition 2: EFI System Partition (FAT16, 32MB) +EFI_PART="/dev/sdX2" # Partition 2: EFI System Partition (FAT16, 64MB) EFI_MOUNT="/mnt/efi" # Mount point for ESP during install DATA_MOUNT="/mnt/usb" # Mount point for data partition at runtime diff --git a/README.md b/README.md index 909a78a..427ffda 100644 --- a/README.md +++ b/README.md @@ -117,7 +117,7 @@ layout is: | # | Type | FS | Size | Contents | |---|--------|--------|--------|--------------------------------------------| | 1 | 0700 | exFAT | rest | Your ISOs + boot logs + config | -| 2 | EF00 | FAT16 | 32 MB | ESP: GRUB2, kernel, initramfs, OVMF | +| 2 | EF00 | FAT16 | 64 MB | ESP: GRUB2, kernel, initramfs, OVMF | Copy your ISOs: diff --git a/src/grub2/hiperiso_cmd.c b/src/grub2/hiperiso_cmd.c index cc0187c..1c6d1ef 100644 --- a/src/grub2/hiperiso_cmd.c +++ b/src/grub2/hiperiso_cmd.c @@ -629,7 +629,7 @@ static int hiperiso_check_official_device(grub_device_t dev) { hiperiso_gpt_part_tbl *PartTbl = g_hiperiso_part_info->PartTbl; if (PartTbl[1].StartLBA != PartTbl[0].LastLBA + 1 || - (PartTbl[1].LastLBA + 1 - PartTbl[1].StartLBA) != 65536) + (PartTbl[1].LastLBA + 1 - PartTbl[1].StartLBA) != 131072) { grub_file_close(file); return hiperiso_set_check_result(6, "Disk partition layout check failed."); @@ -639,7 +639,7 @@ static int hiperiso_check_official_device(grub_device_t dev) { hiperiso_part_table *PartTbl = g_hiperiso_part_info->MBR.PartTbl; if (PartTbl[1].StartSectorId != PartTbl[0].StartSectorId + PartTbl[0].SectorCount || - PartTbl[1].SectorCount != 65536) + PartTbl[1].SectorCount != 131072) { grub_file_close(file); return hiperiso_set_check_result(6, "Disk partition layout check failed."); @@ -650,7 +650,7 @@ static int hiperiso_check_official_device(grub_device_t dev) { offset = partition->start + partition->len; partition = file->device->disk->partition; - if ((partition->number != 1) || (partition->len != 65536) || (offset != partition->start)) + if ((partition->number != 1) || (partition->len != 131072) || (offset != partition->start)) { grub_file_close(file); return hiperiso_set_check_result(7, "Disk partition layout check failed."); diff --git a/src/grub2/hiperiso_def.h b/src/grub2/hiperiso_def.h index 3c4a0eb..d5d4457 100644 --- a/src/grub2/hiperiso_def.h +++ b/src/grub2/hiperiso_def.h @@ -1214,7 +1214,7 @@ int hiperiso_unregister_all_cmd(void); int hiperiso_chain_file_size(const char *path); int hiperiso_chain_file_read(const char *path, int offset, int len, void *buf); -#define HISO_CMD_CHECK(a) if (33554432 != g_hiperiso_disk_part_size[a]) hiperiso_syscall0(exit) +#define HISO_CMD_CHECK(a) if (67108864 != g_hiperiso_disk_part_size[a]) hiperiso_syscall0(exit) #define hiso_theme_random_boot_second 0 #define hiso_theme_random_boot_day 1 diff --git a/src/gui/Core/hiperiso_define.h b/src/gui/Core/hiperiso_define.h index ac9cca0..b1f803c 100644 --- a/src/gui/Core/hiperiso_define.h +++ b/src/gui/Core/hiperiso_define.h @@ -28,8 +28,8 @@ #define HISOIMG_PART_START_BYTES (1024 * 1024) #define HISOIMG_PART_START_SECTOR 2048 -#define HISOEFI_PART_BYTES (32 * 1024 * 1024) -#define HISOEFI_PART_SECTORS 65536 +#define HISOEFI_PART_BYTES (64 * 1024 * 1024) +#define HISOEFI_PART_SECTORS 131072 #pragma pack(1) diff --git a/src/hisocli/hisocli.h b/src/hisocli/hisocli.h index 6d21895..82b6e0c 100644 --- a/src/hisocli/hisocli.h +++ b/src/hisocli/hisocli.h @@ -24,7 +24,7 @@ #define HIPERISO_EFI_PART_ATTR 0x8000000000000000ULL #define SIZE_1MB (1024 * 1024) -#define HIPERISO_EFI_PART_SIZE (32 * SIZE_1MB) +#define HIPERISO_EFI_PART_SIZE (64 * SIZE_1MB) #define check_free(p) if (p) free(p) #define check_close(fd) if (fd >= 0) close(fd) diff --git a/src/installer/tool/hiperiso_lib.sh b/src/installer/tool/hiperiso_lib.sh index e3caa4b..59cf8f1 100644 --- a/src/installer/tool/hiperiso_lib.sh +++ b/src/installer/tool/hiperiso_lib.sh @@ -1,10 +1,10 @@ #!/bin/sh -#Hiperiso partition 32MB -HIPERISO_PART_SIZE=33554432 -HIPERISO_PART_SIZE_MB=32 +#Hiperiso partition 64MB +HIPERISO_PART_SIZE=67108864 +HIPERISO_PART_SIZE_MB=64 HIPERISO_SECTOR_SIZE=512 -HIPERISO_SECTOR_NUM=65536 +HIPERISO_SECTOR_NUM=131072 hiperiso_false() { [ "1" = "2" ] diff --git a/src/plugson/src/Core/hiperiso_define.h b/src/plugson/src/Core/hiperiso_define.h index aa77eb7..70384f7 100644 --- a/src/plugson/src/Core/hiperiso_define.h +++ b/src/plugson/src/Core/hiperiso_define.h @@ -44,8 +44,8 @@ #define HISOIMG_PART_START_BYTES (1024 * 1024) #define HISOIMG_PART_START_SECTOR 2048 -#define HISOEFI_PART_BYTES (32 * 1024 * 1024) -#define HISOEFI_PART_SECTORS 65536 +#define HISOEFI_PART_BYTES (64 * 1024 * 1024) +#define HISOEFI_PART_SECTORS 131072 #pragma pack(1)