tristan/ZealOS
1
0
Fork 0
mirror of https://github.com/Zeal-Operating-System/ZealOS.git synced 2024-12-25 23:10:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Set xorriso to generate Joliet ISO data.

Browse source
This commit is contained in:
TomAwezome 2022-08-27 08:15:06 -04:00
parent 41a033fe8a
commit 751684f8ac
4 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
build/build-iso.sh
View file

@ -103,6 +103,7 @@ qemu-system-x86_64 -machine q35,accel=kvm -drive format=raw,file=$TMPDISK -m 1G
mount_tempdisk mount_tempdisk
echo "Extracting MyDistro ISO from vdisk ..." echo "Extracting MyDistro ISO from vdisk ..."
cp $TMPMOUNT/Tmp/MyDistro.ISO.C ./ZealOS-MyDistro.iso 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 ..." echo "Setting up temp ISO directory contents for use with limine xorriso command ..."
sudo cp -rf $TMPMOUNT/* $TMPISODIR sudo cp -rf $TMPMOUNT/* $TMPISODIR
sudo cp limine/limine-cd-efi.bin $TMPISODIR/Boot/ sudo cp limine/limine-cd-efi.bin $TMPISODIR/Boot/
@ -118,7 +119,7 @@ umount_tempdisk
sudo ls $TMPISODIR -al sudo ls $TMPISODIR -al
mv $TMPDISK ./ZealOS-UEFI-limine-dev.raw 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 \ -no-emul-boot -boot-load-size 4 -boot-info-table \
--efi-boot Boot/limine-cd-efi.bin \ --efi-boot Boot/limine-cd-efi.bin \
-efi-boot-part --efi-boot-image --protective-msdos-label \ -efi-boot-part --efi-boot-image --protective-msdos-label \

2
src/Kernel/BlkDev/DiskAHCI.ZC
View file

@ -1165,8 +1165,8 @@ Bool AHCIBootDVDProbeAll(CBlkDev *bd)
else else
"AHCI: Did not find matching sys_compile_time at BLK %d on Port %d\n", sys_boot_blk, i; "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); AHCIAtapiBlksRead(bd, buf, 0, 1, FALSE);
if (!MemCompare(buf + 568, sys_disk_uuid, 16)) if (!MemCompare(buf + 568, sys_disk_uuid, 16))
{ {
"AHCI: Found sys_disk_uuid at BLK 0 byte 568 on Port %d\n", i; "AHCI: Found sys_disk_uuid at BLK 0 byte 568 on Port %d\n", i;

1
src/Kernel/BlkDev/DiskCDDVD.ZC
View file

@ -28,6 +28,7 @@ Bool ISOInit(CDrive *drive, I64 blk)
drv_offset += (2 * DVD_BLK_SIZE + DVD_BLK_SIZE) / BLK_SIZE; drv_offset += (2 * DVD_BLK_SIZE + DVD_BLK_SIZE) / BLK_SIZE;
break; break;
// case ISOT_PRI_VOL_DESC:
case ISOT_SUPPLEMENTARY_DESC: case ISOT_SUPPLEMENTARY_DESC:
de = &iso->root_dir_record; de = &iso->root_dir_record;
drive->size = iso->vol_space_size.little * bd->blk_size >> BLK_SIZE_BITS; drive->size = iso->vol_space_size.little * bd->blk_size >> BLK_SIZE_BITS;

3
src/Kernel/KMain.ZC
View file

@ -215,7 +215,8 @@ U0 KMain()
"Load(\"Compiler\");\n"; "Load(\"Compiler\");\n";
Cd("/Compiler"); Cd("/Compiler");
Load("Compiler", LDF_SILENT); Load("Compiler");
Sleep(3000);
LBts(&sys_run_level, RLf_COMPILER); LBts(&sys_run_level, RLf_COMPILER);
DebugMode(OFF); DebugMode(OFF);