:: commit 540829f6a7ef9d315226066a3588d487dbd1701b

diff --git a/stage23/drivers/disk.s2.c b/stage23/drivers/disk.s2.c
index c20ec9b8..de658555 100644
--- a/stage23/drivers/disk.s2.c
+++ b/stage23/drivers/disk.s2.c
@@ -78,6 +78,8 @@ bool disk_read_sectors(struct volume *volume, void *buf, uint64_t block, size_t
 void disk_create_index(void) {
     size_t volume_count = 0;
 
+    print("Detected volumes:\n");
+
     for (uint8_t drive = 0x80; ; drive++) {
         if (drive == 0x90)
             drive = 0xe0;
@@ -102,10 +104,6 @@ void disk_create_index(void) {
         if (drive_params.lba_count == 0 || drive_params.bytes_per_sect == 0)
             continue;
 
-        print("Found BIOS drive %x\n", drive);
-        print(" ... %X total %u-byte sectors\n",
-              drive_params.lba_count, drive_params.bytes_per_sect);
-
         struct volume block = {0};
 
         block.drive = drive;
@@ -116,7 +114,6 @@ void disk_create_index(void) {
         // The medium could not be present (e.g.: CD-ROMs)
         // Do a test run to see if we can actually read it
         if (!disk_read_sectors(&block, NULL, 0, 1)) {
-            print(" ... Ignoring drive...\n");
             continue;
         }
 
@@ -176,12 +173,14 @@ void disk_create_index(void) {
             continue;
         }
 
-        volume_index[volume_index_i++] = block;
-
         if (gpt_get_guid(&block->guid, block)) {
             block->guid_valid = true;
         }
 
+        print("    %x\n", block->drive);
+
+        volume_index[volume_index_i++] = block;
+
         for (int part = 0; ; part++) {
             struct volume *p = ext_mem_alloc(sizeof(struct volume));
             int ret = part_get(p, block, part);
@@ -191,6 +190,8 @@ void disk_create_index(void) {
             if (ret == NO_PARTITION)
                 continue;
 
+            print("    %x:%u\n", block->drive, part);
+
             volume_index[volume_index_i++] = p;
 
             block->max_partition++;
@@ -337,7 +338,9 @@ void disk_create_index(void) {
 
     volume_index = ext_mem_alloc(sizeof(struct volume) * volume_count);
 
-    size_t drives_counter = 0x80;
+    print("Detected volumes:\n");
+
+    size_t drives_counter = 0x80, optical_counter = 0xe0;
 
     for (size_t i = 0; i < handles_size / sizeof(EFI_HANDLE); i++) {
         EFI_GUID disk_io_guid = DISK_IO_PROTOCOL;
@@ -366,7 +369,7 @@ void disk_create_index(void) {
         struct volume *block = ext_mem_alloc(sizeof(struct volume));
 
         if (status)
-            block->drive = 0xe0;
+            block->drive = optical_counter++;
         else
             block->drive = drives_counter++;
         block->efi_handle = handles[i];
@@ -376,6 +379,12 @@ void disk_create_index(void) {
         block->sect_count = drive->Media->LastBlock + 1;
         block->max_partition = -1;
 
+        if (gpt_get_guid(&block->guid, block)) {
+            block->guid_valid = true;
+        }
+
+        print("    %x\n", block->drive);
+
         volume_index[volume_index_i++] = block;
 
         for (int part = 0; ; part++) {
@@ -387,6 +396,8 @@ void disk_create_index(void) {
             if (ret == NO_PARTITION)
                 continue;
 
+            print("    %x:%u\n", block->drive, part);
+
             volume_index[volume_index_i++] = p;
 
             block->max_partition++;