diff --git a/build/build-iso.sh b/build/build-iso.sh index 45280168..31021aa4 100755 --- a/build/build-iso.sh +++ b/build/build-iso.sh @@ -103,6 +103,7 @@ qemu-system-x86_64 -machine q35,accel=kvm -drive format=raw,file=$TMPDISK -m 1G mount_tempdisk echo "Extracting MyDistro ISO from vdisk ..." cp $TMPMOUNT/Tmp/MyDistro.ISO.C ./ZealOS-MyDistro.iso +sudo rm $TMPMOUNT/Tmp/MyDistro.ISO.C 2> /dev/null echo "Setting up temp ISO directory contents for use with limine xorriso command ..." sudo cp -rf $TMPMOUNT/* $TMPISODIR sudo cp limine/limine-cd-efi.bin $TMPISODIR/Boot/ @@ -118,7 +119,7 @@ umount_tempdisk sudo ls $TMPISODIR -al mv $TMPDISK ./ZealOS-UEFI-limine-dev.raw -xorriso -as mkisofs -b Boot/limine-cd.bin \ +xorriso -joliet "on" -rockridge "on" -as mkisofs -b Boot/limine-cd.bin \ -no-emul-boot -boot-load-size 4 -boot-info-table \ --efi-boot Boot/limine-cd-efi.bin \ -efi-boot-part --efi-boot-image --protective-msdos-label \ diff --git a/src/Kernel/BlkDev/DiskAHCI.ZC b/src/Kernel/BlkDev/DiskAHCI.ZC index 4382de8f..a21bb5eb 100755 --- a/src/Kernel/BlkDev/DiskAHCI.ZC +++ b/src/Kernel/BlkDev/DiskAHCI.ZC @@ -1165,8 +1165,8 @@ Bool AHCIBootDVDProbeAll(CBlkDev *bd) else "AHCI: Did not find matching sys_compile_time at BLK %d on Port %d\n", sys_boot_blk, i; - "%X %X", sys_disk_uuid[0], sys_disk_uuid[1]; AHCIAtapiBlksRead(bd, buf, 0, 1, FALSE); + if (!MemCompare(buf + 568, sys_disk_uuid, 16)) { "AHCI: Found sys_disk_uuid at BLK 0 byte 568 on Port %d\n", i; diff --git a/src/Kernel/BlkDev/DiskCDDVD.ZC b/src/Kernel/BlkDev/DiskCDDVD.ZC index 27f10939..0f37af66 100755 --- a/src/Kernel/BlkDev/DiskCDDVD.ZC +++ b/src/Kernel/BlkDev/DiskCDDVD.ZC @@ -28,6 +28,7 @@ Bool ISOInit(CDrive *drive, I64 blk) drv_offset += (2 * DVD_BLK_SIZE + DVD_BLK_SIZE) / BLK_SIZE; break; +// case ISOT_PRI_VOL_DESC: case ISOT_SUPPLEMENTARY_DESC: de = &iso->root_dir_record; drive->size = iso->vol_space_size.little * bd->blk_size >> BLK_SIZE_BITS; diff --git a/src/Kernel/KMain.ZC b/src/Kernel/KMain.ZC index 26c9427f..7855b40c 100755 --- a/src/Kernel/KMain.ZC +++ b/src/Kernel/KMain.ZC @@ -215,7 +215,8 @@ U0 KMain() "Load(\"Compiler\");\n"; Cd("/Compiler"); - Load("Compiler", LDF_SILENT); + Load("Compiler"); + Sleep(3000); LBts(&sys_run_level, RLf_COMPILER); DebugMode(OFF);