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

Make OSInstall delete Limine.CFG before regenerating it.

Browse source
This commit is contained in:
TomAwezome 2022-11-01 15:43:05 -04:00
parent 61698d45ab
commit 68f4fad430
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/Misc/OSInstall.ZC
View file

@ -111,6 +111,8 @@ U0 OSMerge(U8 dst_drv, U8 src_drv=':')
Del("B:/Misc/Bible.TXT"); // Deleting from B:/ prevents causing hang when merging large .TXT files,
Del("B:/Misc/Clementine.TXT"); // they will instead be copied over from boot drive in OSMergeInner
Del("B:/Boot/Limine.CFG"); // Delete to make merge output ignore (copy) this, since it gets regenerated later
DocMax;
"$$PB$$$$PB$$$$LTCYAN$$Beginning Upgrade (running OSFilesMerge) ...$$FG$$\n\n";
@ -127,6 +129,7 @@ U0 OSMerge(U8 dst_drv, U8 src_drv=':')
ExePrint("Del(\"%C:/Boot/Limine-CD.BIN\");", dst_drv);
ExePrint("Del(\"%C:/Boot/Limine-CD-EFI.BIN\");", dst_drv);
ExePrint("Del(\"%C:/Boot/Limine.CFG\");", dst_drv);
ExePrint("Del(\"%C:/boot.catalog\");", dst_drv);
}
@ -206,7 +209,7 @@ U0 OSUpgrade()
{
BootMHDIns(drv_let);
"\n(Generating optional UEFI-mode Limine.CFG...)\n";
LimineCFGMake(drv_let); // ensures we don't leave the LiveCD's Limine.CFG on the HDD
LimineCFGMake(drv_let);
}
else
{
@ -244,6 +247,7 @@ U0 InstallDrive(U8 drv_let)
ExePrint("Del(\"%C:/Boot/Limine-CD.BIN\");", drv_let);
ExePrint("Del(\"%C:/Boot/Limine-CD-EFI.BIN\");", drv_let);
ExePrint("Del(\"%C:/Boot/Limine.CFG\");", drv_let);
ExePrint("Del(\"%C:/boot.catalog\");", drv_let);
ExePrint("DirMake(\"%C:/Tmp\");", drv_let);
@ -348,7 +352,7 @@ U0 VMInstallWiz()
{
BootMHDIns('C');
"\n(Generating optional UEFI-mode Limine.CFG...)\n";
LimineCFGMake('C'); // ensures we don't leave the LiveCD's Limine.CFG on the HDD
LimineCFGMake('C');
}
else
{