diff options
| author | Amlal El Mahrouss <amlal.elmahrouss@icloud.com> | 2024-05-04 13:38:10 +0200 |
|---|---|---|
| committer | Amlal El Mahrouss <amlal.elmahrouss@icloud.com> | 2024-05-04 13:38:10 +0200 |
| commit | fd7b08906adf40b81f3ac758ca55da501cb2283d (patch) | |
| tree | b8e663df7ec15620b12687481f28174139cede30 /Private/NewBoot | |
| parent | ae3555797c741edc7bac5d464e8f48774663043b (diff) | |
MHR-23: patches and fixes, also restricted disks to at least have 10G of
free space.
Signed-off-by: Amlal El Mahrouss <amlal.elmahrouss@icloud.com>
Diffstat (limited to 'Private/NewBoot')
| -rw-r--r-- | Private/NewBoot/BootKit/BootKit.hxx | 9 | ||||
| -rw-r--r-- | Private/NewBoot/Source/HEL/AMD64/BootMain.cxx | 1 | ||||
| -rw-r--r-- | Private/NewBoot/Source/makefile | 2 |
3 files changed, 11 insertions, 1 deletions
diff --git a/Private/NewBoot/BootKit/BootKit.hxx b/Private/NewBoot/BootKit/BootKit.hxx index c8333b86..faba02fb 100644 --- a/Private/NewBoot/BootKit/BootKit.hxx +++ b/Private/NewBoot/BootKit/BootKit.hxx @@ -313,6 +313,15 @@ inline Boolean BDiskFormatFactory<BootDev>::Format(const char* partName, /// @note A catalog roughly equal to a sector. + constexpr auto cMinimumDiskSize = 10; // at minimum. + + /// @note also look at EPM headers, for free part blocks. + + if (GIB(fDiskDev.GetDiskSize()) < cMinimumDiskSize) { + EFI::ThrowError(L"Disk-Too-Tiny", L"Disk can't contain a New Filesystem partition."); + return false; + } + partBlock->Version = kNewFSVersionInteger; partBlock->CatalogCount = blobCount; partBlock->Kind = kNewFSHardDrive; diff --git a/Private/NewBoot/Source/HEL/AMD64/BootMain.cxx b/Private/NewBoot/Source/HEL/AMD64/BootMain.cxx index e0e37b7d..5bc55a47 100644 --- a/Private/NewBoot/Source/HEL/AMD64/BootMain.cxx +++ b/Private/NewBoot/Source/HEL/AMD64/BootMain.cxx @@ -86,6 +86,7 @@ EFI_EXTERN_C EFI_API Int Main(EfiHandlePtr ImageHandle, volatile Char* vendorTable = reinterpret_cast<volatile Char*>( SystemTable->ConfigurationTable[indexVT].VendorTable); + /// ACPI's 'RSD PTR', which contains hardware tables (MADT, FACP...) if (vendorTable[0] == 'R' && vendorTable[1] == 'S' && vendorTable[2] == 'D' && vendorTable[3] == ' ' && vendorTable[4] == 'P' && vendorTable[5] == 'T' && diff --git a/Private/NewBoot/Source/makefile b/Private/NewBoot/Source/makefile index b5ee849d..15412436 100644 --- a/Private/NewBoot/Source/makefile +++ b/Private/NewBoot/Source/makefile @@ -76,7 +76,7 @@ run-efi-amd64: # img_2 is the rescue disk. img is the bootable disk, as provided by the NeWS. .PHONY: epm-img epm-img: - qemu-img create -f raw $(IMG) 20G + qemu-img create -f raw $(IMG) 10G qemu-img create -f raw $(IMG_2) 512M .PHONY: download-edk |