diff --git a/CONFIG.md b/CONFIG.md index a03911db..f95d990a 100644 --- a/CONFIG.md +++ b/CONFIG.md @@ -102,4 +102,5 @@ A resource can be one of the following: * `boot` - The `root` is the 1-based decimal value representing the partition on the boot drive. If omitted, the partition containing the configuration file on the boot drive is used. For example: `boot://2/...` will use partition 2 of the boot drive and `boot:///...` will use the partition containing the config file on the boot drive. * `bios` - The `root` takes the form of `drive:partition`; for example: `bios://3:1/...` would use BIOS drive 3, partition 1. Partitions and BIOS drives are both 1-based. Omitting the drive is possible; for example: `bios://:2/...`. Omitting the drive makes Limine use the boot drive. * `guid` - The `root` takes the form of a GUID/UUID, such as `guid://736b5698-5ae1-4dff-be2c-ef8f44a61c52/...`. The GUID is that of either a filesystem, when available, or a GPT partition GUID, when using GPT, in a unified namespace. +* `uuid` - Alias of `guid`. * `tftp` - The `root` is the IP address of the tftp server to load the file from. If the root is left empty (`tftp:///...`) the file will be loaded from the server Limine booted from. This resource is only available when booting off PXE. diff --git a/limine-pxe.bin b/limine-pxe.bin index 0f0f4504..2ef6eae7 100644 Binary files a/limine-pxe.bin and b/limine-pxe.bin differ diff --git a/limine.bin b/limine.bin index 3ef8a9b7..7c9073af 100644 Binary files a/limine.bin and b/limine.bin differ diff --git a/stage2.map b/stage2.map index a0354678..6ddc926b 100644 Binary files a/stage2.map and b/stage2.map differ diff --git a/stage2/lib/uri.c b/stage2/lib/uri.c index 85d0a175..feee80c0 100644 --- a/stage2/lib/uri.c +++ b/stage2/lib/uri.c @@ -184,6 +184,8 @@ bool uri_open(struct file_handle *fd, char *uri) { return uri_boot_dispatch(fd, root, path); } else if (!strcmp(resource, "guid")) { return uri_guid_dispatch(fd, root, path); + } else if (!strcmp(resource, "uuid")) { + return uri_guid_dispatch(fd, root, path); } else if (!strcmp(resource, "tftp")) { return uri_tftp_dispatch(fd, root, path); } else {