From 5d760bf1722b29d90886540db54b92ce23e4913b Mon Sep 17 00:00:00 2001 From: Liav A Date: Sat, 1 Feb 2020 18:25:14 +0200 Subject: [PATCH] Partition Table: Allow to boot with a partition number higher than 4 This is true currently only to GUID partitions, Booting with an MBR partition is still limited to partition numbers 1-4. --- Kernel/init.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/Kernel/init.cpp b/Kernel/init.cpp index d4c04d6e8a..7de54fa3dd 100644 --- a/Kernel/init.cpp +++ b/Kernel/init.cpp @@ -251,11 +251,6 @@ void init_stage2() hang(); } - if (partition_number < 1 || partition_number > 4) { - kprintf("init_stage2: invalid partition number %d; expected 1 to 4\n", partition_number); - hang(); - } - MBRPartitionTable mbr(root_dev); if (!mbr.initialize()) { @@ -278,6 +273,10 @@ void init_stage2() root_dev = *partition; } else { dbgprintf("MBR Partitioned Storage Detected!\n"); + if (partition_number < 1 || partition_number > 4) { + kprintf("init_stage2: invalid partition number %d; expected 1 to 4\n", partition_number); + hang(); + } auto partition = mbr.partition(partition_number); if (!partition) { kprintf("init_stage2: couldn't get partition %d\n", partition_number);